Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[pschweitzer] 49065: [NTDLL] Fixed build

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Oct 9 10:01:37 2010 New Revision: 49065 URL: http://svn.reactos.org/svn/reactos?rev=49065&view=rev Log: [NTDLL] Fixed build Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Sat Oct 9 10:01:37 2010 @@ -897,7 +897,7 @@ //@ stdcall RtlSetTimer @ stdcall RtlSetUnhandledExceptionFilter(ptr) //@ stdcall RtlSetUnicodeCallouts -@ stdcall RtlSetUserFlagsHeap(ptr long ptr long) +@ stdcall RtlSetUserFlagsHeap(ptr long ptr long long) @ stdcall RtlSetUserValueHeap(ptr long ptr ptr) @ stdcall RtlSizeHeap(long long ptr) @ stdcall RtlSleepConditionVariableCS(ptr ptr ptr)

14 years, 2 months

[fireball] 49064: [RTL] - Fix RtlSetUserFlagsHeap declaration and definition.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 9 09:19:33 2010 New Revision: 49064 URL: http://svn.reactos.org/svn/reactos?rev=49064&view=rev Log: [RTL] - Fix RtlSetUserFlagsHeap declaration and definition. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Oct 9 09:19:33 2010 @@ -766,7 +766,8 @@ IN PVOID HeapHandle, IN ULONG Flags, IN PVOID BaseAddress, - IN ULONG UserFlags + IN ULONG UserFlagsReset, + IN ULONG UserFlagsSet ); NTSYSAPI Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=49064&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Oct 9 09:19:33 2010 @@ -1812,7 +1812,8 @@ RtlSetUserFlagsHeap(IN PVOID HeapHandle, IN ULONG Flags, IN PVOID BaseAddress, - IN ULONG UserFlags) + IN ULONG UserFlagsReset, + IN ULONG UserFlagsSet) { HEAP *heapPtr; PHEAP_USER_DATA udata; @@ -1829,7 +1830,7 @@ udata = HEAP_AllocUserData(heapPtr, BaseAddress); if (!udata) return FALSE; } - udata->UserFlags = UserFlags & HEAP_SETTABLE_USER_FLAGS; + udata->UserFlags = UserFlagsSet & HEAP_SETTABLE_USER_FLAGS; return TRUE; }

14 years, 2 months

[fireball] 49063: [KERNEL32] - Revert incorrect changes from 34404 and 40910: RtlSetUserFlagsHeap() doesn't set usual heap flags, it sets special user-settable heap entry flags. With the new heap m...

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 9 09:15:50 2010 New Revision: 49063 URL: http://svn.reactos.org/svn/reactos?rev=49063&view=rev Log: [KERNEL32] - Revert incorrect changes from 34404 and 40910: RtlSetUserFlagsHeap() doesn't set usual heap flags, it sets special user-settable heap entry flags. With the new heap manager such usage corrupts heap integrity (not to say prototype of this function is incorrect). - RtlReAllocateHeap() is supposed to copy user values and flags so there is no need to set them afterwise again. - Fix a typo in comments. Modified: trunk/reactos/dll/win32/kernel32/mem/global.c trunk/reactos/dll/win32/kernel32/mem/local.c trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] Sat Oct 9 09:15:50 2010 @@ -101,7 +101,6 @@ { /* All worked well, save our heap entry */ RtlSetUserValueHeap(hProcessHeap, HEAP_NO_SERIALIZE, Ptr, hMemory); - RtlSetUserFlagsHeap(hProcessHeap, HEAP_NO_SERIALIZE, Ptr, Flags); } } @@ -529,10 +528,6 @@ HEAP_NO_SERIALIZE, Ptr, hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - Flags); } } else @@ -562,10 +557,6 @@ HEAP_NO_SERIALIZE, Ptr, hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - Flags); } } @@ -668,10 +659,6 @@ HEAP_NO_SERIALIZE, HandleEntry->Object, hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - HandleEntry->Object, - Flags); } } } Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Sat Oct 9 09:15:50 2010 @@ -352,11 +352,6 @@ HEAP_NO_SERIALIZE, Ptr, hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - Flags); - } } else @@ -378,19 +373,6 @@ /* And do the re-allocation */ Ptr = RtlReAllocateHeap(hProcessHeap, Flags, Ptr, dwBytes); - - if (Ptr) - { - /* Allocation succeeded, so save our entry */ - RtlSetUserValueHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - Flags); - } } /* Make sure we have a pointer by now */ Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Sat Oct 9 09:15:50 2010 @@ -805,7 +805,7 @@ if (lpCommandLine) { - /* Serach for escape sequences */ + /* Search for escape sequences */ ScanString = lpCommandLine; while (NULL != (ScanString = wcschr(ScanString, L'^'))) {

