-spec2def(ntdll.dll def/ntdll.spec)
+spec2def(ntdll.dll def/ntdll.spec ADD_IMPORTLIB)
add_definitions(
-D__NTDLL__
include_directories(
BEFORE include
- ${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+ ${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys)
list(APPEND SOURCE
csr/api.c
ldr/ldrinit.c
ldr/ldrpe.c
ldr/ldrutils.c
+ ldr/verifier.c
rtl/libsupp.c
+ rtl/uilist.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)
+endif()
-add_library(ntdll SHARED ${SOURCE})
+add_asm_files(ntdll_asm ${ASM_SOURCE})
+
+add_library(ntdll MODULE
+ ${SOURCE}
+ ${ntdll_asm}
+ def/ntdll.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/ntdll_stubs.c
+ ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def)
set_module_type(ntdll win32dll ENTRYPOINT 0)
+#############################################
+## HACK FOR MSVC COMPILATION WITH win32dll ##
+set_subsystem(ntdll console)
+################# END HACK #################
if(MSVC)
add_target_link_flags(ntdll "/RELEASE")
endif()
-target_link_libraries(ntdll
- rtl
- ntdllsys
- libcntpr
- ${PSEH_LIB})
-
-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)