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

WIP 

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2021-12-22 15:00:24 +00:00
parent 972f151310
commit 86aa43926f
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -44,6 +44,10 @@ set(VCPKG_DEPS_OPTIONAL
ffmpeg ENABLE_FFMPEG ffmpeg ENABLE_FFMPEG
) )
set(VCPKG_DEPS_OPTIONAL_ARM64_BLACKLIST
ffmpeg
)
include(Set-Toolchain-vcpkg) include(Set-Toolchain-vcpkg)
set(VBAM_STATIC_DEFAULT OFF) set(VBAM_STATIC_DEFAULT OFF)

22
cmake/Set-Toolchain-vcpkg.cmake
View File

@ -265,6 +265,16 @@ function(vcpkg_set_toolchain)
foreach(i RANGE 0 ${optionals_list_last} 2) foreach(i RANGE 0 ${optionals_list_last} 2)
list(GET VCPKG_DEPS_OPTIONAL ${i} dep) list(GET VCPKG_DEPS_OPTIONAL ${i} dep)
set(skip FALSE)
if(VCPKG_TARGET_TRIPLET MATCHES "^arm64-")
foreach(blacklisted_dep IN LISTS VCPKG_DEPS_OPTIONAL_ARM64_BLACKLIST)
if(dep STREQUAL blacklisted_dep)
set(skip TRUE)
endif()
endforeach()
endif()
math(EXPR var_idx "${i} + 1") math(EXPR var_idx "${i} + 1")
list(GET VCPKG_DEPS_OPTIONAL ${var_idx} var) list(GET VCPKG_DEPS_OPTIONAL ${var_idx} var)
@ -272,7 +282,7 @@ function(vcpkg_set_toolchain)
vcpkg_seconds() vcpkg_seconds()
if("${val}" OR (seconds LESS time_limit AND ("${val}" OR "${val}" STREQUAL ""))) if(NOT skip AND ("${val}" OR (seconds LESS time_limit AND ("${val}" OR "${val}" STREQUAL ""))))
set(dep_qualified "${dep}:${VCPKG_TARGET_TRIPLET}") set(dep_qualified "${dep}:${VCPKG_TARGET_TRIPLET}")
execute_process( execute_process(
@ -286,16 +296,20 @@ function(vcpkg_set_toolchain)
endif() endif()
endforeach() endforeach()
if(WIN32 AND VCPKG_TARGET_TRIPLET MATCHES x64 AND CMAKE_GENERATOR MATCHES "Visual Studio") if(WIN32 AND CMAKE_GENERATOR MATCHES "Visual Studio")
if(VCPKG_TARGET_TRIPLET MATCHES "^x64-")
set(CMAKE_GENERATOR_PLATFORM x64 CACHE STRING "visual studio build architecture" FORCE) set(CMAKE_GENERATOR_PLATFORM x64 CACHE STRING "visual studio build architecture" FORCE)
elseif(VCPKG_TARGET_TRIPLET MATCHES "^arm64-")
set(CMAKE_GENERATOR_PLATFORM arm64 CACHE STRING "visual studio build architecture" FORCE)
endif()
endif() endif()
if(WIN32 AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") if(WIN32 AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
if(VCPKG_TARGET_TRIPLET MATCHES "^x[68][46]-windows-") if(VCPKG_TARGET_TRIPLET MATCHES "^(x[68][46]|arm64)-windows-")
# set toolchain to VS for e.g. Ninja or jom # set toolchain to VS for e.g. Ninja or jom
set(CMAKE_C_COMPILER cl CACHE STRING "Microsoft C/C++ Compiler" FORCE) set(CMAKE_C_COMPILER cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
set(CMAKE_CXX_COMPILER cl CACHE STRING "Microsoft C/C++ Compiler" FORCE) set(CMAKE_CXX_COMPILER cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
elseif(VCPKG_TARGET_TRIPLET MATCHES "^x[68][46]-mingw-") elseif(VCPKG_TARGET_TRIPLET MATCHES "^(x[68][46]|arm64)-mingw-")
# set toolchain to MinGW for e.g. Ninja or jom # set toolchain to MinGW for e.g. Ninja or jom
set(CMAKE_C_COMPILER gcc CACHE STRING "MinGW GCC C Compiler" FORCE) set(CMAKE_C_COMPILER gcc CACHE STRING "MinGW GCC C Compiler" FORCE)
set(CMAKE_CXX_COMPILER g++ CACHE STRING "MinGW G++ C++ Compiler" FORCE) set(CMAKE_CXX_COMPILER g++ CACHE STRING "MinGW G++ C++ Compiler" FORCE)