From cf9ff97d225b5f4f8d68cedc7258464ee4e1b610 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 28 Jul 2010 23:21:13 +0000 Subject: [PATCH] [CMAKE] - Add ntsys to build. svn path=/branches/cmake-bringup/; revision=48342 --- CMakeLists.txt | 4 +++- dll/CMakeLists.txt | 2 ++ dll/ntdll/CMakeLists.txt | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 dll/CMakeLists.txt create mode 100644 dll/ntdll/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 12ddd5d0726..0be04084a44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories(./include/reactos/wine) add_subdirectory(tools) add_subdirectory(lib) -export(TARGETS widl wmc nci FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS widl winebuild wmc nci FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() @@ -68,6 +68,7 @@ add_subdirectory(include/psdk) add_subdirectory(include/dxsdk) add_subdirectory(include/reactos/mc) +add_subdirectory(dll) add_subdirectory(lib) # nci generated intermediate files @@ -103,6 +104,7 @@ SET_SOURCE_FILES_PROPERTIES(${nci_output} PROPERTIES GENERATED TRUE) ADD_CUSTOM_TARGET(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) ADD_CUSTOM_TARGET(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) +ADD_CUSTOM_TARGET(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) endif() diff --git a/dll/CMakeLists.txt b/dll/CMakeLists.txt new file mode 100644 index 00000000000..6318018b020 --- /dev/null +++ b/dll/CMakeLists.txt @@ -0,0 +1,2 @@ + +add_subdirectory(ntdll) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt new file mode 100644 index 00000000000..c80ebea7d89 --- /dev/null +++ b/dll/ntdll/CMakeLists.txt @@ -0,0 +1,16 @@ + +ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a + COMMAND ${MINGW_PREFIX}gcc ${CMAKE_C_FLAGS} -xc -E ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec > ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.spec + COMMAND native-winebuild -o ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.stubs.c --pedll ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.spec --filename ntdll.dll + COMMAND ${MINGW_PREFIX}gcc -o ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.stubs.o ${CMAKE_C_FLAGS} -c ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.stubs.c + COMMAND native-winebuild -o ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.auto.def --def -E ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.spec --filename ntdll.dll + COMMAND ${MINGW_PREFIX}dlltool --def ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.auto.def --kill-at --output-lib ${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a + COMMAND ${MINGW_PREFIX}ar -rc ${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.stubs.o + DEPENDS native-winebuild +) + +SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a PROPERTIES GENERATED TRUE) + +ADD_CUSTOM_TARGET(ntsys ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a) +add_dependencies(ntsys ntsys_pspec)