Author: akhaldi Date: Sat Aug 6 09:53:47 2016 New Revision: 72131
URL: http://svn.reactos.org/svn/reactos?rev=72131&view=rev Log: [WIN32DLLS] We don't need mingwex for these modules anymore. CORE-11799
Modified: 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/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt
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] Sat Aug 6 09:53:47 2016 @@ -6,11 +6,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
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) add_cd_file(TARGET beepmidi DESTINATION reactos/system32 FOR all)
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] Sat Aug 6 09:53:47 2016 @@ -32,11 +32,6 @@
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] Sat Aug 6 09:53:47 2016 @@ -105,11 +105,6 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_rc_deps}") 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/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:53:47 2016 @@ -47,12 +47,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_ocidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def)
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(oleaut32 mingwex) - #FIXME: http://llvm.org/bugs/show_bug.cgi?id=19027 - set_property(SOURCE vartype.c APPEND_STRING PROPERTY COMPILE_FLAGS " -no-integrated-as") -endif() - add_idl_headers(oleaut32_idlheader oleaut32_oaidl.idl) add_dependencies(oleaut32 oleaut32_idlheader) set_module_type(oleaut32 win32dll)
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] Sat Aug 6 09:53:47 2016 @@ -22,11 +22,6 @@ set_module_type(wdmaud.drv win32dll UNICODE) set_target_properties(wdmaud.drv PROPERTIES SUFFIX "") target_link_libraries(wdmaud.drv mmebuddy 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/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMake... ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:53:47 2016 @@ -16,10 +16,5 @@ set_module_type(winemp3.acm win32dll) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm wine libmpg123 oldnames) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(winemp3.acm mingwex) -endif() - add_importlibs(winemp3.acm winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET winemp3.acm DESTINATION reactos/system32 FOR all)