14 years, 2 months

[akhaldi] 49062: [CMAKE] - More work on the base modules.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 8 23:06:11 2010 New Revision: 49062 URL: http://svn.reactos.org/svn/reactos?rev=49062&view=rev Log: [CMAKE] - More work on the base modules. Modified: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt branches/cmake-bringup/base/services/CMakeLists.txt branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt branches/cmake-bringup/base/services/eventlog/CMakeLists.txt branches/cmake-bringup/base/services/rpcss/CMakeLists.txt branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt branches/cmake-bringup/base/services/svchost/CMakeLists.txt branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt branches/cmake-bringup/base/services/telnetd/CMakeLists.txt branches/cmake-bringup/base/services/tftpd/CMakeLists.txt branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt branches/cmake-bringup/base/setup/reactos/CMakeLists.txt branches/cmake-bringup/base/setup/setup/CMakeLists.txt branches/cmake-bringup/base/setup/usetup/CMakeLists.txt branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt branches/cmake-bringup/base/setup/welcome/CMakeLists.txt branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt branches/cmake-bringup/base/system/autochk/CMakeLists.txt branches/cmake-bringup/base/system/bootok/CMakeLists.txt branches/cmake-bringup/base/system/expand/CMakeLists.txt branches/cmake-bringup/base/system/format/CMakeLists.txt branches/cmake-bringup/base/system/lsass/CMakeLists.txt branches/cmake-bringup/base/system/msiexec/CMakeLists.txt branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt branches/cmake-bringup/base/system/rundll32/CMakeLists.txt branches/cmake-bringup/base/system/runonce/CMakeLists.txt branches/cmake-bringup/base/system/services/CMakeLists.txt branches/cmake-bringup/base/system/smss/CMakeLists.txt branches/cmake-bringup/base/system/userinit/CMakeLists.txt branches/cmake-bringup/base/system/winlogon/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -13,4 +13,4 @@ set_module_type(sndvol32 win32gui) -add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32) +add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,11 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__ROS_LONG64__) -add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -add_definitions(-Dfileno=_fileno) -add_definitions(-Disatty=_isatty) +add_definitions( + -D__ROS_LONG64__ + -D_CRT_NONSTDC_NO_DEPRECATE + -Dfileno=_fileno + -Disatty=_isatty) add_executable(winhlp32 callback.c @@ -17,5 +19,4 @@ set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) - -add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32) +add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/CMa… ============================================================================== --- branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -6,6 +6,6 @@ add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) -add_subdirectory(tftpd) +#add_subdirectory(tftpd) add_subdirectory(umpnpmgr) add_subdirectory(wlansvc) Modified: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/aud… ============================================================================== --- branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -11,5 +11,5 @@ audiosrv.rc) set_module_type(audiosrv win32cui) -add_importlibs(audiosrv advapi32 user32 setupapi msvcrt) +add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32) Modified: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/eve… ============================================================================== --- branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -18,4 +18,4 @@ set_module_type(eventlog win32cui) -add_importlibs(eventlog advapi32 rpcrt4 msvcrt) +add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -16,4 +16,4 @@ set_module_type(rpcss win32cui) -add_importlibs(rpcss advapi32 rpcrt4 msvcrt) +add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/spo… ============================================================================== --- branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -6,4 +6,4 @@ target_link_libraries(spoolsv wine) set_module_type(spoolsv win32cui) -add_importlibs(spoolsv advapi32 msvcrt) +add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/svc… ============================================================================== --- branches/cmake-bringup/base/services/svchost/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/svchost/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -2,4 +2,4 @@ add_executable(svchost svchost.c svchost.rc) set_module_type(svchost win32cui) -add_importlibs(svchost advapi32 msvcrt) +add_importlibs(svchost advapi32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tcp… ============================================================================== --- branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -16,5 +16,5 @@ add_pch(tcpsvcs ${CMAKE_CURRENT_SOURCE_DIR}/tcpsvcs.h ${SOURCE}) set_module_type(tcpsvcs win32cui) -add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt) +add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/telnetd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tel… ============================================================================== --- branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -7,5 +7,5 @@ target_link_libraries(telnetd wine) set_module_type(telnetd win32cui) -add_importlibs(telnetd advapi32 ws2_32 msvcrt) +add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/tftpd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tft… ============================================================================== --- branches/cmake-bringup/base/services/tftpd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/tftpd/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -4,4 +4,4 @@ target_link_libraries(tftpd wine) set_module_type(tftpd win32cui) -add_importlibs(tftpd advapi32 ws2_32 msvcrt) +add_importlibs(tftpd advapi32 ws2_32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/ump… ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -13,4 +13,6 @@ advapi32 rpcrt4 userenv - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wla… ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -11,4 +11,6 @@ advapi32 rpcrt4 iphlpapi - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… ============================================================================== --- branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,7 @@ set_unicode() -add_executable(reactos - reactos.c - reactos.rc) +add_executable(reactos reactos.c reactos.rc) target_link_libraries(reactos uuid) @@ -13,4 +11,6 @@ user32 comctl32 setupapi - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/setup/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/setup/… ============================================================================== --- branches/cmake-bringup/base/setup/setup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/setup/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,7 @@ set_unicode() -add_executable(setup - setup.c - setup.rc) +add_executable(setup setup.c setup.rc) set_module_type(setup win32gui) -add_importlibs(setup userenv msvcrt) +add_importlibs(setup userenv msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… ============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) -add_executable(usetup WIN32 +add_executable(usetup interface/usetup.c interface/devinst.c interface/consup.c @@ -38,5 +38,4 @@ mingw_common) set_module_type(usetup nativecui) - -add_dependencies(usetup psdk buildno_header) +add_importlibs(usetup kernel32 ntdll) Modified: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,7 @@ set_unicode() -add_executable(vmwinst - vmwinst.c - vmwinst.rc) +add_executable(vmwinst vmwinst.c vmwinst.rc) target_link_libraries(vmwinst pseh) @@ -16,4 +14,6 @@ user32 setupapi shell32 - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/welcom… ============================================================================== --- branches/cmake-bringup/base/setup/welcome/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/welcome/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,7 @@ set_unicode() -add_executable(welcome - welcome.c - welcome.rc) +add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui) -add_importlibs(welcome gdi32 user32 msvcrt) +add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -20,9 +20,9 @@ target_link_libraries(explorer_new uuid) -add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) +add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) set_module_type(explorer_new win32gui) -add_importlibs(explorer_new +add_importlibs(explorer_new advapi32 gdi32 user32 @@ -31,4 +31,6 @@ oleaut32 shell32 shlwapi - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/system/autochk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/autoc… ============================================================================== --- branches/cmake-bringup/base/system/autochk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/autochk/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -4,3 +4,4 @@ set_module_type(autochk nativecui) target_link_libraries(autochk mingw_common nt) +add_importlibs(autochk kernel32 ntdll) Modified: branches/cmake-bringup/base/system/bootok/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/booto… ============================================================================== --- branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -5,4 +5,4 @@ set_module_type(bootok win32cui) -add_importlibs(bootok advapi32 msvcrt) +add_importlibs(bootok advapi32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/expand/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/expan… ============================================================================== --- branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -5,4 +5,4 @@ set_module_type(expand win32cui) -add_importlibs(expand lz32 setupapi user32 msvcrt) +add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… ============================================================================== --- branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -6,4 +6,4 @@ set_module_type(format win32cui) -add_importlibs(format ntdll user32 fmifs msvcrt) +add_importlibs(format ntdll user32 fmifs msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/lsass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/lsass… ============================================================================== --- branches/cmake-bringup/base/system/lsass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/lsass/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -7,4 +7,4 @@ set_module_type(lsass win32gui) -add_importlibs(lsass advapi32 lsasrv msvcrt) +add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/msiex… ============================================================================== --- branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -9,5 +9,7 @@ set_module_type(msiexec win32gui) -add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt) target_link_libraries(msiexec uuid wine) + +add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll) + Modified: branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/regsv… ============================================================================== --- branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -7,4 +7,4 @@ set_module_type(regsvr32 win32gui) -add_importlibs(regsvr32 user32 shell32 ole32 msvcrt) +add_importlibs(regsvr32 user32 shell32 ole32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/rundll32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/rundl… ============================================================================== --- branches/cmake-bringup/base/system/rundll32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/rundll32/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -7,4 +7,4 @@ set_module_type(rundll32 win32gui) -add_importlibs(rundll32 user32 msvcrt) +add_importlibs(rundll32 user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/runonce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/runon… ============================================================================== --- branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -5,4 +5,4 @@ set_module_type(runonce win32gui) -add_importlibs(runonce advapi32 user32 msvcrt) +add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -22,5 +22,5 @@ set_module_type(services win32cui) -add_importlibs(services user32 advapi32 rpcrt4 msvcrt) +add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/smss/… ============================================================================== --- branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -24,8 +24,9 @@ add_executable(smss WIN32 ${CMAKE_CURRENT_BINARY_DIR}/smss_smss.h.gch ${SOURCE}) +target_link_libraries(smss mingw_common nt smlib) + add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE}) set_module_type(smss nativecui) add_importlibs(smss ntdll) -target_link_libraries(smss mingw_common nt smlib) Modified: branches/cmake-bringup/base/system/userinit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/useri… ============================================================================== --- branches/cmake-bringup/base/system/userinit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/userinit/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -5,7 +5,8 @@ add_executable(userinit userinit.c userinit.rc) +target_link_libraries(userinit wine) + set_module_type(userinit win32gui) -add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt) -target_link_libraries(userinit wine) +add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/winlo… ============================================================================== --- branches/cmake-bringup/base/system/winlogon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/winlogon/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -10,9 +10,10 @@ add_executable(winlogon ${CMAKE_CURRENT_BINARY_DIR}/winlogon_winlogon.h.gch ${SOURCE}) +target_link_libraries(winlogon wine) + add_pch(winlogon ${CMAKE_CURRENT_SOURCE_DIR}/winlogon.h ${SOURCE}) set_module_type(winlogon win32gui) -add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt) -target_link_libraries(winlogon wine) +add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll)

