[akhaldi] 49059: [CMAKE] - More work on the dlls. - libgcc is already a standard C lib, don't relink to it for executables. - ICU isn't needed for now, disable it.
Author: akhaldi Date: Fri Oct 8 21:02:11 2010 New Revision: 49059
URL: http://svn.reactos.org/svn/reactos?rev=49059&view=rev Log: [CMAKE] - More work on the dlls. - libgcc is already a standard C lib, don't relink to it for executables. - ICU isn't needed for now, disable it.
Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt branches/cmake-bringup/base/applications/calc/CMakeLists.txt branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt branches/cmake-bringup/dll/win32/netid/CMakeLists.txt branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/printui/CMakeLists.txt branches/cmake-bringup/dll/win32/query/CMakeLists.txt branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/lib/3rdparty/CMakeLists.txt
Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/... ============================================================================== --- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -10,4 +10,4 @@ add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
set_module_type(cacls win32cui) -add_importlibs(cacls advapi32 user32 shell32 msvcrt) +add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/... ============================================================================== --- branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -13,4 +13,4 @@ resource.rc)
set_module_type(calc win32gui) -add_importlibs(calc advapi32 user32 gdi32 msvcrt) +add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
Modified: branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/modemui/... ============================================================================== --- branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,16 +1,13 @@
- - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode()
spec2def(modemui ${CMAKE_CURRENT_SOURCE_DIR}/modemui.spec ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
add_library(modemui SHARED modemui.c modemui.rc)
-set_target_properties(modemui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(modemui win32dll)
-target_link_libraries(modemui - ${CMAKE_CURRENT_BINARY_DIR}/modemui.def - -lkernel32) +target_link_libraries(modemui ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
-add_dependencies(modemui modemui_def psdk) +add_importlibs(modemui kernel32) +add_dependencies(modemui modemui_def)
Modified: branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msafd/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,7 +1,5 @@
- - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode()
include_directories(BEFORE include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) @@ -20,13 +18,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/msafd_msafd.h.gch ${SOURCE})
-set_target_properties(msafd PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(msafd win32dll)
-target_link_libraries(msafd - ${CMAKE_CURRENT_BINARY_DIR}/msafd.def - -ladvapi32 - -lkernel32 - -lntdll) +target_link_libraries(msafd ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE}) -add_dependencies(msafd msafd_def psdk) + +add_importlibs(msafd advapi32 kernel32 ntdll) +add_dependencies(msafd msafd_def)
Modified: branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscat32/... ============================================================================== --- branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -13,9 +13,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def wine)
-add_importlibs(mscat32 - wintrust - kernel32 - ntdll) - +add_importlibs(mscat32 wintrust kernel32 ntdll) add_dependencies(mscat32 mscat32_def)
Modified: branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msftedit... ============================================================================== --- branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msftedit ${CMAKE_CURRENT_SOURCE_DIR}/msftedit.spec ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def) @@ -16,9 +15,6 @@ uuid wine)
-add_importlibs(msftedit - riched20 - kernel32 - ntdll) +add_importlibs(msftedit riched20 kernel32 ntdll)
add_dependencies(msftedit msftedit_def)
Modified: branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimtf/C... ============================================================================== --- branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msimtf ${CMAKE_CURRENT_SOURCE_DIR}/msimtf.spec ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def) @@ -17,10 +16,5 @@ uuid wine)
-add_importlibs(msimtf - msvcrt - imm32 - kernel32 - ntdll) - +add_importlibs(msimtf msvcrt imm32 kernel32 ntdll) add_dependencies(msimtf msimtf_def)
Modified: branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisip/C... ============================================================================== --- branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msisip ${CMAKE_CURRENT_SOURCE_DIR}/msisip.spec ${CMAKE_CURRENT_BINARY_DIR}/msisip.def) @@ -13,10 +12,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/msisip.def wine)
-add_importlibs(msisip - crypt32 - ole32 - kernel32 - ntdll) - +add_importlibs(msisip crypt32 ole32 kernel32 ntdll) add_dependencies(msisip msisip_def)
Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.o... ============================================================================== --- branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msisys ${CMAKE_CURRENT_SOURCE_DIR}/msisys.ocx.spec ${CMAKE_CURRENT_BINARY_DIR}/msisys.def) @@ -15,5 +14,4 @@ wine)
add_importlibs(msisys kernel32 ntdll) - add_dependencies(msisys msisys_def)
Modified: branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msnet32/... ============================================================================== --- branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(msnet32 ${CMAKE_CURRENT_SOURCE_DIR}/msnet32.spec ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def)
add_library(msnet32 SHARED msnet_main.c)
-set_target_properties(msnet32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(msnet32 win32dll)
target_link_libraries(msnet32 ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def - wine - mingw_common) + wine)
-add_dependencies(msnet32 msnet32_def psdk) +add_importlibs(msnet32 kernel32 ntdll) +add_dependencies(msnet32 msnet32_def)
Modified: branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32/... ============================================================================== --- branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -14,11 +14,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def wine)
-add_importlibs(msrle32 - msvcrt - winmm - user32 - kernel32 - ntdll) - +add_importlibs(msrle32 msvcrt winmm user32 kernel32 ntdll) add_dependencies(msrle32 msrle32_def)
Modified: branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssign32... ============================================================================== --- branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(mssign32 ${CMAKE_CURRENT_SOURCE_DIR}/mssign32.spec ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def)
add_library(mssign32 SHARED mssign32_main.c)
-set_target_properties(mssign32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mssign32 win32dll)
target_link_libraries(mssign32 ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def - wine - mingw_common) + wine)
-add_dependencies(mssign32 mssign32_def psdk) +add_importlibs(mssign32 kernel32 ntdll) +add_dependencies(mssign32 mssign32_def)
Modified: branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssip32/... ============================================================================== --- branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(mssip32 ${CMAKE_CURRENT_SOURCE_DIR}/mssip32.spec ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def)
add_library(mssip32 SHARED main.c)
-set_target_properties(mssip32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mssip32 win32dll)
target_link_libraries(mssip32 ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def - wine - mingw_common) + wine)
-add_dependencies(mssip32 mssip32_def psdk) +add_importlibs(mssip32 kernel32 ntdll) +add_dependencies(mssip32 mssip32_def)
Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mstask/C... ============================================================================== --- branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,7 +1,9 @@
add_definitions(-D__WINESRC__) + remove_definitions(-DWINVER=0x502) add_definitions(-DWINVER=0x600) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D__WINESRC__)
@@ -25,8 +27,5 @@ uuid wine)
-add_importlibs(mstask - ole32 - ntdll) - +add_importlibs(mstask ole32 ntdll) add_dependencies(mstask mstask_def)
Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/C... ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,32 +1,30 @@
- - -add_definitions(-DUSE_MSVCRT_PREFIX) -add_definitions(-D_MSVCRT_) -add_definitions(-D_MSVCRT_LIB_) -add_definitions(-D_MT) -add_definitions(-D_CTYPE_DISABLE_MACROS) -add_definitions(-D_NO_INLINING) -add_definitions(-DCRTDLL) -add_definitions(-D__MINGW_IMPORT="") +add_definitions( + -DUSE_MSVCRT_PREFIX + -D_MSVCRT_ + -D_MSVCRT_LIB_ + -D_MT + -D_CTYPE_DISABLE_MACROS + -D_NO_INLINING + -DCRTDLL + -D__MINGW_IMPORT="")
include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include)
-file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE dllmain.c msvcrt_stubs.c msvcrt.rc)
add_library(msvcrt SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt.rc - ${CMAKE_CURRENT_BINARY_DIR}/msvcrt_precomp.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/msvcrt_precomp.h.gch + ${SOURCE})
-set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12 -u __seh_longjmp_unwind@4") +set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4") +set_module_type(msvcrt win32dll)
-target_link_libraries(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt.def - crt - wine - pseh - -lkernel32 - -lntdll) +target_link_libraries(msvcrt + ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt.def + crt + wine + pseh)
add_pch(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(msvcrt psdk) +add_importlibs(msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt20... ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,5 +1,3 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -10,12 +8,11 @@
add_library(msvcrt20 SHARED msvcrt20.c)
-set_target_properties(msvcrt20 PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(msvcrt20 0)
target_link_libraries(msvcrt20 ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def - wine - mingw_common - -lmsvcrt) + wine)
-add_dependencies(msvcrt20 msvcrt20_def psdk) +add_importlibs(msvcrt20 msvcrt kernel32 ntdll) +add_dependencies(msvcrt20 msvcrt20_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt40... ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,5 +1,3 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -10,12 +8,11 @@
add_library(msvcrt40 SHARED msvcrt40.c)
-set_target_properties(msvcrt40 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(msvcrt40 win32dll)
target_link_libraries(msvcrt40 ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def - wine - mingw_common - -lmsvcrt) + wine)
-add_dependencies(msvcrt40 msvcrt40_def psdk) +add_importlibs(msvcrt40 msvcrt kernel32 ntdll) +add_dependencies(msvcrt40 msvcrt40_def)
Modified: branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvfw32/... ============================================================================== --- branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,5 +1,3 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -14,17 +12,11 @@ drawdib.c rsrc.rc)
-set_target_properties(msvfw32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(msvfw32 win32dll)
target_link_libraries(msvfw32 ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def - wine - -lwinmm - -lversion - -lcomctl32 - -luser32 - -lgdi32 - -ladvapi32 - mingw_common) + wine)
-add_dependencies(msvfw32 msvfw32_def psdk) +add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll) +add_dependencies(msvfw32 msvfw32_def)
Modified: branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc32... ============================================================================== --- branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,5 +1,3 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -10,12 +8,11 @@
add_library(msvidc32 SHARED msvideo1.c rsrc.rc)
-set_target_properties(msvidc32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(msvidc32 win32dll)
target_link_libraries(msvidc32 ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def - wine - -luser32 - mingw_common) + wine)
-add_dependencies(msvidc32 msvidc32_def psdk) +add_importlibs(msvidc32 user32 kernel32 ntdll) +add_dependencies(msvidc32 msvidc32_def)
Modified: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock/... ============================================================================== --- branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,10 +1,8 @@
+set_unicode()
- +add_definitions(-DLE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DLE)
spec2def(mswsock ${CMAKE_CURRENT_SOURCE_DIR}/mswsock.spec ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
@@ -13,11 +11,9 @@ stubs.c mswsock.rc)
-set_target_properties(mswsock PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mswsock win32dll)
-target_link_libraries(mswsock - ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def - -lws2_32 - -lkernel32) +target_link_libraries(mswsock ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
-add_dependencies(mswsock mswsock_def psdk) +add_importlibs(mswsock ws2_32 kernel32) +add_dependencies(mswsock mswsock_def)
Modified: branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/C... ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -21,15 +21,5 @@ uuid wine)
-add_importlibs(netcfgx - rpcrt4 - setupapi - advapi32 - iphlpapi - ole32 - user32 - comctl32 - ws2_32 - ntdll) - +add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 ntdll) add_dependencies(netcfgx netcfgx_def)
Modified: branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/nddeapi/... ============================================================================== --- branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(nddeapi ${CMAKE_CURRENT_SOURCE_DIR}/nddeapi.spec ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def)
add_library(nddeapi SHARED nddeapi.c)
-set_target_properties(nddeapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(nddeapi 0)
target_link_libraries(nddeapi ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def - wine - mingw_common) + wine)
-add_dependencies(nddeapi nddeapi_def psdk) +add_importlibs(nddeapi kernel32 ntdll) +add_dependencies(nddeapi nddeapi_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netapi32... ============================================================================== --- branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,8 +1,5 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(netapi32 ${CMAKE_CURRENT_SOURCE_DIR}/netapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) @@ -21,14 +18,11 @@ share.c wksta.c)
-set_target_properties(netapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(netapi32 win32dll)
target_link_libraries(netapi32 ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def - wine - -liphlpapi - -lws2_32 - -ladvapi32 - mingw_common) + wine)
-add_dependencies(netapi32 netapi32_def psdk) +add_importlibs(netapi32 iphlpapi ws2_32 advapi32 kernel32 ntdll) +add_dependencies(netapi32 netapi32_def)
Modified: branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netcfgx/... ============================================================================== --- branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -19,16 +19,5 @@ uuid wine)
-add_importlibs(netcfgx - rpcrt4 - setupapi - advapi32 - iphlpapi - ole32 - user32 - comctl32 - ws2_32 - kernel32 - ntdll) - +add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 kernel32 ntdll) add_dependencies(netcfgx netcfgx_def)
Modified: branches/cmake-bringup/dll/win32/netid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -8,13 +8,5 @@ target_link_libraries(netid ${CMAKE_CURRENT_BINARY_DIR}/netid.def)
-add_importlibs(netid - user32 - gdi32 - comctl32 - advapi32 - netapi32 - kernel32 - ntdll) - +add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 kernel32 ntdll) add_dependencies(netid netid_def)
Modified: branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/newdev/C... ============================================================================== --- branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,7 +1,5 @@
- - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode()
spec2def(newdev ${CMAKE_CURRENT_SOURCE_DIR}/newdev.spec ${CMAKE_CURRENT_BINARY_DIR}/newdev.def)
@@ -11,17 +9,11 @@ wizard.c newdev.rc)
-set_target_properties(newdev PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(newdev win32dll)
target_link_libraries(newdev ${CMAKE_CURRENT_BINARY_DIR}/newdev.def - wine - mingw_common - -lgdi32 - -lcomctl32 - -lsetupapi - -ladvapi32 - -luser32 - -lshell32) + wine)
-add_dependencies(newdev newdev_def psdk) +add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 kernel32 ntdll) +add_dependencies(newdev newdev_def)
Modified: branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntdsapi/... ============================================================================== --- branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,20 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(ntdsapi ${CMAKE_CURRENT_SOURCE_DIR}/ntdsapi.spec ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def)
add_library(ntdsapi SHARED ntdsapi.c)
-set_target_properties(ntdsapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(ntdsapi 0)
target_link_libraries(ntdsapi ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def - wine - -luser32 - mingw_common) + wine)
-add_dependencies(ntdsapi ntdsapi_def psdk) +add_importlibs(ntdsapi user32 kernel32 ntdll) +add_dependencies(ntdsapi ntdsapi_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntlanman... ============================================================================== --- branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,18 +1,15 @@
- - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode()
spec2def(ntlanman ${CMAKE_CURRENT_SOURCE_DIR}/ntlanman.spec ${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def)
add_library(ntlanman SHARED ntlanman.c ntlanman.rc)
-set_target_properties(ntlanman PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(ntlanman win32dll)
target_link_libraries(ntlanman ${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def - wine - mingw_common - -lnetapi32) + wine)
-add_dependencies(ntlanman ntlanman_def psdk) +add_importlibs(ntlanman netapi32 kernel32 ntdll) +add_dependencies(ntlanman ntlanman_def)
Modified: branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntprint/... ============================================================================== --- branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,20 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(ntprint ${CMAKE_CURRENT_SOURCE_DIR}/ntprint.spec ${CMAKE_CURRENT_BINARY_DIR}/ntprint.def)
add_library(ntprint SHARED ntprint.c ntprint.rc)
-set_target_properties(ntprint PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(ntprint win32dll)
target_link_libraries(ntprint ${CMAKE_CURRENT_BINARY_DIR}/ntprint.def - wine - -lwinspool - mingw_common) + wine)
+add_importlibs(ntprint winspool kernel32 ntdll) add_dependencies(ntprint ntprint_def psdk)
Modified: branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/objsel/C... ============================================================================== --- branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 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/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olecli32... ============================================================================== --- branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,21 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(olecli32 ${CMAKE_CURRENT_SOURCE_DIR}/olecli32.spec ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def)
add_library(olecli32 SHARED olecli_main.c)
-set_target_properties(olecli32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(olecli32 0)
target_link_libraries(olecli32 ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def - wine - -lole32 - -lgdi32 - mingw_common) + wine)
-add_dependencies(olecli32 olecli32_def psdk) +add_importlibs(oleacc ole32 gdi32 kernel32 ntdll) +add_dependencies(olecli32 olecli32_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/C... ============================================================================== --- branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,8 +1,5 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(oledlg ${CMAKE_CURRENT_SOURCE_DIR}/oledlg.spec ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def) @@ -13,15 +10,11 @@ pastespl.c rsrc.rc)
-set_target_properties(oledlg PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(oledlg win32dll)
target_link_libraries(oledlg ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def - wine - -lole32 - -lcomdlg32 - -luser32 - -ladvapi32 - mingw_common) + wine)
-add_dependencies(oledlg oledlg_def psdk) +add_importlibs(oledlg ole32 comdlg32 user32 advapi32 kernel32 ntdll) +add_dependencies(oledlg oledlg_def)
Modified: branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olepro32... ============================================================================== --- branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(olepro32 ${CMAKE_CURRENT_SOURCE_DIR}/olepro32.spec ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def)
Modified: branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olesvr32... ============================================================================== --- branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,17 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(olesvr32 ${CMAKE_CURRENT_SOURCE_DIR}/olesvr32.spec ${CMAKE_CURRENT_BINARY_DIR}/olesvr32.def)
add_library(olesvr32 SHARED olesvr_main.c)
-set_target_properties(olesvr32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(olesvr32 0)
target_link_libraries(olesvr32 ${CMAKE_CURRENT_BINARY_DIR}/olesvr32.def wine mingw_common)
-add_dependencies(olesvr32 olesvr32_def psdk) +add_importlibs(olesvr32 kernel32 ntdll) +add_dependencies(olesvr32 olesvr32_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olethk32... ============================================================================== --- branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(olethk32 ${CMAKE_CURRENT_SOURCE_DIR}/olethk32.spec ${CMAKE_CURRENT_BINARY_DIR}/olethk32.def)
add_library(olethk32 SHARED main.c version.rc)
-set_target_properties(olethk32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(olethk32 win32dll)
target_link_libraries(olethk32 ${CMAKE_CURRENT_BINARY_DIR}/olethk32.def - wine - mingw_common) + wine)
+add_importlibs(olethk32 kernel32 ntdll) add_dependencies(olethk32 olethk32_def psdk)
Modified: branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pdh/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 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/pidgen/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pidgen/C... ============================================================================== --- branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(pidgen ${CMAKE_CURRENT_SOURCE_DIR}/pidgen.spec ${CMAKE_CURRENT_BINARY_DIR}/pidgen.def)
add_library(pidgen SHARED main.c rsrc.rc)
-set_target_properties(pidgen PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(pidgen win32dll)
target_link_libraries(pidgen ${CMAKE_CURRENT_BINARY_DIR}/pidgen.def - wine - mingw_common) + wine)
-add_dependencies(pidgen pidgen_def psdk) +add_importlibs(pidgen kernel32 ntdll) +add_dependencies(pidgen pidgen_def)
Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrprof... ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,20 +1,15 @@
- - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode()
spec2def(powrprof ${CMAKE_CURRENT_SOURCE_DIR}/powrprof.spec ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def)
add_library(powrprof SHARED powrprof.c powrprof.rc)
-set_target_properties(powrprof PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(powrprof win32dll)
target_link_libraries(powrprof ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def - wine - -ladvapi32 - -luser32 - -lcomctl32 - mingw_common) + wine)
-add_dependencies(powrprof powrprof_def psdk) +add_importlibs(powrprof advapi32 user32 comctl32 kernel32 ntdll) +add_dependencies(powrprof powrprof_def)
Modified: branches/cmake-bringup/dll/win32/printui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/printui/... ============================================================================== --- branches/cmake-bringup/dll/win32/printui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/printui/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,20 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(printui ${CMAKE_CURRENT_SOURCE_DIR}/printui.spec ${CMAKE_CURRENT_BINARY_DIR}/printui.def)
add_library(printui SHARED printui.c printui.rc)
-set_target_properties(printui PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(printui 0)
target_link_libraries(printui ${CMAKE_CURRENT_BINARY_DIR}/printui.def - wine - -lshell32 - mingw_common) + wine)
-add_dependencies(printui printui_def psdk) +add_importlibs(printui shell32 kernel32 ntdll) +add_dependencies(printui printui_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/query/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/query/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/query/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/query/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,20 +1,17 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(query ${CMAKE_CURRENT_SOURCE_DIR}/query.spec ${CMAKE_CURRENT_BINARY_DIR}/query.def)
add_library(query SHARED query_main.c)
-set_target_properties(query PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(query win32dll)
target_link_libraries(query ${CMAKE_CURRENT_BINARY_DIR}/query.def wine - -luuid - mingw_common) + uuid)
-add_dependencies(query query_def psdk) +add_importlibs(query kernel32 ntdll) +add_dependencies(query query_def)
Modified: branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasadhlp... ============================================================================== --- branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -10,12 +10,8 @@
set_module_type(rasadhlp win32dll)
-target_link_libraries(rasadhlp - ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def) +target_link_libraries(rasadhlp ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def)
-add_importlibs(rasadhlp - ws2_32 - kernel32 - ntdll) +add_importlibs(rasadhlp ws2_32 kernel32 ntdll)
add_dependencies(rasadhlp rasadhlp_def)
Modified: branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasapi32... ============================================================================== --- branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(rasapi32 ${CMAKE_CURRENT_SOURCE_DIR}/rasapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def)
add_library(rasapi32 SHARED rasapi.c)
-set_target_properties(rasapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(rasapi32 0)
target_link_libraries(rasapi32 ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def - wine - mingw_common) + wine)
-add_dependencies(rasapi32 rasapi32_def psdk) +add_importlibs(rasapi32 kernel32 ntdll) +add_dependencies(rasapi32 rasapi32_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/C... ============================================================================== --- branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,16 +1,14 @@ - -
spec2def(rasdlg ${CMAKE_CURRENT_SOURCE_DIR}/rasdlg.spec ${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def)
add_library(rasdlg SHARED rasdlg.c rasdlg.rc)
-set_target_properties(rasdlg PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(rasdlg win32dll)
target_link_libraries(rasdlg ${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def wine - -luuid - mingw_common) + uuid)
-add_dependencies(rasdlg rasdlg_def psdk) +add_importlibs(rasdlg kernel32 ntdll) +add_dependencies(rasdlg rasdlg_def)
Modified: branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasman/C... ============================================================================== --- branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,16 +1,14 @@ - -
spec2def(rasman ${CMAKE_CURRENT_SOURCE_DIR}/rasman.spec ${CMAKE_CURRENT_BINARY_DIR}/rasman.def)
add_library(rasman SHARED rasman.c rasman.rc)
-set_target_properties(rasman PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(rasman win32dll)
target_link_libraries(rasman ${CMAKE_CURRENT_BINARY_DIR}/rasman.def wine - -luuid - mingw_common) + uuid)
-add_dependencies(rasman rasman_def psdk) +add_importlibs(rasman kernel32 ntdll) +add_dependencies(rasman rasman_def)
Modified: branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/resutils... ============================================================================== --- branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(resutils ${CMAKE_CURRENT_SOURCE_DIR}/resutils.spec ${CMAKE_CURRENT_BINARY_DIR}/resutils.def)
add_library(resutils SHARED resutils.c)
-set_target_properties(resutils PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(resutils win32dll)
target_link_libraries(resutils ${CMAKE_CURRENT_BINARY_DIR}/resutils.def - wine - mingw_common) + wine)
-add_dependencies(resutils resutils_def psdk) +add_importlibs(resutils kernel32 ntdll) +add_dependencies(resutils resutils_def)
Modified: branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched32... ============================================================================== --- branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(riched32 ${CMAKE_CURRENT_SOURCE_DIR}/riched32.spec ${CMAKE_CURRENT_BINARY_DIR}/riched32.def)
Modified: branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase/... ============================================================================== --- branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(rsabase ${CMAKE_CURRENT_SOURCE_DIR}/rsabase.spec ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def)
Modified: branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samlib/C... ============================================================================== --- branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,14 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(samlib ${CMAKE_CURRENT_SOURCE_DIR}/samlib.spec ${CMAKE_CURRENT_BINARY_DIR}/samlib.def)
add_library(samlib SHARED dllmain.c samlib.c samlib.rc)
-set_target_properties(samlib PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(samlib win32dll)
-target_link_libraries(samlib - ${CMAKE_CURRENT_BINARY_DIR}/samlib.def - -ladvapi32 - mingw_common) +target_link_libraries(samlib ${CMAKE_CURRENT_BINARY_DIR}/samlib.def)
-add_dependencies(samlib samlib_def psdk) +add_importlibs(samlib advapi32 kernel32 ntdll) +add_dependencies(samlib samlib_def)
Modified: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/C... ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,16 +1,13 @@
- - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode()
spec2def(samsrv ${CMAKE_CURRENT_SOURCE_DIR}/samsrv.spec ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def)
add_library(samsrv SHARED samsrv.c samsrv.rc)
-set_target_properties(samsrv PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(samsrv 0)
-target_link_libraries(samsrv - ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def - mingw_common) +target_link_libraries(samsrv ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def)
-add_dependencies(samsrv samsrv_def psdk) +add_importlibs(samsrv kernel32 ntdll) +add_dependencies(samsrv samsrv_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sccbase/... ============================================================================== --- branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(sccbase ${CMAKE_CURRENT_SOURCE_DIR}/sccbase.spec ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def)
add_library(sccbase SHARED main.c)
-set_target_properties(sccbase PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(sccbase win32dll)
target_link_libraries(sccbase ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def - wine - mingw_common) + wine)
-add_dependencies(sccbase sccbase_def psdk) +add_importlibs(sccbase kernel32 ntdll) +add_dependencies(sccbase sccbase_def)
Modified: branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/schannel... ============================================================================== --- branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,8 +1,5 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(schannel ${CMAKE_CURRENT_SOURCE_DIR}/schannel.spec ${CMAKE_CURRENT_BINARY_DIR}/schannel.def) @@ -13,12 +10,11 @@ usermode.c version.rc)
-set_target_properties(schannel PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(schannel win32dll)
target_link_libraries(schannel ${CMAKE_CURRENT_BINARY_DIR}/schannel.def - wine - -lsecur32 - mingw_common) + wine)
-add_dependencies(schannel schannel_def psdk) +add_importlibs(schannel secur32 kernel32 ntdll) +add_dependencies(schannel schannel_def)
Modified: branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/secur32/... ============================================================================== --- branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,6 +1,5 @@
add_definitions(-D__SECUR32__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
spec2def(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/secur32.spec ${CMAKE_CURRENT_BINARY_DIR}/secur32.def)
Modified: branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi/... ============================================================================== --- branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,19 +1,16 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(sensapi ${CMAKE_CURRENT_SOURCE_DIR}/sensapi.spec ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def)
add_library(sensapi SHARED sensapi.c)
-set_target_properties(sensapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(sensapi win32dll)
target_link_libraries(sensapi ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def - wine - mingw_common) + wine)
-add_dependencies(sensapi sensapi_def psdk) +add_importlibs(sensapi kernel32 ntdll) +add_dependencies(sensapi sensapi_def)
Modified: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialui... ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,18 +1,13 @@
- - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode()
spec2def(serialui ${CMAKE_CURRENT_SOURCE_DIR}/serialui.spec ${CMAKE_CURRENT_BINARY_DIR}/serialui.def)
add_library(serialui SHARED serialui.c serialui.rc)
-set_target_properties(serialui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(serialui win32dll)
-target_link_libraries(serialui - ${CMAKE_CURRENT_BINARY_DIR}/serialui.def - -luser32 - -lshlwapi - -lkernel32) +target_link_libraries(serialui ${CMAKE_CURRENT_BINARY_DIR}/serialui.def)
-add_dependencies(serialui serialui_def psdk) +add_importlibs(serialui user32 shlwapi kernel32) +add_dependencies(serialui serialui_def)
Modified: branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdoclc/... ============================================================================== --- branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,5 +1,3 @@ - -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")
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -7,11 +5,11 @@
add_library(shdoclc SHARED rsrc.rc)
-set_target_properties(shdoclc PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(shdoclc 0)
target_link_libraries(shdoclc ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def - wine - mingw_common) + wine)
-add_dependencies(shdoclc shdoclc_def psdk) +add_importlibs(shdoclc kernel32 ntdll) +add_dependencies(shdoclc shdoclc_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolder... ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,20 +1,16 @@ - -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")
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
spec2def(shfolder ${CMAKE_CURRENT_SOURCE_DIR}/shfolder.spec ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def)
add_library(shfolder SHARED version.rc)
-set_target_properties(shfolder PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(shfolder 0)
target_link_libraries(shfolder ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def - wine - -lshell32 - mingw_common) + wine)
-add_dependencies(shfolder shfolder_def psdk) +add_importlibs(shfolder shell32 kernel32 ntdll) +add_dependencies(shfolder shfolder_def psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi/... ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -1,8 +1,5 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__)
remove_definitions(-D_WIN32_WINNT=0x502) @@ -27,25 +24,25 @@ wsprintf.c shlwapi.rc)
-set_target_properties(shlwapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(shlwapi win32dll)
target_link_libraries(shlwapi ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def wine - uuid - -luser32 - -lgdi32 - -ladvapi32 - -loleaut32 - -lole32 - -lcomctl32 - -lcomdlg32 - -lmpr - -lmlang - -lurlmon - -lshell32 - -lwinmm - -lversion - mingw_common) + uuid)
-add_dependencies(shlwapi shlwapi_def psdk) +add_importlibs(shlwapi + user32 + gdi32 + advapi32 + oleaut32 + ole32 + comctl32 + comdlg32 + mpr + mlang + urlmon + winmm + version) + +add_dependencies(shlwapi shlwapi_def)
Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=4905... ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -89,7 +89,7 @@ else() target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} -lgcc mingw_common) + target_link_libraries(${MODULE} mingw_common) endif() if(${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) @@ -99,7 +99,7 @@ else() target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} -lgcc mingw_common) + target_link_libraries(${MODULE} mingw_common) endif() if(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMain@12)
Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/CMake... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:02:11 2010 @@ -5,7 +5,7 @@ add_subdirectory(expat) add_subdirectory(freetype) add_subdirectory(fullfat) -add_subdirectory(icu4ros) +#add_subdirectory(icu4ros) #add_subdirectory(libmpg123) add_subdirectory(libsamplerate) add_subdirectory(libwine)
-
akhaldi＠svn.reactos.org