projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CMAKE] Use modules instead of shared libraries
[reactos.git]
/
dll
/
ntdll
/
CMakeLists.txt
diff --git
a/dll/ntdll/CMakeLists.txt
b/dll/ntdll/CMakeLists.txt
index
d990093
..
5ea6ca5
100644
(file)
--- a/
dll/ntdll/CMakeLists.txt
+++ b/
dll/ntdll/CMakeLists.txt
@@
-8,8
+8,7
@@
add_definitions(
include_directories(
BEFORE include
include_directories(
BEFORE include
- ${REACTOS_SOURCE_DIR}/include/reactos/subsys
- ${REACTOS_SOURCE_DIR}/win32ss/include)
+ ${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys)
list(APPEND SOURCE
csr/api.c
list(APPEND SOURCE
csr/api.c
@@
-20,8
+19,11
@@
list(APPEND SOURCE
ldr/ldrinit.c
ldr/ldrpe.c
ldr/ldrutils.c
ldr/ldrinit.c
ldr/ldrpe.c
ldr/ldrutils.c
+ ldr/verifier.c
rtl/libsupp.c
rtl/libsupp.c
+ rtl/uilist.c
rtl/version.c
rtl/version.c
+ etw/trace.c
include/ntdll.h)
if(ARCH STREQUAL "i386")
include/ntdll.h)
if(ARCH STREQUAL "i386")
@@
-36,14
+38,14
@@
endif()
add_asm_files(ntdll_asm ${ASM_SOURCE})
add_asm_files(ntdll_asm ${ASM_SOURCE})
-add_library(ntdll
SHARED
+add_library(ntdll
MODULE
${SOURCE}
${ntdll_asm}
def/ntdll.rc
${CMAKE_CURRENT_BINARY_DIR}/ntdll_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/ntdll.def)
${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)
+set_module_type(ntdll win32dll ENTRYPOINT 0)
#############################################
## HACK FOR MSVC COMPILATION WITH win32dll ##
set_subsystem(ntdll console)
#############################################
## HACK FOR MSVC COMPILATION WITH win32dll ##
set_subsystem(ntdll console)
@@
-53,15
+55,7
@@
if(MSVC)
add_target_link_flags(ntdll "/RELEASE")
endif()
add_target_link_flags(ntdll "/RELEASE")
endif()
-target_link_libraries(ntdll
- rtl
- ntdllsys
- libcntpr
- uuid
- ${PSEH_LIB})
-
+target_link_libraries(ntdll rtl ntdllsys libcntpr uuid ${PSEH_LIB})
add_pch(ntdll include/ntdll.h SOURCE)
add_dependencies(ntdll ntstatus asm)
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_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all)
-