diff --git a/cmake/LibraryNaming.cmake b/cmake/LibraryNaming.cmake index 724349bd..d71919fa 100644 --- a/cmake/LibraryNaming.cmake +++ b/cmake/LibraryNaming.cmake @@ -54,7 +54,6 @@ check_group_build_target(XASH_SERENITY XASH_PLATFORM) check_group_build_target(XASH_IRIX XASH_PLATFORM) check_group_build_target(XASH_NSWITCH XASH_PLATFORM) check_group_build_target(XASH_PSVITA XASH_PLATFORM) -check_group_build_target(XASH_LINUX_UNKNOWN XASH_PLATFORM) check_group_build_target(XASH_X86 XASH_ARCHITECTURE) check_group_build_target(XASH_AMD64 XASH_ARCHITECTURE) check_group_build_target(XASH_ARM XASH_ARCHITECTURE) @@ -84,8 +83,6 @@ 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) diff --git a/public/build.h b/public/build.h index 2f8fffae..851939b5 100644 --- a/public/build.h +++ b/public/build.h @@ -69,7 +69,6 @@ Then you can use another oneliner to query all variables: #undef XASH_IRIX #undef XASH_JS #undef XASH_LINUX -#undef XASH_LINUX_UNKNOWN #undef XASH_LITTLE_ENDIAN #undef XASH_MIPS #undef XASH_MOBILE_PLATFORM @@ -103,13 +102,6 @@ Then you can use another oneliner to query all variables: #if defined __linux__ #if defined __ANDROID__ #define XASH_ANDROID 1 - #else - #include - // if our system libc has features.h header - // try to detect it to not confuse other libcs with built with glibc game libraries - #if !defined __GLIBC__ - #define XASH_LINUX_UNKNOWN 1 - #endif #endif #define XASH_LINUX 1 #elif defined __FreeBSD__ diff --git a/scripts/waifulib/library_naming.py b/scripts/waifulib/library_naming.py index 4369b3b6..ac2faf6f 100644 --- a/scripts/waifulib/library_naming.py +++ b/scripts/waifulib/library_naming.py @@ -44,7 +44,6 @@ DEFINES = [ 'XASH_IRIX', 'XASH_JS', 'XASH_LINUX', -'XASH_LINUX_UNKNOWN', 'XASH_LITTLE_ENDIAN', 'XASH_MIPS', 'XASH_MOBILE_PLATFORM', @@ -76,8 +75,6 @@ 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: