[ros-diffs] [akhaldi] 48342: [CMAKE] - Add ntsys to build.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Wed Jul 28 23:21:14 UTC 2010


Author: akhaldi
Date: Wed Jul 28 23:21:13 2010
New Revision: 48342

URL: http://svn.reactos.org/svn/reactos?rev=48342&view=rev
Log:
[CMAKE]
- Add ntsys to build.

Added:
    branches/cmake-bringup/dll/CMakeLists.txt   (with props)
    branches/cmake-bringup/dll/ntdll/CMakeLists.txt   (with props)
Modified:
    branches/cmake-bringup/CMakeLists.txt

Modified: branches/cmake-bringup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=48342&r1=48341&r2=48342&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Jul 28 23:21:13 2010
@@ -16,7 +16,7 @@
 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/dxsdk)
 add_subdirectory(include/reactos/mc)
 
+add_subdirectory(dll)
 add_subdirectory(lib)
 
 # nci generated intermediate files
@@ -103,6 +104,7 @@
 
 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()
 

Added: branches/cmake-bringup/dll/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/CMakeLists.txt?rev=48342&view=auto
==============================================================================
--- branches/cmake-bringup/dll/CMakeLists.txt (added)
+++ branches/cmake-bringup/dll/CMakeLists.txt [iso-8859-1] Wed Jul 28 23:21:13 2010
@@ -1,0 +1,2 @@
+
+add_subdirectory(ntdll)

Propchange: branches/cmake-bringup/dll/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/dll/ntdll/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLists.txt?rev=48342&view=auto
==============================================================================
--- branches/cmake-bringup/dll/ntdll/CMakeLists.txt (added)
+++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Wed Jul 28 23:21:13 2010
@@ -1,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)

Propchange: branches/cmake-bringup/dll/ntdll/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native




More information about the Ros-diffs mailing list