From 5008ffbacf8eda13d9c34be29d4e11a14681dc1a Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sun, 7 Aug 2022 21:13:52 +0000 Subject: [PATCH] Stop using MINGW64 windres rc compiler for CLANG64 On MSYS2, stop using the MINGW64 windres.exe Windows resource file compiler instead of the CLANG64 provided one, because the CLANG64 windres.exe works correctly now, while using the MINGW64 windres.exe no longer works. Signed-off-by: Rafael Kitover --- src/wx/CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 769be523..c30a5d7e 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -855,17 +855,6 @@ if(WIN32) list(APPEND VBAM_LIBS dxguid dsound wsock32 ws2_32 imm32 version) endif() -# On MSYS2 CLANG64, use MinGW64 windres, when available, instead of -# llvm-rc, which sometimes does not work. -if(MSYS AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) - cygpath(gcc_binutils_windres /mingw64/bin/windres) - - if(EXISTS "${gcc_binutils_windres}") - set(CMAKE_RC_COMPILER "${gcc_binutils_windres}") - set(CMAKE_RC_COMPILER "${gcc_binutils_windres}" CACHE STRING "Windows REsource File Compiler" FORCE) - endif() -endif() - link_directories(${CMAKE_BINARY_DIR}) set(VBAM_ICON visualboyadvance-m.icns)