ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse Source 
- Make static libs out of the idl files.
- Improve wshirda, wshtcpip and wsock32.
- Include bmfd into build.

svn path=/branches/cmake-bringup/; revision=48956
This commit is contained in:
Amine Khaldi
2010-10-01 21:33:07 +00:00
parent 9d4f5c4c27
commit 466fc93fa7
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/win32/wshirda/CMakeLists.txt
+2
View File
@@ -1,4 +1,6 @@
add_definitions(-DUNICODE -D_UNICODE)
spec2def(wshirda ${CMAKE_CURRENT_SOURCE_DIR}/wshirda.spec ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
add_library(wshirda SHARED wshirda.c wshirda.rc)
dll/win32/wshtcpip/CMakeLists.txt
+3 -2
View File
@@ -1,15 +1,16 @@
add_definitions(-DUNICODE -D_UNICODE)
include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib)
spec2def(wshtcpip ${CMAKE_CURRENT_SOURCE_DIR}/wshtcpip.spec ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def)
add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc)
set_module_type(wshtcpip win32dll)
set_target_properties(wshtcpip PROPERTIES LINK_FLAGS "-Wl,-entry,0")
target_link_libraries(wshtcpip
${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def
tdilib)
add_importlibs(wshtcpip ntdll ws2_32)
add_importlibs(wshtcpip kernel32 ntdll ws2_32)
add_dependencies(wshtcpip wshtcpip_def psdk)
dll/win32/wsock32/CMakeLists.txt
+2
View File
@@ -1,4 +1,6 @@
add_definitions(-DUNICODE -D_UNICODE)
add_library(wsock32 SHARED stubs.c wsock32.rc)
set_module_type(wsock32 win32dll)
drivers/video/font/CMakeLists.txt
+1
View File
@@ -1,2 +1,3 @@
add_subdirectory(bmfd)
add_subdirectory(ftfd)
include/reactos/idl/CMakeLists.txt
+2 -2
View File
@@ -29,7 +29,7 @@ MACRO (MACRO_IDL_FILES)
${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c
PROPERTIES GENERATED TRUE
)
add_custom_target(${FILE}_server ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c)
add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c
@@ -40,7 +40,7 @@ MACRO (MACRO_IDL_FILES)
${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c
PROPERTIES GENERATED TRUE
)
add_custom_target(${FILE}_client ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c)
add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c)
ENDFOREACH(_in_FILE ${ARGN})