ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2022-08-07 21:13:52 +00:00
parent e29032d48a
commit 5008ffbacf
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wx/CMakeLists.txt
View File

@ -855,17 +855,6 @@ if(WIN32)
list(APPEND VBAM_LIBS dxguid dsound wsock32 ws2_32 imm32 version) list(APPEND VBAM_LIBS dxguid dsound wsock32 ws2_32 imm32 version)
endif() 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}) link_directories(${CMAKE_BINARY_DIR})
set(VBAM_ICON visualboyadvance-m.icns) set(VBAM_ICON visualboyadvance-m.icns)