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

build: update finding vcpkg wxWidgets for 3.2 

Use a glob instead of hardcoding '31' in lib name.

Fix #992.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2022-08-26 00:59:38 +00:00
parent cf57af4a83
commit b1c7476f2c
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/wx/CMakeLists.txt
View File

@ -129,14 +129,25 @@ if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg AND (X86_32 OR X86_64))
include_directories(${installed_prefix}/lib/msw${libtype}) include_directories(${installed_prefix}/lib/msw${libtype})
include_directories(${common_prefix}/include) include_directories(${common_prefix}/include)
set(wxWidgets_LIB_DIR ${installed_prefix}/lib) set(wxWidgets_LIB_DIR ${installed_prefix}/lib)
set(wxWidgets_LIBRARIES
${wxWidgets_LIB_DIR}/wxbase31${libtype}_net.lib foreach(wx_lib
${wxWidgets_LIB_DIR}/wxbase31${libtype}_xml.lib ${wxWidgets_LIB_DIR}/wxbase*${libtype}_net.lib
${wxWidgets_LIB_DIR}/wxmsw31${libtype}_core.lib ${wxWidgets_LIB_DIR}/wxbase*${libtype}_xml.lib
${wxWidgets_LIB_DIR}/wxmsw31${libtype}_gl.lib ${wxWidgets_LIB_DIR}/wxmsw*${libtype}_core.lib
${wxWidgets_LIB_DIR}/wxmsw31${libtype}_xrc.lib ${wxWidgets_LIB_DIR}/wxmsw*${libtype}_gl.lib
${wxWidgets_LIB_DIR}/wxmsw31${libtype}_html.lib ${wxWidgets_LIB_DIR}/wxmsw*${libtype}_xrc.lib
${wxWidgets_LIB_DIR}/wxbase31${libtype}.lib ${wxWidgets_LIB_DIR}/wxmsw*${libtype}_html.lib
${wxWidgets_LIB_DIR}/wxbase*${libtype}.lib
)
file(GLOB wx_lib_file "${wx_lib}")
if(wx_lib_file)
list(APPEND wxWidgets_LIBRARIES "${wx_lib_file}")
endif()
endforeach()
list(
APPEND wxWidgets_LIBRARIES
winmm comctl32 oleacc rpcrt4 shlwapi version wsock32 opengl32 winmm comctl32 oleacc rpcrt4 shlwapi version wsock32 opengl32
) )