14 years, 2 months

[akhaldi] 49061: [CMAKE] - More work on the base modules. - Fix a typo. - Fix shlwapi and audio_test builds.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 8 22:26:41 2010 New Revision: 49061 URL: http://svn.reactos.org/svn/reactos?rev=49061&view=rev Log: [CMAKE] - More work on the base modules. - Fix a typo. - Fix shlwapi and audio_test builds. Modified: branches/cmake-bringup/base/applications/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt branches/cmake-bringup/base/applications/control/CMakeLists.txt branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt branches/cmake-bringup/base/applications/fontview/CMakeLists.txt branches/cmake-bringup/base/applications/games/CMakeLists.txt branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt branches/cmake-bringup/base/applications/hh/CMakeLists.txt branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt branches/cmake-bringup/base/applications/logoff/CMakeLists.txt branches/cmake-bringup/base/applications/magnify/CMakeLists.txt branches/cmake-bringup/base/applications/mmc/CMakeLists.txt branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt branches/cmake-bringup/base/applications/network/CMakeLists.txt branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt branches/cmake-bringup/base/applications/network/net/CMakeLists.txt branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt branches/cmake-bringup/base/applications/network/route/CMakeLists.txt branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt branches/cmake-bringup/base/applications/paint/CMakeLists.txt branches/cmake-bringup/base/applications/regedit/CMakeLists.txt branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt branches/cmake-bringup/base/applications/sc/CMakeLists.txt branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt branches/cmake-bringup/base/applications/winver/CMakeLists.txt branches/cmake-bringup/base/applications/write/CMakeLists.txt branches/cmake-bringup/base/shell/CMakeLists.txt branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -27,7 +27,7 @@ add_subdirectory(sc) #add_subdirectory(screensavers) add_subdirectory(shutdown) -add_subdirectory(sndrec32) +#add_subdirectory(sndrec32) add_subdirectory(sndvol32) add_subdirectory(taskmgr) add_subdirectory(winhlp32) Modified: branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(dbgprint dbgprint.c) set_module_type(dbgprint win32cui) -add_importlibs(dbgprint msvcrt) +add_importlibs(dbgprint msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ add_executable(doskey doskey.c doskey.rc) set_module_type(doskey win32cui) -add_importlibs(doskey user32 msvcrt) +add_importlibs(doskey user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(find find.c find.rc) set_module_type(find win32cui) -add_importlibs(find user32 msvcrt) +add_importlibs(find user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(hostname hostname.c hostname.rc) set_module_type(hostname win32cui) -add_importlibs(hostname msvcrt) +add_importlibs(hostname msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ add_executable(lodctr lodctr_main.c) set_module_type(lodctr win32cui) -add_importlibs(lodctr loadperf msvcrt) +add_importlibs(lodctr loadperf msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(more more.c more.rc) set_module_type(more win32cui) -add_importlibs(more user32 msvcrt) +add_importlibs(more user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -7,4 +7,4 @@ add_executable(reg reg.c rsrc.rc) set_module_type(reg win32cui) -add_importlibs(reg advapi32 user32 msvcrt) +add_importlibs(reg advapi32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -6,4 +6,4 @@ target_link_libraries(xcopy wine) set_module_type(xcopy win32cui) -add_importlibs(xcopy shell32 user32 msvcrt) +add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/applications/control/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ add_executable(control control.c control.rc) set_module_type(control win32gui) -add_importlibs(control advapi32 shell32 msvcrt) +add_importlibs(control advapi32 shell32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -27,4 +27,4 @@ target_link_libraries(dxdiag dxguid) -add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt) +add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -6,4 +6,4 @@ target_link_libraries(extrac32 wine) set_module_type(extrac32 win32gui) -add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt) +add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ fontview.rc) set_module_type(fontview win32gui) -add_importlibs(fontview gdi32 shell32 user32 msvcrt) +add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/games/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -1,4 +1,4 @@ -add_subdirectory(solitaire) +#add_subdirectory(solitaire) #add_subdirectory(spider) add_subdirectory(winemine) Modified: branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -11,4 +11,4 @@ rsrc.rc) set_module_type(winemine win32gui) -add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt) +add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/hh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(hh main.c hh.rc) set_module_type(hh win32gui) -add_importlibs(hh gdi32 user32 msvcrt) +add_importlibs(hh gdi32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(iexplore main.c iexplore.rc) set_module_type(iexplore win32gui) -add_importlibs(iexplore shdocvw msvcrt) +add_importlibs(iexplore shdocvw msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,6 +4,6 @@ add_executable(kbswitch kbswitch.c kbswitch.rc) set_module_type(kbswitch win32gui) -add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt) +add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32) add_subdirectory(kbsdll) Modified: branches/cmake-bringup/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -10,4 +10,4 @@ set_module_type(logoff win32cui) -add_importlibs(logoff advapi32 user32 msvcrt) +add_importlibs(logoff advapi32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/magnify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/magnify/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/magnify/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -6,4 +6,4 @@ set_module_type(magnify win32gui) -add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt) +add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -13,4 +13,4 @@ set_module_type(mmcclient win32gui) -add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt) +add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(mplay32 win32gui) -add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt) +add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -17,4 +17,4 @@ set_module_type(msconfig win32gui) -add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt) +add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -15,4 +15,4 @@ set_module_type(devmgmt win32gui) -add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt) +add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(eventvwr win32gui) -add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt) +add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -29,4 +29,4 @@ set_module_type(servman win32gui) -add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt) +add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -29,4 +29,4 @@ set_module_type(mstsc win32gui) -add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt) +add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -9,6 +9,6 @@ add_subdirectory(nslookup) add_subdirectory(ping) #add_subdirectory(route) -add_subdirectory(telnet) +#add_subdirectory(telnet) add_subdirectory(tracert) #add_subdirectory(whois) Modified: branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -3,4 +3,4 @@ set_module_type(arp win32cui) -add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt) +add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -7,4 +7,4 @@ target_link_libraries(dwnl uuid) -add_importlibs(dwnl urlmon wininet uuid msvcrt) +add_importlibs(dwnl urlmon wininet msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -9,4 +9,4 @@ set_module_type(finger win32cui) -add_importlibs(finger ws2_32 msvcrt) +add_importlibs(finger ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -10,4 +10,4 @@ set_module_type(ftp win32cui) -add_importlibs(ftp ws2_32 iphlpapi msvcrt) +add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -3,4 +3,4 @@ set_module_type(ipconfig win32cui) -add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt) +add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/net/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -12,4 +12,4 @@ set_module_type(net win32cui) -add_importlibs(net ws2_32 msvcrt) +add_importlibs(net ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -3,4 +3,4 @@ set_module_type(netstat win32cui) -add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt) +add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -6,4 +6,4 @@ set_module_type(nslookup win32cui) -add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt) +add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ set_module_type(ping win32cui) -add_importlibs(ping ws2_32 msvcrt) +add_importlibs(ping ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/route/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ add_executable(route route.c route.rc) set_module_type(route win32cui) -add_importlibs(route ws2_32 iphlpapi msvcrt) +add_importlibs(route ws2_32 iphlpapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -26,4 +26,4 @@ set_module_type(telnet win32cui) -add_importlibs(telnet ws2_32 user32 msvcrt) +add_importlibs(telnet ws2_32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ set_module_type(tracert win32cui) -add_importlibs(tracert ws2_32 msvcrt) +add_importlibs(tracert ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -3,4 +3,4 @@ set_module_type(whois win32cui) -add_importlibs(whois ws2_32 msvcrt) +add_importlibs(whois ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/paint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/paint/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/paint/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -18,4 +18,4 @@ set_module_type(paint win32gui) -add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt) +add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -26,6 +26,6 @@ target_link_libraries(regedit uuid) -add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt) +add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32) #add_subdirectory(clb) Modified: branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(regedt32 win32gui) -add_importlibs(regedt32 shell32 shlwapi msvcrt) +add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sc/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -19,4 +19,4 @@ set_module_type(sc win32cui) -add_importlibs(sc advapi32 msvcrt) +add_importlibs(sc advapi32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -10,4 +10,4 @@ set_module_type(shutdown win32cui) -add_importlibs(shutdown advapi32 user32 msvcrt) +add_importlibs(shutdown advapi32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -13,4 +13,4 @@ set_module_type(sndvol32 win32gui) -add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt) +add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -28,4 +28,4 @@ set_module_type(taskmgr win32gui) -add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt) +add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -18,4 +18,4 @@ target_link_libraries(winhlp32 wine) -add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt) +add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/winver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winver/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/winver/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(winver win32gui) -add_importlibs(winver shell32 msvcrt) +add_importlibs(winver shell32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/write/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/write/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/write/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(write win32gui) -add_importlibs(write user32 gdi32 msvcrt) +add_importlibs(write user32 gdi32 msvcrt kernel32) Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -1,4 +1,4 @@ add_subdirectory(cmd) -add_subdirectory(explorer) +#add_subdirectory(explorer) add_subdirectory(explorer-new) Modified: branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olecli3… ============================================================================== --- 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 22:26:41 2010 @@ -12,5 +12,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def wine) -add_importlibs(oleacc ole32 gdi32 kernel32 ntdll) +add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll) add_dependencies(olecli32 olecli32_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 22:26:41 2010 @@ -43,6 +43,9 @@ mlang urlmon winmm - version) + version + shell32 + kernel32 + ntdll) add_dependencies(shlwapi shlwapi_def) Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -1,18 +1,17 @@ add_definitions(-DPC_NO_IMPORTS) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -include_directories(${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound + ${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud + ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) add_executable(audio_test audio_test.c) set_module_type(audio_test win32cui) target_link_libraries(audio_test - libsamplerate - mingw_main - mingw_common) + libsamplerate) -add_importlibs(audio_test setupapi ksuser msvcrt) -add_dependencies(audio_test psdk bugcodes) +add_importlibs(audio_test setupapi ksuser msvcrt kernel32) +add_dependencies(audio_test bugcodes)

