From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 29 Aug 2010 21:32:32 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~877
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=5598df126e9a05f6df273ee958e07d1ba120f7c1

[CMAKE]
- Improve ntdll.

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

diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt
index a161f32dd40..3ec7ea1c3dc 100644
--- a/dll/ntdll/CMakeLists.txt
+++ b/dll/ntdll/CMakeLists.txt
@@ -5,22 +5,34 @@ add_definitions(-D__NTDLL__)
 add_definitions(-D_NTOSKRNL_)
 add_definitions(-DCRTDLL)
 
-include_directories(BEFORE ./include)
+include_directories(BEFORE include)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
-file(GLOB_RECURSE SOURCE *.c)
-list(REMOVE_ITEM SOURCE
-     ${CMAKE_CURRENT_SOURCE_DIR}/ldr/elf.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/dispatch/dispatch.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/dispatch/amd64/stubs.c)
-file(GLOB_RECURSE ARCH_SOURCE
-    "${CMAKE_CURRENT_SOURCE_DIR}/dispatch/${ARCH}/*.c"
-    "${CMAKE_CURRENT_SOURCE_DIR}/dispatch/${ARCH}/*.s")
+list(APPEND SOURCE
+    csr/api.c
+    csr/capture.c
+    csr/connect.c
+    dbg/dbgui.c
+    ldr/startup.c
+    ldr/utils.c
+    ldr/actctx.c
+    rtl/libsupp.c
+    rtl/version.c
+    def/ntdll.rc)
+
+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)
+else()
+list(APPEND SOURCE dispatch/dispatch.c)
+endif(ARCH MATCHES i386)
 
 add_library(ntdll SHARED
-            ${ARCH_SOURCE} ${SOURCE}
-            ${CMAKE_CURRENT_SOURCE_DIR}/def/ntdll.rc
-            ${CMAKE_CURRENT_BINARY_DIR}/ntdll_ntdll.h.gch)
+    ${SOURCE}
+    ${CMAKE_CURRENT_BINARY_DIR}/ntdll_ntdll.h.gch)
 
 set_target_properties(ntdll PROPERTIES LINK_FLAGS "-Wl,-entry,0")