Author: jgardou Date: Mon Nov 1 17:24:32 2010 New Revision: 49409
URL: http://svn.reactos.org/svn/reactos?rev=49409&view=rev Log: [CMAKE] - build msvc importlibs explicitly from def file - circumvent lack of pseh lib in MSVC. - fix advapi32.def
Modified: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt branches/cmake-bringup/base/services/rpcss/CMakeLists.txt branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt branches/cmake-bringup/base/system/services/CMakeLists.txt branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt branches/cmake-bringup/dll/ntdll/CMakeLists.txt branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/advapi32/advapi32.def branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/drivers/base/null/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt branches/cmake-bringup/drivers/network/afd/CMakeLists.txt branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt
Modified: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/even... ============================================================================== --- branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -12,7 +12,7 @@
add_executable(eventlog ${CMAKE_CURRENT_BINARY_DIR}/eventlog_eventlog.h.gch ${SOURCE})
-target_link_libraries(eventlog eventlogrpc_server pseh) +target_link_libraries(eventlog eventlogrpc_server ${PSEH_LIB})
add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE})
Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpcs... ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -14,7 +14,7 @@
add_executable(rpcss ${SOURCE})
-target_link_libraries(rpcss epm_server irot_server pseh wine) +target_link_libraries(rpcss epm_server irot_server ${PSEH_LIB} wine)
set_module_type(rpcss win32cui)
Modified: branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/umpn... ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -6,7 +6,7 @@
add_executable(umpnpmgr umpnpmgr.c umpnpmgr.rc)
-target_link_libraries(umpnpmgr pnp_server wdmguid pseh) +target_link_libraries(umpnpmgr pnp_server wdmguid ${PSEH_LIB})
set_module_type(umpnpmgr win32cui) add_importlibs(umpnpmgr
Modified: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wlan... ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -4,7 +4,7 @@
add_executable(wlansvc wlansvc.c rpcserver.c)
-target_link_libraries(wlansvc wlansvc_server pseh) +target_link_libraries(wlansvc wlansvc_server ${PSEH_LIB})
set_module_type(wlansvc win32cui) add_importlibs(wlansvc
Modified: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwinst... ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -3,7 +3,7 @@
add_executable(vmwinst vmwinst.c vmwinst.rc)
-target_link_libraries(vmwinst pseh) +target_link_libraries(vmwinst ${PSEH_LIB})
set_module_type(vmwinst win32gui) add_importlibs(vmwinst
Modified: branches/cmake-bringup/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servic... ============================================================================== --- branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -16,7 +16,7 @@
target_link_libraries(services svcctl_server - pseh) + ${PSEH_LIB})
add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE})
Modified: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quartz... ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -50,7 +50,7 @@ strmiids uuid wine - pseh) + ${PSEH_LIB})
add_importlibs(quartz msvcrt
Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLis... ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -48,11 +48,11 @@ target_link_libraries(ntdll ntdllsys libcntpr - pseh) + ${PSEH_LIB})
add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE}) add_dependencies(ntdll ntstatus)
add_minicd_target(ntdll reactos/system32 ntdll.dll) add_cab_target(ntdll 1) -add_importlib_target(ntdll) +add_importlib_def(${CMAKE_CURRENT_BINARY_DIR}/ntdll.def)
Modified: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprxy... ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -13,7 +13,7 @@ actxprxy_proxy uuid wine - pseh) + ${PSEH_LIB})
add_importlibs(actxprxy rpcrt4
Modified: branches/cmake-bringup/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi32... ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/advapi32.def [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -241,7 +241,7 @@ GetEffectiveRightsFromAclA GetEffectiveRightsFromAclW GetEventLogInformation - GetExplicitEntriesFromAclAadvapi32.GetExplicitEntriesFromAclW + GetExplicitEntriesFromAclA=GetExplicitEntriesFromAclW GetExplicitEntriesFromAclW GetFileSecurityA GetFileSecurityW @@ -271,7 +271,7 @@ GetSecurityDescriptorControl GetSecurityDescriptorDacl GetSecurityDescriptorGroup - GetSecurityDescriptorLengthtdll.RtlLengthSecurityDescriptor + GetSecurityDescriptorLengtht=ntdll.RtlLengthSecurityDescriptor GetSecurityDescriptorOwner GetSecurityDescriptorRMControl GetSecurityDescriptorSacl @@ -321,7 +321,7 @@ InitiateSystemShutdownW InstallApplication=__wine_stub_advapi32_dll_318 IsProcessRestricted=__wine_stub_advapi32_dll_319 - IsTextUnicodentdll.RtlIsTextUnicode + IsTextUnicode=ntdll.RtlIsTextUnicode IsTokenRestricted IsTokenUntrusted=__wine_stub_advapi32_dll_322 IsValidAcl @@ -418,7 +418,7 @@ MakeAbsoluteSD MakeAbsoluteSD2 MakeSelfRelativeSD - MapGenericMasktdll.RtlMapGenericMask + MapGenericMask=ntdll.RtlMapGenericMask NotifyBootConfigStatus NotifyChangeEventLog ObjectCloseAuditAlarmA
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] Mon Nov 1 17:24:32 2010 @@ -45,7 +45,7 @@
target_link_libraries(crypt32 wine - pseh + ${PSEH_LIB} oldnames)
add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
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] Mon Nov 1 17:24:32 2010 @@ -46,7 +46,7 @@
target_link_libraries(dbghelp wine - pseh + ${PSEH_LIB} oldnames)
add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -50,7 +50,7 @@ target_link_libraries(gdi32 win32ksys dxguid - pseh) + ${PSEH_LIB})
add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE})
Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel32... ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -115,10 +115,10 @@
set_module_type(kernel32 win32dll)
-target_link_libraries(kernel32 pseh) +target_link_libraries(kernel32 ${PSEH_LIB})
add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) add_dependencies(kernel32 errcodes) add_cab_target(kernel32 1) -add_importlib_target(kernel32) +add_importlib_def(${CMAKE_CURRENT_BINARY_DIR}/kernel32.def)
Modified: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/C... ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -20,7 +20,7 @@ target_link_libraries(lsasrv lsa_server wine - pseh) + ${PSEH_LIB})
add_importlibs(lsasrv rpcrt4 kernel32 ntdll) add_dependencies(lsasrv psdk buildno_header)
Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/C... ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -24,7 +24,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt.def crt wine - pseh) + ${PSEH_LIB})
add_pch(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_importlibs(msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -68,7 +68,7 @@ irot_client ole32_proxy uuid - pseh) + ${PSEH_LIB})
add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut32... ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -53,7 +53,7 @@ wine wineldr uuid - pseh) + ${PSEH_LIB})
add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -15,7 +15,7 @@
target_link_libraries(psapi epsapi - pseh) + ${PSEH_LIB})
add_importlibs(psapi kernel32 ntdll) add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
Modified: branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/C... ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -40,7 +40,7 @@ wine uuid epm_client - pseh) + ${PSEH_LIB})
add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) add_dependencies(rpcrt4 winesdk)
Modified: branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupapi... ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -40,7 +40,7 @@ pnp_client uuid wine - pseh) + ${PSEH_LIB})
add_importlibs(setupapi msvcrt
Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -25,7 +25,7 @@ sti_proxy wine uuid - pseh) + ${PSEH_LIB})
add_importlibs(sti ole32
Modified: branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetup... ============================================================================== --- branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -18,7 +18,7 @@
target_link_libraries(syssetup uuid - pseh) + ${PSEH_LIB})
add_importlibs(syssetup msvcrt
Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/C... ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -40,7 +40,7 @@ urlmon_proxy uuid wine - pseh) + ${PSEH_LIB})
add_importlibs(urlmon rpcrt4
Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/C... ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -77,7 +77,7 @@ target_link_libraries(user32 wine win32ksys - pseh) + ${PSEH_LIB})
add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) add_importlibs(user32 gdi32 advapi32 imm32 kernel32 ntdll)
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] Mon Nov 1 17:24:32 2010 @@ -30,7 +30,7 @@ target_link_libraries(wininet wine zlib - pseh) + ${PSEH_LIB})
add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -23,7 +23,7 @@
target_link_libraries(winmm wine - pseh) + ${PSEH_LIB})
add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wintrust... ============================================================================== --- branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -17,7 +17,7 @@
target_link_libraries(wintrust wine - pseh) + ${PSEH_LIB})
add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll)
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] Mon Nov 1 17:24:32 2010 @@ -11,7 +11,7 @@ target_link_libraries(wlanapi wlansvc_client wine - pseh) + ${PSEH_LIB})
add_importlibs(wlanapi rpcrt4 kernel32 ntdll) add_dependencies(wlanapi psdk buildno_header)
Modified: branches/cmake-bringup/drivers/base/null/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/null/... ============================================================================== --- branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -6,7 +6,7 @@ set_target_properties(null PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys")
target_link_libraries(null - pseh + ${PSEH_LIB} -lntoskrnl -lhal)
Modified: branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystem... ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -28,7 +28,7 @@ set_target_properties(fastfat_new PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
target_link_libraries(fastfat_new - pseh + ${PSEH_LIB} fullfat)
add_importlibs(fastfat_new ntoskrnl hal)
Modified: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/kbdc... ============================================================================== --- branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -9,7 +9,7 @@
set_module_type(kbdclass kernelmodedriver)
-target_link_libraries(kbdclass pseh) +target_link_libraries(kbdclass ${PSEH_LIB})
add_importlibs(kbdclass ntoskrnl hal)
Modified: branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/mouc... ============================================================================== --- branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -8,7 +8,7 @@
set_module_type(mouclass kernelmodedriver)
-target_link_libraries(mouclass pseh) +target_link_libraries(mouclass ${PSEH_LIB})
add_importlibs(mouclass ntoskrnl hal)
Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/k... ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -33,7 +33,7 @@
target_link_libraries(ks ${CMAKE_CURRENT_SOURCE_DIR}/ks.def - pseh) + ${PSEH_LIB})
add_importlibs(ks ntoskrnl hal msvcrt) add_dependencies(ks psdk bugcodes)
Modified: branches/cmake-bringup/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/af... ============================================================================== --- branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -22,7 +22,7 @@ set_module_type(afd kernelmodedriver)
target_link_libraries(afd - pseh + ${PSEH_LIB} -lntoskrnl -lhal)
Modified: branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/tc... ============================================================================== --- branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -31,7 +31,7 @@ target_link_libraries(tcpip ip oskittcp - pseh + ${PSEH_LIB} chew -lndis -lntoskrnl
Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/cl... ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -36,7 +36,7 @@ spec2def(classpnp.sys class.spec)
add_library(classpnp SHARED ${SOURCE}) -target_link_libraries(classpnp pseh libcntpr) +target_link_libraries(classpnp ${PSEH_LIB} libcntpr)
set_module_type(classpnp kernelmodedriver)
Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/... ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -51,7 +51,7 @@
target_link_libraries(portcls libcntpr - pseh) + ${PSEH_LIB})
if(MSVC) set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/GR-")
Modified: branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/... ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -17,7 +17,7 @@ target_link_libraries(wdmaud mmixer libcntpr - pseh) + ${PSEH_LIB})
add_importlibs(wdmaud ntoskrnl ks hal) add_dependencies(wdmaud psdk bugcodes)
Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=4940... ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -157,8 +157,11 @@ set(IDL_SERVER_ARG -s -S) #.c for server library set(IDL_CLIENT_ARG -c -C) #.c for stub client library
-macro(add_importlib_target _name) +macro(add_importlib_def _def_file) # empty for now, while import libs are shipped endmacro()
+#pseh lib, needed with mingw +set(PSEH_LIB "pseh") + endif()
Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=4940... ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -82,25 +82,26 @@ set(IDL_CLIENT_ARG /cstub) #.c for stub client library
-macro(add_importlib_target _name) - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib - COMMAND LINK /LIB /MACHINE:X86 /DEF:${CMAKE_CURRENT_BINARY_DIR}/${_name}.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def - ) - add_custom_target(lib${_name} - DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib +macro(add_importlib_def _def_file) + get_filename_component(_name ${_def_file} NAME_WE) + add_custom_target( + lib${_name} + COMMAND LINK /LIB /MACHINE:X86 /DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib + DEPENDS ${_def_file} ) endmacro()
macro(add_importlibs MODULE) foreach(LIB ${ARGN}) target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.lib) - add_dependencies(${MODULE} lib${LIB}) + #add_dependencies(${MODULE} lib${LIB}) endforeach() endmacro()
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
+#pseh workaround +set(PSEH_LIB "") + endif()
Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeList... ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -409,7 +409,7 @@ target_link_libraries(ntoskrnl cportlib csq - pseh + ${PSEH_LIB} cmlib rtl rossym
Modified: branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/c... ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -15,7 +15,7 @@
add_library(csrsrv SHARED ${CMAKE_CURRENT_BINARY_DIR}/csrsrv_srv.h.gch ${SOURCE})
-target_link_libraries(csrsrv pseh) +target_link_libraries(csrsrv ${PSEH_LIB})
set_module_type(csrsrv nativedll)
Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/c... ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -31,7 +31,7 @@
target_link_libraries(win32csr win32ksys - pseh) + ${PSEH_LIB})
set_module_type(win32csr win32dll)
Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/w... ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -181,7 +181,7 @@
target_link_libraries(win32k ${CMAKE_CURRENT_SOURCE_DIR}/win32k_i386.def - pseh + ${PSEH_LIB} dxguid libcntpr)