14 years, 2 months

[akhaldi] 49060: [CMAKE] - More work on the dlls.

by akhaldi＠svn.reactos.org

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/… ============================================================================== --- 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/C… ============================================================================== --- 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/srclien… ============================================================================== --- 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/CMa… ============================================================================== --- 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/CMa… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/updspap… ============================================================================== --- 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/CMa… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/C… ============================================================================== --- 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/windows… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/C… ============================================================================== --- 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/winspoo… ============================================================================== --- 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/… ============================================================================== --- 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/wintrus… ============================================================================== --- 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/… ============================================================================== --- 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_… ============================================================================== --- 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/wshtcpi… ============================================================================== --- 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/wtsapi3… ============================================================================== --- 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/C… ============================================================================== --- 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)

14 years, 2 months

[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.

by akhaldi＠svn.reactos.org

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/C… ============================================================================== --- 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/msftedi… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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.… ============================================================================== --- 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/mssign3… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/msvcrt2… ============================================================================== --- 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/msvcrt4… ============================================================================== --- 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/msvidc3… ============================================================================== --- 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/… ============================================================================== --- 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/netapi3… ============================================================================== --- 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/C… ============================================================================== --- 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/… ============================================================================== --- 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/ntlanma… ============================================================================== --- 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/… ============================================================================== --- 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/olecli3… ============================================================================== --- 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/… ============================================================================== --- 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/olepro3… ============================================================================== --- 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/olesvr3… ============================================================================== --- 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/olethk3… ============================================================================== --- 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/CMa… ============================================================================== --- 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/… ============================================================================== --- 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/powrpro… ============================================================================== --- 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/C… ============================================================================== --- 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/rasadhl… ============================================================================== --- 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/rasapi3… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/resutil… ============================================================================== --- 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/riched3… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/schanne… ============================================================================== --- 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/serialu… ============================================================================== --- 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/shfolde… ============================================================================== --- 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=490… ============================================================================== --- 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/CMak… ============================================================================== --- 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)

