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

Temporary fix for wxrc on MSVC/vcpkg builds. 

When the wxrc installed by vcpkg into tools was made with the non-static
wxWidgets, and the build is static, it will not find the wxWidgets dlls
and fail.

Use our own wxrc.exe from the dependencies submodule for the time being.

This is a temporary fix, a proper fix would be adding the dlls, if they
are installed, to the PATH.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2020-08-20 23:28:42 +00:00
parent 378c9493e9
commit 84d406ac0e
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wx/CMakeLists.txt
View File

@ -163,11 +163,13 @@ if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg AND (X86_32 OR AMD64))
) )
endif() endif()
if(DEFINED ENV{APPVEYOR}) # if(DEFINED ENV{APPVEYOR})
if(TRUE)
# For some reason, the vcpkg built wxrc fails on appveyor. # For some reason, the vcpkg built wxrc fails on appveyor.
set(WXRC ${CMAKE_SOURCE_DIR}/dependencies/wxrc.exe) set(WXRC ${CMAKE_SOURCE_DIR}/dependencies/wxrc.exe)
else() else()
set(WXRC ${common_prefix}/tools/wxwidgets/wxrc.exe) set(WXRC ${common_prefix}/tools/wxwidgets/wxrc.exe)
# This one sometimes fails to find its dlls.
endif() endif()
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/zip.exe) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/zip.exe)