YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-02-05 03:24:39 +00:00
Code Issues Projects Releases Wiki Activity

scripts: revert the arm64->aarch64 change

Browse Source
This commit is contained in:
fgsfds 2023-02-08 01:01:26 +01:00
parent c6da23892f
commit b01237f698
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/LibraryNaming.cmake
View File

@ -79,7 +79,7 @@ elseif(XASH_X86)
set(BUILDARCH "i386") set(BUILDARCH "i386")
endif() endif()
elseif(XASH_ARM AND XASH_64BIT) elseif(XASH_ARM AND XASH_64BIT)
set(BUILDARCH "aarch64") set(BUILDARCH "arm64")
elseif(XASH_ARM) elseif(XASH_ARM)
set(BUILDARCH "armv") set(BUILDARCH "armv")
if(XASH_ARMv8) if(XASH_ARMv8)

2
contrib/iZarif/premake5.lua
View File

@ -55,7 +55,7 @@ newoption{trigger = "lto", description = "Enable Link Time Optimization", defaul
newoption{trigger = "arch", description = "Destination arch", default = xash.get_arch(), allowed = { newoption{trigger = "arch", description = "Destination arch", default = xash.get_arch(), allowed = {
{"amd64", ""}, {"amd64", ""},
{"x86", ""}, {"x86", ""},
{"aarch64", ""}, {"arm64", ""},
{"armv8_32l", ""}, {"armv8_32l", ""},
{"armv7l", ""}, {"armv7l", ""},
{"armv6l", ""}, {"armv6l", ""},

2
contrib/iZarif/xash.lua
View File

@ -89,7 +89,7 @@ function m.get_arch()
arch = "x86" arch = "x86"
elseif m.is_cxx_symbol_defined("XASH_ARM", {"build.h"}, {"public"}) then elseif m.is_cxx_symbol_defined("XASH_ARM", {"build.h"}, {"public"}) then
if m.is_cxx_symbol_defined("XASH_64BIT", {"build.h"}, {"public"}) then if m.is_cxx_symbol_defined("XASH_64BIT", {"build.h"}, {"public"}) then
arch = "aarch64" arch = "arm64"
else else
arch = "armv" arch = "armv"

2
scripts/waifulib/library_naming.py
View File

@ -107,7 +107,7 @@ def configure(conf):
else: else:
buildarch = "i386" buildarch = "i386"
elif conf.env.XASH_ARM and conf.env.XASH_64BIT: elif conf.env.XASH_ARM and conf.env.XASH_64BIT:
buildarch = "aarch64" buildarch = "arm64"
elif conf.env.XASH_ARM: elif conf.env.XASH_ARM:
buildarch = "armv" buildarch = "armv"
if conf.env.XASH_ARMv8: if conf.env.XASH_ARMv8:

2
scripts/waifulib/xcompile.py
View File

@ -352,7 +352,7 @@ class Android:
class NintendoSwitch: class NintendoSwitch:
ctx = None # waf context ctx = None # waf context
arch = "aarch64" arch = "arm64"
dkp_dir = None dkp_dir = None
portlibs_dir = None portlibs_dir = None
dka64_dir = None dka64_dir = None