[CMAKE]

Convert win32k to spec and add importlib target

svn path=/branches/cmake-bringup/; revision=49791

diff --git a/subsystems/win32/win32k/CMakeLists.txt b/subsystems/win32/win32k/CMakeLists.txt
index d755138..79431b5 100644 (file)
--- a/subsystems/win32/win32k/CMakeLists.txt
+++ b/subsystems/win32/win32k/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+spec2def(win32k.sys win32k.spec)
+
 include_directories(
     .
     include
@@ -146,13 +148,8 @@ list(APPEND SOURCE
     objects/xformobj.c
     stubs/stubs.c
     stubs/umpdstubs.c
-    win32k.rc
-    win32k_${ARCH}.def)
+    win32k.rc)
     
-if(NOT MSVC)
-    set_source_files_properties(win32k_${ARCH}.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
-
 list(APPEND GENDIB_GENERATED
     ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c
     ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c
@@ -181,6 +178,7 @@ endif(ARCH MATCHES i386)
 
 add_library(win32k SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/win32k_pch.h.gch
+    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def
     ${SOURCE})
 
 set_module_type(win32k kernelmodedriver)
@@ -193,4 +191,6 @@ target_link_libraries(win32k
 add_importlibs(win32k ntoskrnl hal ftfd)
 add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE})
 add_dependencies(win32k gendib_generated subsystem_napi)
-add_cab_target(win32k 1)
\ No newline at end of file
+add_cab_target(win32k 1)
+add_importlib_target(win32k.spec)
+

diff --git a/subsystems/win32/win32k/win32k.pspec b/subsystems/win32/win32k/win32k.spec
similarity index 99%
rename from subsystems/win32/win32k/win32k.pspec
rename to subsystems/win32/win32k/win32k.spec
index bd2a06e..265e02b 100644 (file)
--- a/subsystems/win32/win32k/win32k.pspec
+++ b/subsystems/win32/win32k/win32k.spec
@@ -1,6 +1,3 @@
-#include "include/reactos/msvctarget.h"
-#undef i386
-
 @ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add
 @ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr) FLOATOBJ_Div
 @ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr) FLOATOBJ_Mul