* Sync up to trunk head (r65120).

[reactos.git] / dll / ntdll / CMakeLists.txt

diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt
index 9fd4bab..982e260 100644 (file)
--- a/dll/ntdll/CMakeLists.txt
+++ b/dll/ntdll/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-spec2def(ntdll.dll def/ntdll.spec)
+spec2def(ntdll.dll def/ntdll.spec ADD_IMPORTLIB)
 
 add_definitions(
     -D__NTDLL__
@@ -8,51 +8,53 @@ add_definitions(
 
 include_directories(
     BEFORE include
-    ${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
 
 list(APPEND SOURCE
     csr/api.c
     csr/capture.c
     csr/connect.c
     dbg/dbgui.c
-       ldr/ldrapi.c
-       ldr/ldrinit.c
-       ldr/ldrpe.c
-       ldr/ldrutils.c
+    ldr/ldrapi.c
+    ldr/ldrinit.c
+    ldr/ldrpe.c
+    ldr/ldrutils.c
     rtl/libsupp.c
     rtl/version.c
-    def/ntdll.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def)
-    
-if(ARCH MATCHES i386)
-list(APPEND SOURCE dispatch/i386/dispatch.S)
-elseif(ARCH MATCHES amd64)
-list(APPEND SOURCE dispatch/amd64/stubs.c)
-elseif(ARCH MATCHES arm)
-list(APPEND SOURCE dispatch/arm/stubs_asm.s)
+    etw/trace.c
+    include/ntdll.h)
+
+if(ARCH STREQUAL "i386")
+    list(APPEND ASM_SOURCE dispatch/i386/dispatch.S)
+elseif(ARCH STREQUAL "amd64")
+    list(APPEND ASM_SOURCE dispatch/amd64/dispatch.S)
+elseif(ARCH STREQUAL "arm")
+    list(APPEND ASM_SOURCE dispatch/arm/stubs_asm.s)
 else()
-list(APPEND SOURCE dispatch/dispatch.c)
-endif(ARCH MATCHES i386)
+    list(APPEND SOURCE dispatch/dispatch.c)
+endif()
 
-add_library(ntdll SHARED ${SOURCE})
+add_asm_files(ntdll_asm ${ASM_SOURCE})
 
-set_entrypoint(ntdll 0)
+add_library(ntdll SHARED
+    ${SOURCE}
+    ${ntdll_asm}
+    def/ntdll.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/ntdll_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def)
+
+set_module_type(ntdll win32dll HOTPATCHABLE ENTRYPOINT 0)
+#############################################
+## HACK FOR MSVC COMPILATION WITH win32dll ##
+set_subsystem(ntdll console)
+################# END  HACK #################
 
 if(MSVC)
-target_link_libraries(ntdll rtl)
-add_linkerflag(ntdll /RELEASE)
-else()
-target_link_libraries(ntdll -Wl,--whole-archive rtl -Wl,--no-whole-archive)
+    add_target_link_flags(ntdll "/RELEASE")
 endif()
 
-target_link_libraries(ntdll
-                      ntdllsys
-                      libcntpr
-                      ${PSEH_LIB})
-
-set_image_base(ntdll ${baseaddress_ntdll})
-add_pch(ntdll include/ntdll.h)
+target_link_libraries(ntdll rtl ntdllsys libcntpr uuid ${PSEH_LIB})
+add_pch(ntdll include/ntdll.h SOURCE)
 add_dependencies(ntdll ntstatus asm)
-
 add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all)
-add_importlib_target(def/ntdll.spec)