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

Fix the Windows ARM64 build 

* Remove arch constraints in a CMake block.
* Convert some tab identation to spaces.
This commit is contained in:
Fabrice de Gans 2022-12-27 11:14:11 -08:00 committed by Rafael Kitover
parent e10bf7bc4b
commit 3c41b68d51
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Architecture.cmake
View File

@ -27,13 +27,13 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64")
set(ASM_DEFAULT ON) set(ASM_DEFAULT ON)
set(X86_32 ON) set(X86_32 ON)
set(X86 ON) set(X86 ON)
set(WINARCH x86) set(WINARCH x86)
set(ARCH_NAME x86_32) set(ARCH_NAME x86_32)
elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
set(AMD64 ON) set(AMD64 ON)
set(X64 ON) set(X64 ON)
set(X86_64 ON) set(X86_64 ON)
set(WINARCH x64) set(WINARCH x64)
set(ARCH_NAME x86_64) set(ARCH_NAME x86_64)
endif() endif()
@ -47,7 +47,9 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "[aA][aA][rR][cC][hH]|[aA][rR][mM]") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "[aA][aA][rR][cC][hH]|[aA][rR][mM]")
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
set(ARCH_NAME arm32) set(ARCH_NAME arm32)
set(WINARCH arm)
elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
set(ARCH_NAME arm64) set(ARCH_NAME arm64)
set(WINARCH arm64)
endif() endif()
endif() endif()

2
src/wx/CMakeLists.txt
View File

@ -109,7 +109,7 @@ endif()
# on VS with vcpkg we can't use FindwxWidgets, we have to set everything up # on VS with vcpkg we can't use FindwxWidgets, we have to set everything up
# manually because the package is broken # manually because the package is broken
if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg AND (X86_32 OR X86_64)) if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg)
# set up wxwidgets stuff # set up wxwidgets stuff
set(libtype u) set(libtype u)
unset(arch_suffix) unset(arch_suffix)