[CMAKE]

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

svn path=/branches/cmake-bringup/; revision=48956

diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt
index aa9bb05..adfddd7 100644 (file)
--- a/dll/win32/wshirda/CMakeLists.txt
+++ b/dll/win32/wshirda/CMakeLists.txt
@@ -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)

diff --git a/dll/win32/wshtcpip/CMakeLists.txt b/dll/win32/wshtcpip/CMakeLists.txt
index 4aded70..84688a8 100644 (file)
--- a/dll/win32/wshtcpip/CMakeLists.txt
+++ b/dll/win32/wshtcpip/CMakeLists.txt
@@ -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)

diff --git a/dll/win32/wsock32/CMakeLists.txt b/dll/win32/wsock32/CMakeLists.txt
index 3e05be8..1c65c3f 100644 (file)
--- a/dll/win32/wsock32/CMakeLists.txt
+++ b/dll/win32/wsock32/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+add_definitions(-DUNICODE -D_UNICODE)
+
 add_library(wsock32 SHARED stubs.c wsock32.rc)
 
 set_module_type(wsock32 win32dll)

diff --git a/drivers/video/font/CMakeLists.txt b/drivers/video/font/CMakeLists.txt
index e34ffbf..0b35f38 100644 (file)
--- a/drivers/video/font/CMakeLists.txt
+++ b/drivers/video/font/CMakeLists.txt
@@ -1,2 +1,3 @@
 
+add_subdirectory(bmfd)
 add_subdirectory(ftfd)

diff --git a/include/reactos/idl/CMakeLists.txt b/include/reactos/idl/CMakeLists.txt
index 5d5bc38..c226ccb 100644 (file)
--- a/include/reactos/idl/CMakeLists.txt
+++ b/include/reactos/idl/CMakeLists.txt
@@ -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})