Synchronize with trunk r58606.

[reactos.git] / win32ss / CMakeLists.txt

diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt
index 38a2a0f..30110dd 100644 (file)
--- a/win32ss/CMakeLists.txt
+++ b/win32ss/CMakeLists.txt
@@ -71,6 +71,7 @@ list(APPEND SOURCE
     gdi/eng/lineto.c
     gdi/eng/ldevobj.c
     gdi/eng/mapping.c
+    gdi/eng/math.c
     gdi/eng/mem.c
     gdi/eng/engmisc.c
     gdi/eng/mouse.c
@@ -88,11 +89,9 @@ list(APPEND SOURCE
     gdi/eng/xlateobj.c
     user/ntuser/main.c
     user/ntuser/misc/file.c
-    user/ntuser/misc/math.c
     user/ntuser/misc/rtlstr.c
     user/ntuser/misc/copy.c
     user/ntuser/misc/registry.c
-    user/ntuser/misc/usrheap.c
     reactx/ntddraw/ddraw.c
     reactx/ntddraw/dd.c
     reactx/ntddraw/ddsurf.c
@@ -135,6 +134,7 @@ list(APPEND SOURCE
     user/ntuser/sysparams.c
     user/ntuser/timer.c
     user/ntuser/useratom.c
+    user/ntuser/usrheap.c
     user/ntuser/vis.c
     user/ntuser/windc.c
     user/ntuser/window.c
@@ -179,7 +179,8 @@ list(APPEND SOURCE
     gdi/ntgdi/xformobj.c
     gdi/eng/stubs.c
     gdi/eng/umpdstubs.c
-    win32k.rc)
+    win32k.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def)
 
 if(USE_DIBLIB)
     add_definitions(-D_USE_DIBLIB_)
@@ -200,7 +201,7 @@ else()
 endif()
 
 if(ARCH STREQUAL "i386")
-list(APPEND SOURCE
+list(APPEND ASM_SOURCE
     gdi/dib/i386/dib24bpp_hline.s
     gdi/dib/i386/dib32bpp_hline.s
     gdi/dib/i386/dib32bpp_colorfill.s
@@ -216,9 +217,8 @@ if(KDBG)
         gdi/ntgdi/gdikdbgext.c)
 endif()
 
-add_library(win32k SHARED
-    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def
-    ${SOURCE})
+add_asm_files(win32k_asm ${ASM_SOURCE})
+add_library(win32k SHARED ${SOURCE} ${win32k_asm})
 
 set_module_type(win32k kernelmodedriver)
 
@@ -235,5 +235,7 @@ add_importlibs(win32k ntoskrnl hal ftfd)
 add_pch(win32k pch.h)
 add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
 
-add_library(win32ksys sys-stubs.S)
 set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)
+add_asm_files(win32ksys_asm sys-stubs.S)
+add_library(win32ksys ${win32ksys_asm})
+set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C")