FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-26 03:39:16 +01:00
Code Issues 2 Projects Releases Wiki Activity

port: clean-up old port header

Browse Source
This commit is contained in:
Alibek Omarov 2019-07-01 05:50:54 +03:00
parent 6197ba8af6
commit b8c0d7f59e
2 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
common/port.h
View File

@ -17,26 +17,7 @@ GNU General Public License for more details.
#ifndef PORT_H #ifndef PORT_H
#define PORT_H #define PORT_H
// a1ba: disabled, set by waf #include "build.h"
// #if defined(__LP64__) || defined(__LLP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
// #define XASH_64BIT
// #endif
// #ifdef XASH_64BIT
// #define ARCH_SUFFIX "64"
// #else
#define ARCH_SUFFIX
// #endif
#if defined(__ANDROID__) || TARGET_OS_IOS
#define XASH_MOBILE_PLATFORM
#endif
#ifdef _WIN32
#define PATH_SPLITTER "\\"
#else
#define PATH_SPLITTER "/"
#endif
#if !defined(_WIN32) #if !defined(_WIN32)
#include <limits.h> #include <limits.h>
@ -45,11 +26,13 @@ GNU General Public License for more details.
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#define PATH_SPLITTER "/"
#if defined(__APPLE__) #if defined(__APPLE__)
#include <sys/syslimits.h> #include <sys/syslimits.h>
#include "TargetConditionals.h"
#define OS_LIB_EXT "dylib" #define OS_LIB_EXT "dylib"
#define OPEN_COMMAND "open" #define OPEN_COMMAND "open"
#include "TargetConditionals.h"
#else #else
#define OS_LIB_EXT "so" #define OS_LIB_EXT "so"
#define OPEN_COMMAND "xdg-open" #define OPEN_COMMAND "xdg-open"
@ -63,15 +46,7 @@ GNU General Public License for more details.
//#else //#else
#define POSTFIX #define POSTFIX
//#endif //#endif
// don't change these names
#define MENUDLL "libmenu" POSTFIX "." OS_LIB_EXT
#define CLIENTDLL "libclient" POSTFIX "." OS_LIB_EXT
#define SERVERDLL "libserver" POSTFIX "." OS_LIB_EXT
#define GAMEPATH "/sdcard/xash"
#else #else
#define MENUDLL "libmenu" ARCH_SUFFIX "." OS_LIB_EXT
#define CLIENTDLL "client" ARCH_SUFFIX "." OS_LIB_EXT
#endif #endif
#define VGUI_SUPPORT_DLL "libvgui_support." OS_LIB_EXT #define VGUI_SUPPORT_DLL "libvgui_support." OS_LIB_EXT
@ -115,6 +90,7 @@ GNU General Public License for more details.
int x, y; int x, y;
} POINT; } POINT;
#else // WIN32 #else // WIN32
#define PATH_SPLITTER "\\"
#ifdef __MINGW32__ #ifdef __MINGW32__
#define _inline static inline #define _inline static inline
#define FORCEINLINE inline __attribute__((always_inline)) #define FORCEINLINE inline __attribute__((always_inline))
@ -122,8 +98,6 @@ GNU General Public License for more details.
#define FORCEINLINE __forceinline #define FORCEINLINE __forceinline
#endif #endif
#define strcasecmp _stricmp
#define strncasecmp _strnicmp
#define open _open #define open _open
#define read _read #define read _read
#define alloca _alloca #define alloca _alloca
@ -147,8 +121,6 @@ GNU General Public License for more details.
#define OS_LIB_PREFIX "" #define OS_LIB_PREFIX ""
#define OS_LIB_EXT "dll" #define OS_LIB_EXT "dll"
#define MENUDLL "menu"ARCH_SUFFIX"." OS_LIB_EXT
#define CLIENTDLL "client"ARCH_SUFFIX"." OS_LIB_EXT
#define VGUI_SUPPORT_DLL "../vgui_support." OS_LIB_EXT #define VGUI_SUPPORT_DLL "../vgui_support." OS_LIB_EXT
#ifdef XASH_64BIT #ifdef XASH_64BIT
// windows NameForFunction not implemented yet // windows NameForFunction not implemented yet

2
game_launch/wscript
View File

@ -17,7 +17,7 @@ def configure(conf):
def build(bld): def build(bld):
source = ['game.cpp'] source = ['game.cpp']
includes = '. ../common' includes = '. ../common ../public'
libs = [] libs = []
if bld.env.DEST_OS != 'win32': if bld.env.DEST_OS != 'win32':