14 years, 2 months

[fireball] 49058: [HEAP] - Roel Messiant: Fix infinite loop in RtlDestroyHeap if heap contained big blocks.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 8 20:17:39 2010 New Revision: 49058 URL: http://svn.reactos.org/svn/reactos?rev=49058&view=rev Log: [HEAP] - Roel Messiant: Fix infinite loop in RtlDestroyHeap if heap contained big blocks. Modified: trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Fri Oct 8 20:17:39 2010 @@ -1928,6 +1928,7 @@ { VirtualEntry = CONTAINING_RECORD(Current, HEAP_VIRTUAL_ALLOC_ENTRY, Entry); BaseAddress = (PVOID)VirtualEntry; + Current = Current->Flink; Size = 0; ZwFreeVirtualMemory(NtCurrentProcess(), &BaseAddress,

14 years, 2 months

[fireball] 49057: [HEAP] - Set proper heap flags (tail and free checking) in case heap validation is enabled. Fixes another bunch of winetests.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 8 19:30:23 2010 New Revision: 49057 URL: http://svn.reactos.org/svn/reactos?rev=49057&view=rev Log: [HEAP] - Set proper heap flags (tail and free checking) in case heap validation is enabled. Fixes another bunch of winetests. Modified: trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Fri Oct 8 19:30:23 2010 @@ -1656,6 +1656,24 @@ TotalSize = ROUND_UP(CommitSize, 16 * PAGE_SIZE); } + if (RtlpGetMode() == UserMode) + { + /* TODO: Here should be a call to special "Debug" heap, which does parameters validation, + however we're just going to simulate setting correct flags here */ + if (Flags & (HEAP_VALIDATE_ALL_ENABLED | + HEAP_VALIDATE_PARAMETERS_ENABLED | + HEAP_CAPTURE_STACK_BACKTRACES | + HEAP_FLAG_PAGE_ALLOCS | + HEAP_CREATE_ENABLE_TRACING) && + !(Flags & HEAP_SKIP_VALIDATION_CHECKS)) + { + // RtlDebugCreateHeap(Flags, Addr, TotalSize, CommitSize, Lock, Parameters); + Flags |= HEAP_SKIP_VALIDATION_CHECKS | + HEAP_TAIL_CHECKING_ENABLED | + HEAP_FREE_CHECKING_ENABLED; + } + } + /* Calculate header size */ HeaderSize = sizeof(HEAP); if (!(Flags & HEAP_NO_SERIALIZE))

