[ros-diffs] [akhaldi] 48956: [CMAKE] - Make static libs out of the idl files. - Improve wshirda, wshtcpip and wsock32. - Include bmfd into build.

[akhaldi]

Author: akhaldi
Date: Fri Oct  1 21:33:07 2010
New Revision: 48956

URL: http://svn.reactos.org/svn/reactos?rev=48956&view=rev
Log:
[CMAKE]
- Make static libs out of the idl files.
- Improve wshirda, wshtcpip and wsock32.
- Include bmfd into build.

Modified:
    branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt
    branches/cmake-bringup/drivers/video/font/CMakeLists.txt
    branches/cmake-bringup/include/reactos/idl/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt?rev=48956&r1=48955&r2=48956&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] 
(original)
+++ branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] Fri 
Oct  1 21:33:07 2010
@@ -1,3 +1,5 @@
+
+add_definitions(-DUNICODE -D_UNICODE)
 
 spec2def(wshirda ${CMAKE_CURRENT_SOURCE_DIR}/wshirda.spec 
${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
 

Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt?rev=48956&r1=48955&r2=48956&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] 
(original)
+++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Fri 
Oct  1 21:33:07 2010
@@ -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)

Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt?rev=48956&r1=48955&r2=48956&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] 
(original)
+++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Fri 
Oct  1 21:33:07 2010
@@ -1,3 +1,5 @@
+
+add_definitions(-DUNICODE -D_UNICODE)
 
 add_library(wsock32 SHARED stubs.c wsock32.rc)
 

Modified: branches/cmake-bringup/drivers/video/font/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/font/CMakeLists.txt?rev=48956&r1=48955&r2=48956&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/video/font/CMakeLists.txt [iso-8859-1] 
(original)
+++ branches/cmake-bringup/drivers/video/font/CMakeLists.txt [iso-8859-1] Fri 
Oct  1 21:33:07 2010
@@ -1,2 +1,3 @@
 
+add_subdirectory(bmfd)
 add_subdirectory(ftfd)

Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/idl/CMakeLists.txt?rev=48956&r1=48955&r2=48956&view=diff
==============================================================================
--- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] 
(original)
+++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Fri 
Oct  1 21:33:07 2010
@@ -29,7 +29,7 @@
       ${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 @@
       ${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})