Author: akhaldi Date: Sun Feb 9 22:52:01 2014 New Revision: 62087
URL: http://svn.reactos.org/svn/reactos?rev=62087&view=rev Log: [WIN32SS] * Prepare the CMake scripts for PCH. CORE-7716
Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv.cmake trunk/reactos/win32ss/user/winsrv/usersrv.cmake
Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev=... ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -179,8 +179,7 @@ gdi/ntgdi/xformobj.c gdi/eng/stubs.c gdi/eng/umpdstubs.c - win32k.rc - ${CMAKE_CURRENT_BINARY_DIR}/win32k.def) + pch.h)
if(USE_DIBLIB) add_definitions(-D_USE_DIBLIB_) @@ -218,7 +217,12 @@ endif()
add_asm_files(win32k_asm ${ASM_SOURCE}) -add_library(win32k SHARED ${SOURCE} ${win32k_asm}) + +add_library(win32k SHARED + ${SOURCE} + ${win32k_asm} + win32k.rc + ${CMAKE_CURRENT_BINARY_DIR}/win32k.def)
set_module_type(win32k kernelmodedriver)
@@ -232,7 +236,7 @@ endif()
add_importlibs(win32k ntoskrnl hal ftfd) -add_pch(win32k pch.h) +add_pch(win32k pch.h SOURCE) add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)
Modified: trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/fr... ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,16 +1,20 @@
spec2def(framebuf.dll framebuf.spec)
-add_library(framebuf SHARED +list(APPEND SOURCE enable.c palette.c pointer.c screen.c surface.c + framebuf.h) + +add_library(framebuf SHARED + ${SOURCE} framebuf.rc ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def)
-add_pch(framebuf framebuf.h) +add_pch(framebuf framebuf.h SOURCE) set_entrypoint(framebuf DrvEnableDriver 12) set_subsystem(framebuf native) set_image_base(framebuf 0x00010000)
Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/fr... ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -7,16 +7,17 @@ palette.c pointer.c screen.c - ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def) + driver.h)
add_library(framebuf_new SHARED ${SOURCE} - framebuf_new.rc) + framebuf_new.rc + ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def)
set_entrypoint(framebuf_new DrvEnableDriver 12) set_subsystem(framebuf_new native) set_image_base(framebuf_new 0x00010000) target_link_libraries(framebuf_new libcntpr) add_importlibs(framebuf_new win32k) -add_pch(framebuf_new driver.h) +add_pch(framebuf_new driver.h SOURCE) add_dependencies(framebuf_new psdk bugcodes)
Modified: trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/vg... ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,7 +1,7 @@
spec2def(vgaddi.dll vgaddi.spec)
-add_library(vgaddi SHARED +list(APPEND SOURCE main/enable.c objects/screen.c objects/pointer.c @@ -12,13 +12,17 @@ objects/offscreen.c objects/copybits.c vgavideo/vgavideo.c + vgaddi.h) + +add_library(vgaddi SHARED + ${SOURCE} vgaddi.rc ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def)
set_entrypoint(vgaddi DrvEnableDriver 12) set_subsystem(vgaddi native) set_image_base(vgaddi 0x00010000) -add_pch(vgaddi vgaddi.h) +add_pch(vgaddi vgaddi.h SOURCE) add_importlibs(vgaddi win32k) target_link_libraries(vgaddi libcntpr) add_dependencies(vgaddi psdk bugcodes)
Modified: trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/C... ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,13 +1,15 @@
-add_library(bmfd SHARED +list(APPEND SOURCE enable.c font.c - glyph.c) + glyph.c + bmfd.h)
-add_pch(bmfd bmfd.h) +add_library(bmfd SHARED ${SOURCE}) set_entrypoint(bmfd BmfdEnableDriver 12) set_subsystem(bmfd native) set_image_base(bmfd 0x00010000) target_link_libraries(bmfd libcntpr) add_importlibs(bmfd win32k) +add_pch(bmfd bmfd.h SOURCE) add_dependencies(bmfd psdk bugcodes)
Modified: trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/C... ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -3,11 +3,15 @@
spec2def(ftfd.dll ftfd.spec ADD_IMPORTLIB)
-add_library(ftfd SHARED +list(APPEND SOURCE enable.c font.c glyph.c rosglue.c + ftfd.h) + +add_library(ftfd SHARED + ${SOURCE} sprintf.c freetype.rc ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def) @@ -20,7 +24,7 @@ freetype libcntpr)
-add_pch(ftfd ftfd.h) +add_pch(ftfd ftfd.h SOURCE) add_importlibs(ftfd win32k) add_dependencies(ftfd psdk) add_cd_file(TARGET ftfd DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/vb... ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,11 +1,12 @@
-add_library(vbemp SHARED +list(APPEND SOURCE edid.c vbemp.c - vbemp.rc) + vbemp.h)
+add_library(vbemp SHARED ${SOURCE} vbemp.rc) set_module_type(vbemp kernelmodedriver) add_importlibs(vbemp videoprt) -add_pch(vbemp vbemp.h) +add_pch(vbemp vbemp.h SOURCE) target_link_libraries(vbemp libcntpr) add_cd_file(TARGET vbemp DESTINATION reactos/system32/drivers FOR all)
Modified: trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/vg... ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -2,12 +2,12 @@ list(APPEND SOURCE initvga.c vgamp.c - vgamp.rc) + vgamp.h)
-add_library(vgamp SHARED ${SOURCE}) +add_library(vgamp SHARED ${SOURCE} vgamp.rc)
set_module_type(vgamp kernelmodedriver) add_importlibs(vgamp videoprt)
-add_pch(vgamp vgamp.h) +add_pch(vgamp vgamp.h SOURCE) add_cd_file(TARGET vgamp DESTINATION reactos/system32/drivers FOR all)
Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/vg... ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -4,7 +4,8 @@ vgadata.c vga.c vbemodes.c - vbe.c) + vbe.c + vga.h)
add_library(vga SHARED ${SOURCE} @@ -21,6 +22,6 @@ set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt)
-add_pch(vga vga.h) +add_pch(vga vga.h SOURCE)
add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
Modified: trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/CM... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -22,15 +22,17 @@ stubs.c timer.c videoprt.c + videoprt.h) + +add_library(videoprt SHARED + ${SOURCE} guid.c videoprt.rc ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def)
-add_library(videoprt SHARED ${SOURCE}) - set_module_type(videoprt kernelmodedriver) add_importlibs(videoprt ntoskrnl hal)
-add_pch(videoprt videoprt.h) +add_pch(videoprt videoprt.h SOURCE) add_cd_file(TARGET videoprt DESTINATION reactos/system32/drivers FOR all)
Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeList... ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -43,10 +43,12 @@ objects/text.c objects/utils.c objects/path.c + include/precomp.h) + +add_library(gdi32 SHARED + ${SOURCE} gdi32.rc ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def) - -add_library(gdi32 SHARED ${SOURCE})
set_module_type(gdi32 win32dll @@ -59,6 +61,6 @@ ${PSEH_LIB})
add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) -add_pch(gdi32 include/precomp.h) +add_pch(gdi32 include/precomp.h SOURCE) add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/CMakeLis... ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -1,15 +1,19 @@
spec2def(dxg.sys dxg.spec)
-add_library(dxg SHARED +list(APPEND SOURCE main.c ddhmg.c eng.c historic.c + dxg_int.h) + +add_library(dxg SHARED + ${SOURCE} dxg.rc ${CMAKE_CURRENT_BINARY_DIR}/dxg.def)
set_module_type(dxg kernelmodedriver) add_importlibs(dxg dxgthk ntoskrnl) -add_pch(dxg dxg_int.h) +add_pch(dxg dxg_int.h SOURCE) add_cd_file(TARGET dxg DESTINATION reactos/system32/drivers FOR all)
Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeLi... ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -58,8 +58,7 @@ windows/text.c windows/window.c windows/winpos.c - user32.rc - ${CMAKE_CURRENT_BINARY_DIR}/user32.def) + include/user32.h)
if(USE_NEW_CURSORICON) list(APPEND SOURCE windows/cursoricon_new.c) @@ -67,7 +66,11 @@ list(APPEND SOURCE windows/cursoricon.c) endif()
-add_library(user32 SHARED ${SOURCE}) +add_library(user32 SHARED + ${SOURCE} + user32.rc + ${CMAKE_CURRENT_BINARY_DIR}/user32.def) + set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE) target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB})
@@ -78,5 +81,5 @@
add_delay_importlibs(user32 imm32 usp10) add_importlibs(user32 gdi32 advapi32 kernel32 ntdll) -add_pch(user32 include/user32.h) +add_pch(user32 include/user32.h SOURCE) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv.... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -29,6 +29,7 @@ consrv/frontends/gui/text.c consrv/frontends/tui/tuiterm.c # consrv/consrv.rc + consrv/consrv.h )
# @@ -45,6 +46,7 @@ endif()
add_library(consrv ${CONSRV_SOURCE}) +add_pch(consrv consrv/consrv.h CONSRV_SOURCE) #add_object_library(consrv ${CONSRV_SOURCE})
list(APPEND CONSRV_IMPORT_LIBS psapi)
Modified: trunk/reactos/win32ss/user/winsrv/usersrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv.cmake [iso-8859-1] Sun Feb 9 22:52:01 2014 @@ -7,9 +7,11 @@ usersrv/register.c usersrv/shutdown.c # usersrv/usersrv.rc + usersrv/usersrv.h )
add_library(usersrv ${USERSRV_SOURCE}) +add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE) #add_object_library(usersrv ${USERSRV_SOURCE})
set_module_type(usersrv module UNICODE)
-
akhaldi＠svn.reactos.org