Author: akhaldi Date: Fri Oct 8 21:34:25 2010 New Revision: 49060
URL: http://svn.reactos.org/svn/reactos?rev=49060&view=rev Log: [CMAKE] - More work on the dlls.
Modified: branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt branches/cmake-bringup/dll/win32/url/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt 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/dll/win32/wtsapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt
Modified: branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/slbcsp/C... ============================================================================== --- branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,5 +1,3 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
@@ -12,7 +10,7 @@
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)
Modified: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst/... ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,25 +1,19 @@
+set_unicode()
- +add_definitions(-DDEBUG_NT4) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) - -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DDEBUG_NT4)
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)
Modified: branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/snmpapi/... ============================================================================== --- branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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 @@
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)
Modified: branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/spoolss/... ============================================================================== --- branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/srclient... ============================================================================== --- branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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 @@ add_library(sti SHARED regsvr.c sti.c - sti_main.c - sti_wia.idl)# not sure + sti_main.c)
set_entrypoint(sti 0)
Modified: branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sxs/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/t2embed/... ============================================================================== --- branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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) + wine)
-add_dependencies(t2embed t2embed_def psdk) +add_importlibs(t2embed gdi32 user32 advapi32 version kernel32 ntdll) + +add_dependencies(t2embed t2embed_def)
Modified: branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapi32/C... ============================================================================== --- branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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 @@ 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)
Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/C... ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/traffic/... ============================================================================== --- branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/updspapi... ============================================================================== --- branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/url/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/url/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/url/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/url/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/C... ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,5 +1,6 @@
add_definitions(-D__WINESRC__) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)
Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/C... ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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 @@ 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)
Modified: branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/usp10/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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 @@ 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)
Modified: branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uxtheme/... ============================================================================== --- branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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 @@ 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)
Modified: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windowsc... ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -41,4 +41,4 @@ wine)
add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll) -add_dependencies(windowscodecs windowscodecs_def psdk) +add_dependencies(windowscodecs windowscodecs_def)
Modified: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winemp3.... ============================================================================== --- branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -14,7 +14,8 @@
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
Modified: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/C... ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -3,7 +3,7 @@
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)
Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/C... ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp/... ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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 @@ wine)
add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt kernel32 ntdll) -add_dependencies(winhttp winhttp_def psdk) +add_dependencies(winhttp winhttp_def)
Modified: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet/... ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -33,4 +33,4 @@ 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)
Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -26,6 +26,6 @@ pseh)
add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) -add_dependencies(winmm winmm_def psdk) +add_dependencies(winmm winmm_def)
add_subdirectory(midimap)
Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspool... ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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 @@ wine)
add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) -add_dependencies(winspool winspool_def psdk) +add_dependencies(winspool winspool_def)
Modified: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/C... ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -23,4 +23,4 @@
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)
Modified: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wintrust... ============================================================================== --- branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -20,4 +20,4 @@ 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)
Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi/... ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -5,7 +5,7 @@
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 @@ pseh)
add_importlibs(wlanapi rpcrt4 kernel32 ntdll) -add_dependencies(wlanapi wlanapi_def psdk) +add_dependencies(wlanapi wlanapi_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wldap32/... ============================================================================== --- branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -34,4 +34,4 @@ wine)
add_importlibs(wldap32 user32 kernel32 ntdll) -add_dependencies(wldap32 wldap32_def psdk) +add_dependencies(wldap32 wldap32_def)
Modified: branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32/C... ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -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 @@ 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 @@
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)
Modified: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_n... ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -52,4 +52,4 @@ 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)
Modified: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help/... ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -14,4 +14,4 @@
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)
Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda/... ============================================================================== --- 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 8 21:34:25 2010 @@ -9,4 +9,4 @@
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)
Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpip... ============================================================================== --- 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 8 21:34:25 2010 @@ -7,11 +7,11 @@
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)
Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32/... ============================================================================== --- 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 8 21:34:25 2010 @@ -7,4 +7,3 @@
target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def) add_importlibs(wsock32 ws2_32 kernel32 ntdll) -add_dependencies(wsock32 psdk)
Modified: branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wtsapi32... ============================================================================== --- branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -13,4 +13,4 @@ wine)
add_importlibs(wtsapi32 advapi32 kernel32 ntdll) -add_dependencies(wtsapi32 wtsapi32_def psdk) +add_dependencies(wtsapi32 wtsapi32_def)
Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -21,7 +21,8 @@
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)
Modified: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1_... ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -6,8 +6,8 @@
add_library(xinput1_1 SHARED xinput1_1_main.c version.rc)
+set_module_type(xinput1_1 win32dll) + +target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) 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_dependencies(xinput1_1 xinput1_1_def)
Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1_... ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -10,4 +10,4 @@
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)
Modified: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1_... ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -14,4 +14,4 @@
add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
-add_dependencies(xinput1_3 xinput1_3_def psdk buildno_header) +add_dependencies(xinput1_3 xinput1_3_def)
Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9_... ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -10,4 +10,4 @@
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)
Modified: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xmllite/... ============================================================================== --- branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -14,4 +14,4 @@
add_importlibs(xmllite kernel32 ntdll)
-add_dependencies(xmllite xmllite_def psdk buildno_header) +add_dependencies(xmllite xmllite_def)
-
akhaldi＠svn.reactos.org