YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge https://github.com/FWGS/xash3d-fwgs

Browse Source
This commit is contained in:
Mr0maks 2019-06-01 21:06:34 +05:00
commit 73cf465ce4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/waflib/gitversion.py
View File

@ -22,8 +22,8 @@ def get_git_version():
except Exception as e: except Exception as e:
pass pass
if(len(version) == 0): if(len(version) == 0):
version = None version = None
return version return version

4
scripts/waflib/xcompile.py
View File

@ -76,8 +76,8 @@ class Android:
self.toolchain = toolchain self.toolchain = toolchain
if self.ndk_rev >= 19 or 'clang' in self.toolchain: if self.ndk_rev >= 19 or 'clang' in self.toolchain:
self.clang = True self.clang = True
if self.is_arm64() or self.is_amd64() and self.api < 21: if self.is_arm64() or self.is_amd64() and self.api < 21:
Logs.warn('API level for 64-bit target automatically was set to 21') Logs.warn('API level for 64-bit target automatically was set to 21')

18
wscript
View File

@ -109,19 +109,19 @@ def configure(conf):
conf.options.GLWES = True conf.options.GLWES = True
conf.options.GL = False conf.options.GL = False
# print(conf.options.ALLOW64) # We restrict 64-bit builds ONLY for Win/Linux/OSX running on Intel architecture
# Because compatibility with original GoldSrc
conf.env.BIT32_MANDATORY = not conf.options.ALLOW64 if conf.env.DEST_OS in ['win32', 'linux', 'darwin'] and conf.env.DEST_CPU in ['x86_64']:
conf.env.BIT32_ALLOW64 = conf.options.ALLOW64 conf.env.BIT32_ALLOW64 = conf.options.ALLOW64
if not conf.env.BIT32_ALLOW64:
Logs.info('WARNING: will build engine for 32-bit target')
else:
conf.env.BIT32_ALLOW64 = True
conf.env.BIT32_MANDATORY = not conf.env.BIT32_ALLOW64
conf.load('force_32bit') conf.load('force_32bit')
if conf.env.DEST_OS2 != 'android': if conf.env.DEST_OS2 != 'android':
conf.load('sdl2') conf.load('sdl2')
if conf.env.DEST_SIZEOF_VOID_P == 4:
Logs.info('NOTE: will build engine for 32-bit target')
else:
Logs.warn('WARNING: 64-bit engine may be unstable')
linker_flags = { linker_flags = {
'common': { 'common': {
'msvc': ['/DEBUG'], # always create PDB, doesn't affect result binaries 'msvc': ['/DEBUG'], # always create PDB, doesn't affect result binaries