14 years, 2 months

[akhaldi] 49056: [CMAKE] - Improve some dlls. - Fix cmd and stlport. - Add libgcc as a C standard lib.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 8 19:10:33 2010 New Revision: 49056 URL: http://svn.reactos.org/svn/reactos?rev=49056&view=rev Log: [CMAKE] - Improve some dlls. - Fix cmd and stlport. - Add libgcc as a C standard lib. Modified: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/cmd/CM… ============================================================================== --- branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -75,4 +75,4 @@ add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) set_module_type(cmd win32cui) -add_importlibs(cmd advapi32 user32 msvcrt) +add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crypt32… ============================================================================== --- branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -46,7 +46,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def wine pseh - mingw_common) + oldnames) -add_importlibs(crypt32 user32 advapi32 msvcrt) +add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_dependencies(crypt32 crypt32_def) Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -46,8 +46,8 @@ target_link_libraries(dbghelp ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def wine - mingw_common - pseh) + pseh + oldnames) -add_importlibs(dbghelp psapi version msvcrt) +add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll) add_dependencies(dbghelp dbghelp_def) Modified: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) add_definitions(-D_WINE) @@ -17,13 +15,11 @@ wnet.c mpr.rc) -set_target_properties(mpr PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mpr win32dll) target_link_libraries(mpr ${CMAKE_CURRENT_BINARY_DIR}/mpr.def - wine - mingw_common - -ladvapi32 - -luser32) + wine) -add_dependencies(mpr mpr_def psdk) +add_importlibs(mpr advapi32 user32 kernel32 ntdll) +add_dependencies(mpr mpr_def) Modified: branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mprapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,19 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mprapi ${CMAKE_CURRENT_SOURCE_DIR}/mprapi.spec ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def) add_library(mprapi SHARED mprapi.c) -set_target_properties(mprapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mprapi win32dll) target_link_libraries(mprapi ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def - wine - mingw_common) + wine) -add_dependencies(mprapi mprapi_def psdk) +add_importlibs(mprapi kernel32 ntdll) +add_dependencies(mprapi mprapi_def) Modified: branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32… ============================================================================== --- branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) @@ -15,14 +13,12 @@ add_library(msadp32.acm SHARED msadp32.c) -set_target_properties(msadp32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") +set_entrypoint(msadp32.acm 0) +set_target_properties(msadp32.acm PROPERTIES SUFFIX "") target_link_libraries(msadp32.acm ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def - wine - -lwinmm - -luser32 - mingw_common - -lmsvcrt) + wine) -add_dependencies(msadp32.acm msadp32.acm_def psdk) +add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(msadp32.acm msadp32.acm_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscms/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,8 +1,5 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mscms ${CMAKE_CURRENT_SOURCE_DIR}/mscms.spec ${CMAKE_CURRENT_BINARY_DIR}/mscms.def) @@ -16,11 +13,11 @@ transform.c version.rc) -set_target_properties(mscms PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mscms win32dll) target_link_libraries(mscms ${CMAKE_CURRENT_BINARY_DIR}/mscms.def - wine - mingw_common) + wine) -add_dependencies(mscms mscms_def psdk) +add_importlibs(mscms kernel32 ntdll) +add_dependencies(mscms mscms_def) Modified: branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscoree… ============================================================================== --- branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,22 +1,17 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mscoree ${CMAKE_CURRENT_SOURCE_DIR}/mscoree.spec ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) add_library(mscoree SHARED corruntimehost.c mscoree_main.c) -set_target_properties(mscoree PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mscoree win32dll) target_link_libraries(mscoree ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def wine - mingw_common - -ladvapi32 - -lshell32 - -luuid) + uuid) -add_dependencies(mscoree mscoree_def psdk) +add_importlibs(mscoree advapi32 shell32 kernel32 ntdll) +add_dependencies(mscoree mscoree_def) Modified: branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.… ============================================================================== --- branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) @@ -15,14 +13,12 @@ add_library(msg711.acm SHARED msg711.c) -set_target_properties(msg711.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") +set_entrypoint(msg711.acm 0) +set_target_properties(msg711.acm PROPERTIES SUFFIX "") target_link_libraries(msg711.acm ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def - wine - -lwinmm - -luser32 - mingw_common - -lmsvcrt) + wine) -add_dependencies(msg711.acm msg711.acm_def psdk) +add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(msg711.acm msg711.acm_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgina/… ============================================================================== --- branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - - include_directories(include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -13,15 +11,11 @@ tui.c msgina.rc) -set_target_properties(msgina PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(msgina win32dll) target_link_libraries(msgina ${CMAKE_CURRENT_BINARY_DIR}/msgina.def - wine - mingw_common - -ladvapi32 - -luser32 - -lgdi32 - -luserenv) + wine) -add_dependencies(msgina msgina_def psdk) +add_importlibs(msgina advapi32 user32 gdi32 userenv kernel32 ntdll) +add_dependencies(msgina msgina_def) Modified: branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) @@ -15,14 +13,12 @@ add_library(msgsm32.acm SHARED msgsm32.c) -set_target_properties(msgsm32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") +set_entrypoint(msgsm32.acm 0) +set_target_properties(msgsm32.acm PROPERTIES SUFFIX "") target_link_libraries(msgsm32.acm ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def - wine - -lwinmm - -luser32 - mingw_common - -lmsvcrt) + wine) -add_dependencies(msgsm32.acm msgsm32.acm_def psdk) +add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(msgsm32.acm msgsm32.acm_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… ============================================================================== --- branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,20 +1,16 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(msimg32 ${CMAKE_CURRENT_SOURCE_DIR}/msimg32.spec ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def) add_library(msimg32 SHARED msimg32_main.c) -set_target_properties(msimg32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(msimg32 win32dll) target_link_libraries(msimg32 ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def - wine - mingw_common - -lgdi32) + wine) -add_dependencies(msimg32 msimg32_def psdk) +add_importlibs(msimg32 gdi32 kernel32 ntdll) +add_dependencies(msimg32 msimg32_def) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=490… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -18,7 +18,7 @@ add_definitions(-pipe -fms-extensions) # stlport includes -set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> -I${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport <FLAGS> -o <OBJECT> -c <SOURCE>") +set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlp… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -4,7 +4,7 @@ add_definitions(-D_STLP_USE_EXCEPTIONS) -include_directories(BEFORE ./stlport) +include_directories(BEFORE stlport) list(APPEND SOURCE src/allocators.cpp Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -32,7 +32,7 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") # Use stdcall fixups, and don't link with anything by default unless we say so -set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "Standard C Libraries") +set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") #MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries")

14 years, 2 months

← Newer
1
...
30
31
32
33
34
35
36
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010