mirror of
https://github.com/FWGS/hlsdk-xash3d
synced 2024-11-21 17:36:18 +01:00
scripts: revert the arm64->aarch64 change
This commit is contained in:
parent
c6da23892f
commit
b01237f698
@ -79,7 +79,7 @@ elseif(XASH_X86)
|
||||
set(BUILDARCH "i386")
|
||||
endif()
|
||||
elseif(XASH_ARM AND XASH_64BIT)
|
||||
set(BUILDARCH "aarch64")
|
||||
set(BUILDARCH "arm64")
|
||||
elseif(XASH_ARM)
|
||||
set(BUILDARCH "armv")
|
||||
if(XASH_ARMv8)
|
||||
|
@ -55,7 +55,7 @@ newoption{trigger = "lto", description = "Enable Link Time Optimization", defaul
|
||||
newoption{trigger = "arch", description = "Destination arch", default = xash.get_arch(), allowed = {
|
||||
{"amd64", ""},
|
||||
{"x86", ""},
|
||||
{"aarch64", ""},
|
||||
{"arm64", ""},
|
||||
{"armv8_32l", ""},
|
||||
{"armv7l", ""},
|
||||
{"armv6l", ""},
|
||||
|
@ -89,7 +89,7 @@ function m.get_arch()
|
||||
arch = "x86"
|
||||
elseif m.is_cxx_symbol_defined("XASH_ARM", {"build.h"}, {"public"}) then
|
||||
if m.is_cxx_symbol_defined("XASH_64BIT", {"build.h"}, {"public"}) then
|
||||
arch = "aarch64"
|
||||
arch = "arm64"
|
||||
else
|
||||
arch = "armv"
|
||||
|
||||
|
@ -107,7 +107,7 @@ def configure(conf):
|
||||
else:
|
||||
buildarch = "i386"
|
||||
elif conf.env.XASH_ARM and conf.env.XASH_64BIT:
|
||||
buildarch = "aarch64"
|
||||
buildarch = "arm64"
|
||||
elif conf.env.XASH_ARM:
|
||||
buildarch = "armv"
|
||||
if conf.env.XASH_ARMv8:
|
||||
|
@ -352,7 +352,7 @@ class Android:
|
||||
|
||||
class NintendoSwitch:
|
||||
ctx = None # waf context
|
||||
arch = "aarch64"
|
||||
arch = "arm64"
|
||||
dkp_dir = None
|
||||
portlibs_dir = None
|
||||
dka64_dir = None
|
||||
|
Loading…
Reference in New Issue
Block a user