From 399f7213e9dfb22d98f2d5f13e0ec67faf7f67e5 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 17 Apr 2023 19:19:26 +0300 Subject: [PATCH] LibraryNaming: add IRIX, linuxunkabi definitions, remove unused PowerPC definitions (until somebody ports new engine to PPC) --- cmake/LibraryNaming.cmake | 13 ++++--------- scripts/waifulib/library_naming.py | 17 ++++++----------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/cmake/LibraryNaming.cmake b/cmake/LibraryNaming.cmake index 5c444e23..e233a7de 100644 --- a/cmake/LibraryNaming.cmake +++ b/cmake/LibraryNaming.cmake @@ -81,6 +81,8 @@ unset(CMAKE_REQUIRED_INCLUDES) # engine/common/build.c if(XASH_ANDROID) set(BUILDOS "android") +elseif(XASH_LINUX_UNKNOWN) + set(BUILDOS "linuxunkabi") elseif(XASH_WIN32 OR XASH_LINUX OR XASH_APPLE) set(BUILDOS "") # no prefix for default OS elseif(XASH_FREEBSD) @@ -101,6 +103,8 @@ elseif(XASH_NSWITCH) set(BUILDOS "nswitch") elseif(XASH_PSVITA) set(BUILDOS "psvita") +elseif(XASH_IRIX) + set(BUILDOS "irix") else() message(SEND_ERROR "Place your operating system name here! If this is a mistake, try to fix conditions above and report a bug") endif() @@ -145,15 +149,6 @@ elseif(XASH_MIPS) if(XASH_LITTLE_ENDIAN) set(BUILDARCH "${BUILDARCH}el") endif() -elseif(XASH_PPC) - set(BUILDARCH "powerpc") - if(XASH_64BIT) - set(BUILDARCH "${BUILDARCH}64") - endif() - - if(XASH_LITTLE_ENDIAN) - set(BUILDARCH "${BUILDARCH}le") - endif() elseif(XASH_RISCV) set(BUILDARCH "riscv") if(XASH_64BIT) diff --git a/scripts/waifulib/library_naming.py b/scripts/waifulib/library_naming.py index b8985c92..78acafe9 100644 --- a/scripts/waifulib/library_naming.py +++ b/scripts/waifulib/library_naming.py @@ -35,21 +35,19 @@ DEFINES = [ 'XASH_ARMv7', 'XASH_ARMv8', 'XASH_BIG_ENDIAN', -'XASH_BSD', 'XASH_DOS4GW', 'XASH_E2K', 'XASH_EMSCRIPTEN', 'XASH_FREEBSD', 'XASH_HAIKU', 'XASH_IOS', +'XASH_IRIX', 'XASH_JS', 'XASH_LINUX', +'XASH_LINUX_UNKNOWN', 'XASH_LITTLE_ENDIAN', -'XASH_MINGW', 'XASH_MIPS', -'XASH_PPC', 'XASH_MOBILE_PLATFORM', -'XASH_MSVC', 'XASH_NETBSD', 'XASH_OPENBSD', 'XASH_POSIX', @@ -59,7 +57,6 @@ DEFINES = [ 'XASH_RISCV_SOFTFP', 'XASH_SERENITY', 'XASH_WIN32', -'XASH_WIN64', 'XASH_X86', 'XASH_NSWITCH', 'XASH_PSVITA', @@ -78,6 +75,8 @@ def configure(conf): # engine/common/build.c if conf.env.XASH_ANDROID: buildos = "android" + elif conf.env.XASH_LINUX_UNKNOWN: + buildos = "linuxunkabi" elif conf.env.XASH_WIN32 or conf.env.XASH_LINUX or conf.env.XASH_APPLE: buildos = "" # no prefix for default OS elif conf.env.XASH_FREEBSD: @@ -98,6 +97,8 @@ def configure(conf): buildos = "nswitch" elif conf.env.XASH_PSVITA: buildos = "psvita" + elif conf.env.XASH_IRIX: + buildos = "irix" else: conf.fatal("Place your operating system name in build.h and library_naming.py!\n" "If this is a mistake, try to fix conditions above and report a bug") @@ -136,12 +137,6 @@ def configure(conf): buildarch += "64" if conf.env.XASH_LITTLE_ENDIAN: buildarch += "el" - elif conf.env.XASH_PPC: - buildarch = "powerpc" - if conf.env.XASH_64BIT: - buildarch += "64" - if conf.env.XASH_LITTLE_ENDIAN: - buildarch += "le" elif conf.env.XASH_RISCV: buildarch = "riscv" if conf.env.XASH_64BIT: