[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 8 Oct 2010 21:34:25 +0000 (21:34 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 8 Oct 2010 21:34:25 +0000 (21:34 +0000)
- More work on the dlls.

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

43 files changed:
dll/win32/slbcsp/CMakeLists.txt
dll/win32/smdll/CMakeLists.txt
dll/win32/sndblst/CMakeLists.txt
dll/win32/snmpapi/CMakeLists.txt
dll/win32/spoolss/CMakeLists.txt
dll/win32/srclient/CMakeLists.txt
dll/win32/sti/CMakeLists.txt
dll/win32/sxs/CMakeLists.txt
dll/win32/t2embed/CMakeLists.txt
dll/win32/tapi32/CMakeLists.txt
dll/win32/tapiui/CMakeLists.txt
dll/win32/traffic/CMakeLists.txt
dll/win32/updspapi/CMakeLists.txt
dll/win32/url/CMakeLists.txt
dll/win32/urlmon/CMakeLists.txt
dll/win32/user32/CMakeLists.txt
dll/win32/usp10/CMakeLists.txt
dll/win32/uxtheme/CMakeLists.txt
dll/win32/windowscodecs/CMakeLists.txt
dll/win32/winemp3.acm/CMakeLists.txt
dll/win32/winfax/CMakeLists.txt
dll/win32/wing32/CMakeLists.txt
dll/win32/winhttp/CMakeLists.txt
dll/win32/wininet/CMakeLists.txt
dll/win32/winmm/CMakeLists.txt
dll/win32/winspool/CMakeLists.txt
dll/win32/winsta/CMakeLists.txt
dll/win32/wintrust/CMakeLists.txt
dll/win32/wlanapi/CMakeLists.txt
dll/win32/wldap32/CMakeLists.txt
dll/win32/ws2_32/CMakeLists.txt
dll/win32/ws2_32_new/CMakeLists.txt
dll/win32/ws2help/CMakeLists.txt
dll/win32/wshirda/CMakeLists.txt
dll/win32/wshtcpip/CMakeLists.txt
dll/win32/wsock32/CMakeLists.txt
dll/win32/wtsapi32/CMakeLists.txt
dll/win32/wuapi/CMakeLists.txt
dll/win32/xinput1_1/CMakeLists.txt
dll/win32/xinput1_2/CMakeLists.txt
dll/win32/xinput1_3/CMakeLists.txt
dll/win32/xinput9_1_0/CMakeLists.txt
dll/win32/xmllite/CMakeLists.txt

index bc208a7..5113a49 100644 (file)
@@ -1,19 +1,16 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
 
 spec2def(slbcsp ${CMAKE_CURRENT_SOURCE_DIR}/slbcsp.spec ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def)
 
 add_library(slbcsp SHARED main.c)
 
-set_target_properties(slbcsp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(slbcsp win32dll)
 
 target_link_libraries(slbcsp
     ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def
-    wine
-    mingw_common)
+    wine)
 
-add_dependencies(slbcsp slbcsp_def psdk)
+add_importlibs(slbcsp kernel32 ntdll)
+add_dependencies(slbcsp slbcsp_def)
index 4e59f5a..14ddfbd 100644 (file)
@@ -1,6 +1,4 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
 spec2def(smdll ${CMAKE_CURRENT_SOURCE_DIR}/smdll.spec ${CMAKE_CURRENT_BINARY_DIR}/smdll.def)
@@ -12,7 +10,7 @@ add_library(smdll SHARED
 
 target_link_libraries(smdll
     ${CMAKE_CURRENT_BINARY_DIR}/smdll.def
-    smlib
-    -lntdll)
+    smlib)
 
-add_dependencies(smdll smdll_def psdk)
+add_importlibs(smdll ntdll)
+add_dependencies(smdll smdll_def psdk buildno_header)
index a44ceb3..fdffaa0 100644 (file)
@@ -1,25 +1,19 @@
 
+set_unicode()
 
-
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
-
-add_definitions(-DUNICODE -D_UNICODE)
 add_definitions(-DDEBUG_NT4)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
 spec2def(sndblst ${CMAKE_CURRENT_SOURCE_DIR}/sndblst.spec ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def)
 
 add_library(sndblst SHARED sndblst.c)
 
-set_target_properties(sndblst PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(sndblst win32dll)
 
 target_link_libraries(sndblst
     ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def
     mment4
-    mmebuddy
-    -luser32
-    -lwinmm
-    -ladvapi32
-    -lkernel32  
-    -lntdll)
+    mmebuddy)
 
-add_dependencies(sndblst sndblst_def psdk)
+add_importlibs(sndblst user32 winmm advapi32 kernel32 ntdll)
+add_dependencies(sndblst sndblst_def)
index 43997f9..c2f9e77 100644 (file)
@@ -1,9 +1,6 @@
 
-
-
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
@@ -12,11 +9,11 @@ spec2def(snmpapi ${CMAKE_CURRENT_SOURCE_DIR}/snmpapi.spec ${CMAKE_CURRENT_BINARY
 
 add_library(snmpapi SHARED main.c snmpapi.rc)
 
-set_target_properties(snmpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(snmpapi win32dll)
 
 target_link_libraries(snmpapi
     ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def
-    wine
-    mingw_common)
+    wine)
 
-add_dependencies(snmpapi snmpapi_def psdk)
+add_importlibs(snmpapi kernel32 ntdll)
+add_dependencies(snmpapi snmpapi_def)
index 10d4f38..a225f02 100644 (file)
@@ -1,20 +1,16 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
 
 spec2def(spoolss ${CMAKE_CURRENT_SOURCE_DIR}/spoolss.spec ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
 
 add_library(spoolss SHARED spoolss_main.c router.c)
 
-set_target_properties(spoolss PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(spoolss win32dll)
 
 target_link_libraries(spoolss
     ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def
-    wine
-    -lwinspool
-    mingw_common)
+    wine)
 
-add_dependencies(spoolss spoolss_def psdk)
+add_importlibs(spoolss winspool kernel32 ntdll)
+add_dependencies(spoolss spoolss_def)
index 8bd5bd5..a5f542d 100644 (file)
@@ -1,15 +1,11 @@
 
-
-
 spec2def(srclient ${CMAKE_CURRENT_SOURCE_DIR}/srclient.spec ${CMAKE_CURRENT_BINARY_DIR}/srclient.def)
 
 add_library(srclient SHARED srclient_main.c)
 
-set_target_properties(srclient PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(srclient 0)
 
-target_link_libraries(srclient
-    ${CMAKE_CURRENT_BINARY_DIR}/srclient.def
-    -lkernel32
-    -lntdll)
+target_link_libraries(srclient ${CMAKE_CURRENT_BINARY_DIR}/srclient.def)
 
+add_importlibs(srclient kernel32 ntdll)
 add_dependencies(srclient srclient_def psdk)
index 7d3ab0b..686076d 100644 (file)
@@ -1,10 +1,12 @@
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
-add_definitions(-D__WINESRC__)
-add_definitions(-DENTRY_PREFIX=STI_)
-add_definitions(-DPROXY_DELEGATION)
-add_definitions(-DREGISTER_PROXY_DLL)
+
+add_definitions(
+    -D__WINESRC__
+    -DENTRY_PREFIX=STI_
+    -DPROXY_DELEGATION
+    -DREGISTER_PROXY_DLL)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
@@ -13,8 +15,7 @@ spec2def(sti ${CMAKE_CURRENT_SOURCE_DIR}/sti.spec ${CMAKE_CURRENT_BINARY_DIR}/st
 add_library(sti SHARED
     regsvr.c
     sti.c
-    sti_main.c
-    sti_wia.idl)# not sure
+    sti_main.c)
 
 set_entrypoint(sti 0)
 
index 49cb76e..d0f6b73 100644 (file)
@@ -1,19 +1,16 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
 
 spec2def(sxs ${CMAKE_CURRENT_SOURCE_DIR}/sxs.spec ${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
 
 add_library(sxs SHARED sxs.c)
 
-set_target_properties(sxs PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(sxs 0)
 
 target_link_libraries(sxs
     ${CMAKE_CURRENT_BINARY_DIR}/sxs.def
-    wine
-    mingw_common)
+    wine)
 
+add_importlibs(sxs kernel32 ntdll)
 add_dependencies(sxs sxs_def psdk)
index b93cd89..ff16a5c 100644 (file)
@@ -1,23 +1,18 @@
 
-
+set_unicode()
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_definitions(-DUNICODE -D_UNICODE)
-
 spec2def(t2embed ${CMAKE_CURRENT_SOURCE_DIR}/t2embed.spec ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def)
 
 add_library(t2embed SHARED t2embed.c t2embed.rc)
 
-set_target_properties(t2embed PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(t2embed win32dll)
 
 target_link_libraries(t2embed
     ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def
-    wine
-    -lgdi32
-    -luser32
-    -ladvapi32
-    -lversion
-    mingw_common)
-
-add_dependencies(t2embed t2embed_def psdk)
+    wine)
+
+add_importlibs(t2embed gdi32 user32 advapi32 version kernel32 ntdll)
+
+add_dependencies(t2embed t2embed_def)
index 0433c57..40d8901 100644 (file)
@@ -1,8 +1,5 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
 
 spec2def(tapi32 ${CMAKE_CURRENT_SOURCE_DIR}/tapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def)
@@ -13,12 +10,11 @@ add_library(tapi32 SHARED
     line.c
     phone.c)
 
-set_target_properties(tapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(tapi32 0)
 
 target_link_libraries(tapi32
     ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def
-    wine
-    -ladvapi32
-    mingw_common)
+    wine)
 
-add_dependencies(tapi32 tapi32_def psdk)
+add_importlibs(tapi32 advapi32 kernel32 ntdll)
+add_dependencies(tapi32 tapi32_def psdk buildno_header)
index 641d658..5c21963 100644 (file)
@@ -1,8 +1,4 @@
 
-set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
-
 add_library(tapiui SHARED tapiui.rc)
-
-set_target_properties(tapiui PROPERTIES LINK_FLAGS "-Wl,-entry,0")
-
-add_dependencies(tapiui psdk)
+set_entrypoint(tapiui 0)
+add_dependencies(tapiui psdk buildno_header)
index 77987ed..0bf4ad7 100644 (file)
@@ -1,19 +1,16 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
 
 spec2def(traffic ${CMAKE_CURRENT_SOURCE_DIR}/traffic.spec ${CMAKE_CURRENT_BINARY_DIR}/traffic.def)
 
 add_library(traffic SHARED traffic_main.c)
 
-set_target_properties(traffic PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(traffic win32dll)
 
 target_link_libraries(traffic
     ${CMAKE_CURRENT_BINARY_DIR}/traffic.def
-    wine
-    mingw_common)
+    wine)
 
-add_dependencies(traffic traffic_def psdk)
+add_importlibs(traffic kernel32 ntdll)
+add_dependencies(traffic traffic_def psdk buildno_header)
index 0441a04..4438b91 100644 (file)
@@ -1,20 +1,16 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
 
 spec2def(updspapi ${CMAKE_CURRENT_SOURCE_DIR}/updspapi.spec ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def)
 
 add_library(updspapi SHARED main.c)
 
-set_target_properties(updspapi PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(updspapi 0)
 
 target_link_libraries(updspapi
     ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def
-    wine
-    -lsetupapi
-    mingw_common)
+    wine)
 
-add_dependencies(updspapi updspapi_def psdk)
+add_importlibs(updspapi setupapi kernel32 ntdll)
+add_dependencies(updspapi updspapi_def psdk buildno_header)
index 605acd5..7458dde 100644 (file)
@@ -1,21 +1,16 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
 
 spec2def(url ${CMAKE_CURRENT_SOURCE_DIR}/url.spec ${CMAKE_CURRENT_BINARY_DIR}/url.def)
 
 add_library(url SHARED url_main.c)
 
-set_target_properties(url PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(url win32dll)
 
 target_link_libraries(url
     ${CMAKE_CURRENT_BINARY_DIR}/url.def
-    wine
-    -lshell32
-    -lshlwapi
-    mingw_common)
+    wine)
 
-add_dependencies(url url_def psdk)
+add_importlibs(url shell32 shlwapi kernel32 ntdll)
+add_dependencies(url url_def)
index da2ede7..60ea514 100644 (file)
@@ -1,5 +1,6 @@
 
 add_definitions(-D__WINESRC__)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
index e596388..d90fe91 100644 (file)
@@ -1,17 +1,16 @@
 
+set_unicode()
 
-
-add_definitions(-DUNICODE -D_UNICODE)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
-include_directories(include)
+include_directories(
+    BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
+    include)
 
 set_rc_compiler()
 
 list(APPEND SOURCE
-    user32_stubs.c
     controls/button.c
     controls/combo.c
     controls/edit.c
@@ -62,25 +61,21 @@ list(APPEND SOURCE
     windows/spy.c
     windows/text.c
     windows/window.c
-    windows/winpos.c)
+    windows/winpos.c
+    user32_stubs.c
+    user32.rc)
 
 add_library(user32 SHARED
-    ${SOURCE}
-    ${CMAKE_CURRENT_SOURCE_DIR}/user32.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch)
+    ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch
+    ${SOURCE})
 
-set_target_properties(user32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(user32 win32dll)
 
 target_link_libraries(user32
     ${CMAKE_CURRENT_SOURCE_DIR}/user32.def
     wine
-    -lgdi32
-    -ladvapi32
-    -limm32
     win32ksys
-    pseh
-    -lkernel32
-    -lntdll)
+    pseh)
                       
 add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE})
-add_dependencies(user32 psdk)
+add_importlibs(user32 gdi32 advapi32 imm32 kernel32 ntdll)
index 8f279e2..0e5a2f5 100644 (file)
@@ -1,8 +1,5 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
 
 spec2def(usp10 ${CMAKE_CURRENT_SOURCE_DIR}/usp10.spec ${CMAKE_CURRENT_BINARY_DIR}/usp10.def)
@@ -14,12 +11,11 @@ add_library(usp10 SHARED
     shape.c
     shaping.c)
 
-set_target_properties(usp10 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(usp10 win32dll)
 
 target_link_libraries(usp10
     ${CMAKE_CURRENT_BINARY_DIR}/usp10.def
-    wine
-    -lgdi32
-    mingw_common)
+    wine)
 
-add_dependencies(usp10 usp10_def psdk)
+add_importlibs(usp10 gdi32 kernel32 ntdll)
+add_dependencies(usp10 usp10_def)
index 548125d..d0a931c 100644 (file)
@@ -1,8 +1,5 @@
 
-
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_definitions(-D__WINESRC__)
 
 spec2def(uxtheme ${CMAKE_CURRENT_SOURCE_DIR}/uxtheme.spec ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def)
@@ -19,15 +16,11 @@ add_library(uxtheme SHARED
     uxini.c
     version.rc)
 
-set_target_properties(uxtheme PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(uxtheme win32dll)
 
 target_link_libraries(uxtheme
     ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def
-    wine
-    -luser32
-    -ladvapi32
-    -lgdi32
-    -lmsimg32
-    mingw_common)
+    wine)
 
-add_dependencies(uxtheme uxtheme_def psdk)
+add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 kernel32 ntdll)
+add_dependencies(uxtheme uxtheme_def)
index 657574e..98cf7a6 100644 (file)
@@ -41,4 +41,4 @@ target_link_libraries(windowscodecs
     wine)
 
 add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll)
-add_dependencies(windowscodecs windowscodecs_def psdk)
+add_dependencies(windowscodecs windowscodecs_def)
index 057afc9..b9ae2a0 100644 (file)
@@ -14,7 +14,8 @@ add_custom_target(winemp3.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winemp
 
 add_library(winemp3.acm SHARED mpegl3.c)
 
-set_target_properties(winemp3.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "")
+set_entrypoint(winemp3.acm 0)
+set_target_properties(winemp3.acm PROPERTIES SUFFIX "")
 
 target_link_libraries(winemp3.acm
     ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def
index 4745159..d203363 100644 (file)
@@ -3,7 +3,7 @@ spec2def(winfax ${CMAKE_CURRENT_SOURCE_DIR}/winfax.spec ${CMAKE_CURRENT_BINARY_D
 
 add_library(winfax SHARED winfax.c winfax.rc)
 
-set_target_properties(winfax PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(winfax 0)
 
 target_link_libraries(winfax ${CMAKE_CURRENT_BINARY_DIR}/winfax.def)
 
index be01521..386abe2 100644 (file)
@@ -1,11 +1,11 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
+set_unicode()
 
 spec2def(wing32 ${CMAKE_CURRENT_SOURCE_DIR}/wing32.spec ${CMAKE_CURRENT_BINARY_DIR}/wing32.def)
 
 add_library(wing32 SHARED wing32.c)
 
-set_target_properties(wing32 PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(wing32 0)
 
 target_link_libraries(wing32 ${CMAKE_CURRENT_BINARY_DIR}/wing32.def)
 
index d7702c9..3307e38 100644 (file)
@@ -1,6 +1,5 @@
 
 add_definitions(-D__WINESRC__)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(winhttp ${CMAKE_CURRENT_SOURCE_DIR}/winhttp.spec ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
@@ -21,4 +20,4 @@ target_link_libraries(winhttp
     wine)
 
 add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt kernel32 ntdll)
-add_dependencies(winhttp winhttp_def psdk)
+add_dependencies(winhttp winhttp_def)
index 9b84707..da75d7c 100644 (file)
@@ -33,4 +33,4 @@ target_link_libraries(wininet
     pseh)
 
 add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll)
-add_dependencies(wininet wininet_def psdk buildno_header)
+add_dependencies(wininet wininet_def)
index 1f72118..d6c035a 100644 (file)
@@ -26,6 +26,6 @@ target_link_libraries(winmm
     pseh)
 
 add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
-add_dependencies(winmm winmm_def psdk)
+add_dependencies(winmm winmm_def)
 
 add_subdirectory(midimap)
index 2036205..e7de322 100644 (file)
@@ -1,5 +1,6 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
+set_unicode()
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(winspool ${CMAKE_CURRENT_SOURCE_DIR}/winspool.spec ${CMAKE_CURRENT_BINARY_DIR}/winspool.def)
@@ -17,4 +18,4 @@ target_link_libraries(winspool
     wine)
 
 add_importlibs(winspool advapi32 shlwapi kernel32 ntdll)
-add_dependencies(winspool winspool_def psdk)
+add_dependencies(winspool winspool_def)
index d9adff7..df63e67 100644 (file)
@@ -23,4 +23,4 @@ target_link_libraries(winsta
 
 add_importlibs(winsta kernel32 ntdll)
 add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE})
-add_dependencies(winsta winsta_def psdk)
+add_dependencies(winsta winsta_def)
index 5c5a429..0544a54 100644 (file)
@@ -20,4 +20,4 @@ target_link_libraries(wintrust
     pseh)
 
 add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll)
-add_dependencies(wintrust wintrust_def psdk buildno_header)
+add_dependencies(wintrust wintrust_def)
index 4f4e4e7..1bdb222 100644 (file)
@@ -5,7 +5,7 @@ spec2def(wlanapi ${CMAKE_CURRENT_SOURCE_DIR}/wlanapi.spec ${CMAKE_CURRENT_BINARY
 
 add_library(wlanapi SHARED main.c)
 
-set_target_properties(wlanapi PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(wlanapi 0)
 
 target_link_libraries(wlanapi
     ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def
@@ -14,4 +14,4 @@ target_link_libraries(wlanapi
     pseh)
 
 add_importlibs(wlanapi rpcrt4 kernel32 ntdll)
-add_dependencies(wlanapi wlanapi_def psdk)
+add_dependencies(wlanapi wlanapi_def psdk buildno_header)
index e9765f7..84e1bc8 100644 (file)
@@ -34,4 +34,4 @@ target_link_libraries(wldap32
      wine)
 
 add_importlibs(wldap32 user32 kernel32 ntdll)
-add_dependencies(wldap32 wldap32_def psdk)
+add_dependencies(wldap32 wldap32_def)
index 61f8b87..8b1d735 100644 (file)
@@ -1,5 +1,6 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
+set_unicode()
+
 add_definitions(-DLE)
 add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT)
 
@@ -9,7 +10,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/ws2_32.spec ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def)
 
 list(APPEND SOURCE
-    ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_ws2_32.h.gch
     misc/bsd.c
     misc/catalog.c
     misc/dllmain.c
@@ -32,4 +32,4 @@ target_link_libraries(ws2_32
 
 add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help kernel32 ntdll)
 add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE})
-add_dependencies(ws2_32 ws2_32_def psdk)
+add_dependencies(ws2_32 ws2_32_def)
index e598b41..c48293c 100644 (file)
@@ -52,4 +52,4 @@ target_link_libraries(ws2_32_new
      wine)
 
 add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll)
-add_dependencies(ws2_32_new ws2_32_new_def psdk)
+add_dependencies(ws2_32_new ws2_32_new_def)
index 96dddc2..a54ac1a 100644 (file)
@@ -14,4 +14,4 @@ set_module_type(ws2help win32dll)
 
 target_link_libraries(ws2help ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
 add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll)
-add_dependencies(ws2help ws2help_def psdk)
+add_dependencies(ws2help ws2help_def)
index cf8b05e..9ddf8b8 100644 (file)
@@ -9,4 +9,4 @@ set_module_type(wshirda win32dll)
 
 target_link_libraries(wshirda ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
 add_importlibs(wshirda ws2_32 kernel32 ntdll)
-add_dependencies(wshirda wshirda_def psdk)
+add_dependencies(wshirda wshirda_def)
index 2a6a703..17ae566 100644 (file)
@@ -7,11 +7,11 @@ spec2def(wshtcpip ${CMAKE_CURRENT_SOURCE_DIR}/wshtcpip.spec ${CMAKE_CURRENT_BINA
 
 add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc)
 
-set_target_properties(wshtcpip PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(wshtcpip 0)
 
 target_link_libraries(wshtcpip
     ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def
     tdilib)
 
-add_importlibs(wshtcpip kernel32 ws2_32 kernel32 ntdll)
-add_dependencies(wshtcpip wshtcpip_def psdk)
+add_importlibs(wshtcpip ws2_32 kernel32 ntdll)
+add_dependencies(wshtcpip wshtcpip_def psdk buildno_header)
index 6cdf4be..4016198 100644 (file)
@@ -7,4 +7,3 @@ set_module_type(wsock32 win32dll)
 
 target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def)
 add_importlibs(wsock32 ws2_32 kernel32 ntdll)
-add_dependencies(wsock32 psdk)
index 9e12995..c85c554 100644 (file)
@@ -13,4 +13,4 @@ target_link_libraries(wtsapi32
     wine)
 
 add_importlibs(wtsapi32 advapi32 kernel32 ntdll)
-add_dependencies(wtsapi32 wtsapi32_def psdk)
+add_dependencies(wtsapi32 wtsapi32_def)
index 144799b..31708ec 100644 (file)
@@ -21,7 +21,8 @@ set_module_type(wuapi win32dll)
 
 target_link_libraries(wuapi
     ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def
-    wine)
+    wine
+    uuid)
 
-add_importlibs(wuapi uuid ole32 advapi32 kernel32 ntdll)
+add_importlibs(wuapi ole32 advapi32 kernel32 ntdll)
 add_dependencies(wuapi wuapi_def)
index eabc8f8..98134c9 100644 (file)
@@ -6,8 +6,8 @@ spec2def(xinput1_1 ${CMAKE_CURRENT_SOURCE_DIR}/xinput1_1.spec ${CMAKE_CURRENT_BI
 
 add_library(xinput1_1 SHARED xinput1_1_main.c version.rc)
 
-add_importlibs(xinput1_1 kernel32)
-
 set_module_type(xinput1_1 win32dll)
+
 target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def)
-add_dependencies(xinput1_1 xinput1_1_def psdk buildno_header)
+add_importlibs(xinput1_1 kernel32)
+add_dependencies(xinput1_1 xinput1_1_def)
index dffd03a..5fece8e 100644 (file)
@@ -10,4 +10,4 @@ add_importlibs(xinput1_2 kernel32)
 
 set_module_type(xinput1_2 win32dll)
 target_link_libraries(xinput1_2 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def)
-add_dependencies(xinput1_2 xinput1_2_def psdk buildno_header)
+add_dependencies(xinput1_2 xinput1_2_def)
index 92ec3d7..0c6da0c 100644 (file)
@@ -14,4 +14,4 @@ target_link_libraries(xinput1_3
 
 add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
 
-add_dependencies(xinput1_3 xinput1_3_def psdk buildno_header)
+add_dependencies(xinput1_3 xinput1_3_def)
index f59aa61..b7b968c 100644 (file)
@@ -10,4 +10,4 @@ add_importlibs(xinput9_1_0 kernel32)
 
 set_module_type(xinput9_1_0 win32dll)
 target_link_libraries(xinput9_1_0 ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def)
-add_dependencies(xinput9_1_0 xinput9_1_0_def psdk buildno_header)
+add_dependencies(xinput9_1_0 xinput9_1_0_def)
index e2b310a..971ac83 100644 (file)
@@ -14,4 +14,4 @@ target_link_libraries(xmllite
 
 add_importlibs(xmllite kernel32 ntdll)
 
-add_dependencies(xmllite xmllite_def psdk buildno_header)
+add_dependencies(xmllite xmllite_def)