[akhaldi] 64105: [CMAKE/CLANG] * Link mingwex when needed because having it globally won't do. CORE-8516
Author: akhaldi Date: Wed Sep 10 15:56:48 2014 New Revision: 64105
URL: http://svn.reactos.org/svn/reactos?rev=64105&view=rev Log: [CMAKE/CLANG] * Link mingwex when needed because having it globally won't do. CORE-8516
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/CMakeLists.txt trunk/reactos/dll/win32/beepmidi/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt trunk/reactos/toolchain-clang.cmake
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/C... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -33,6 +33,11 @@ set_module_type(d3dx9_36 win32dll) add_dependencies(d3dx9_36 d3d_idl_headers) target_link_libraries(d3dx9_36 dxguid wine) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(d3dx9_36 mingwex) +endif() + add_importlibs(d3dx9_36 d3dcompiler_43 d3dxof user32 ole32 gdi32 msvcrt kernel32 ntdll) add_pch(d3dx9_36 d3dx9_36_private.h SOURCE) add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/CMa... ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -25,5 +25,10 @@
set_module_type(dsound win32dll) target_link_libraries(dsound dxguid uuid wine) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(dsound mingwex) +endif() + add_importlibs(dsound winmm ole32 advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/CM... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -46,6 +46,11 @@
set_module_type(wined3d win32dll) target_link_libraries(wined3d wine) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(wined3d mingwex) +endif() + add_importlibs(wined3d user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(wined3d wined3d_private.h SOURCE) add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeLi... ============================================================================== --- trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -53,6 +53,10 @@ target_link_libraries(opengl32 mesa_x86) endif()
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(opengl32 mingwex) +endif() + set_module_type(opengl32 win32dll HOTPATCHABLE)
add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll)
Modified: trunk/reactos/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -7,6 +7,10 @@
add_library(beepmidi SHARED ${SOURCE})
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(beepmidi mingwex) +endif() + set_module_type(beepmidi win32dll UNICODE)
add_importlibs(beepmidi winmm msvcrt kernel32 ntdll)
Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeList... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -33,6 +33,11 @@
set_module_type(gdiplus win32dll) target_link_libraries(gdiplus wine) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(gdiplus mingwex) +endif() + add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll) add_pch(gdiplus gdiplus_private.h SOURCE)
Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeLists... ============================================================================== --- trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -106,6 +106,11 @@
set_module_type(mshtml win32dll) target_link_libraries(mshtml uuid wine strmiids oldnames) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(mshtml mingwex) +endif() + add_delay_importlibs(mshtml wininet) add_importlibs(mshtml urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_dependencies(mshtml mshtml_nsiface_header)
Modified: trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/CMakeL... ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -30,6 +30,10 @@ libsamplerate mmixer)
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(wdmaud.drv mingwex) +endif() + add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) add_pch(wdmaud.drv wdmaud.h SOURCE) add_cd_file(TARGET wdmaud.drv DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/toolchain-clang.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-clang.cmake?rev=6... ============================================================================== --- trunk/reactos/toolchain-clang.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-clang.cmake [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -56,7 +56,7 @@ set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
# Don't link with anything by default unless we say so -set(CMAKE_C_STANDARD_LIBRARIES "-lmingwex -lgcc" 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 "-lgcc" CACHE STRING "Standard C++ Libraries")
-
akhaldi＠svn.reactos.org