mirror of
https://github.com/celisej567/source-engine.git
synced 2026-01-03 05:49:41 +03:00
Merge branch 'master' into windows
This commit is contained in:
9
scripts/build-android-armv7a.sh
Executable file
9
scripts/build-android-armv7a.sh
Executable file
@@ -0,0 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
git submodule init && git submodule update
|
||||
wget https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip -o /dev/null
|
||||
unzip android-ndk-r10e-linux-x86_64.zip
|
||||
export ANDROID_NDK_HOME=$PWD/android-ndk-r10e/
|
||||
export NDK_HOME=$PWD/android-ndk-r10e/
|
||||
./waf configure -T debug --android=armeabi-v7a-hard,4.9,21 --togles --disable-warns &&
|
||||
./waf build
|
||||
8
scripts/build-ubuntu-amd64.sh
Executable file
8
scripts/build-ubuntu-amd64.sh
Executable file
@@ -0,0 +1,8 @@
|
||||
#!/bin/sh
|
||||
|
||||
git submodule init && git submodule update
|
||||
sudo apt-get update
|
||||
sudo apt-get install -f -y libopenal-dev g++-multilib gcc-multilib libpng-dev libjpeg-dev libfreetype6-dev libfontconfig1-dev libcurl4-gnutls-dev libsdl2-dev zlib1g-dev libbz2-dev
|
||||
|
||||
./waf configure -T debug --64bits --disable-warns &&
|
||||
./waf build
|
||||
9
scripts/build-ubuntu-i386.sh
Executable file
9
scripts/build-ubuntu-i386.sh
Executable file
@@ -0,0 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
git submodule init && git submodule update
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo apt-get update
|
||||
sudo apt-get install -f -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386
|
||||
|
||||
PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns &&
|
||||
./waf build
|
||||
9
scripts/deploy.sh
Executable file
9
scripts/deploy.sh
Executable file
@@ -0,0 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
git submodule init && git submodule update
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo apt-get update
|
||||
sudo apt-get install -f -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386
|
||||
|
||||
PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug
|
||||
./waf build --target=engine
|
||||
@@ -47,17 +47,14 @@ LINKFLAGS = {
|
||||
CFLAGS = {
|
||||
'common': {
|
||||
# disable thread-safe local static initialization for C++11 code, as it cause crashes on Windows XP
|
||||
'msvc': ['/D_USING_V110_SDK71_', '/Zi', '/FS', '/Zc:threadSafeInit-'],
|
||||
'clang': ['-g', '-gdwarf-2', '-fvisibility=hidden'],
|
||||
'gcc': ['-g', '-fvisibility=hidden'],
|
||||
'owcc': ['-fno-short-enum', '-ffloat-store', '-g3']
|
||||
'msvc': ['/D_USING_V110_SDK71_', '/Zi', '/FS', '/Zc:threadSafeInit-', '/MT'],
|
||||
'clang': ['-g0', '-fno-strict-aliasing', '-gdwarf-2', '-fvisibility=hidden'],
|
||||
'gcc': ['-g0', '-fno-strict-aliasing', '-fvisibility=hidden'],
|
||||
'owcc': ['-fno-short-enum', '-ffloat-store', '-g0']
|
||||
},
|
||||
'fast': {
|
||||
'msvc': ['/O2', '/Oy', '/MT'],
|
||||
'gcc': {
|
||||
'3': ['-O3', '-fomit-frame-pointer'],
|
||||
'default': ['-Ofast', '-funsafe-math-optimizations', '-funsafe-loop-optimizations', '-fomit-frame-pointer']
|
||||
},
|
||||
'msvc': ['/O2', '/Oy', '/MT'],
|
||||
'gcc': ['-Ofast'],
|
||||
'clang': ['-Ofast'],
|
||||
'default': ['-O3']
|
||||
},
|
||||
@@ -69,13 +66,13 @@ CFLAGS = {
|
||||
},
|
||||
'release': {
|
||||
'msvc': ['/O2', '/MT'],
|
||||
'owcc': ['-O3', '-foptimize-sibling-calls', '-fomit-leaf-frame-pointer', '-fomit-frame-pointer', '-fschedule-insns', '-funsafe-math-optimizations', '-funroll-loops', '-frerun-optimizer', '-finline-functions', '-finline-limit=512', '-fguess-branch-probability', '-fno-strict-aliasing', '-floop-optimize'],
|
||||
'default': ['-O3']
|
||||
'owcc': ['-O3', '-fomit-leaf-frame-pointer', '-fomit-frame-pointer', '-finline-functions', '-finline-limit=512'],
|
||||
'default': ['-O2', '-funsafe-math-optimizations', '-ftree-vectorize']
|
||||
},
|
||||
'debug': {
|
||||
'msvc': ['/Od', '/MTd'],
|
||||
'owcc': ['-O0', '-fno-omit-frame-pointer', '-funwind-tables', '-fno-omit-leaf-frame-pointer'],
|
||||
'default': ['-O0']
|
||||
'owcc': ['-g', '-O0', '-fno-omit-frame-pointer', '-funwind-tables', '-fno-omit-leaf-frame-pointer'],
|
||||
'default': ['-g', '-O0'] #, '-ftree-vectorize', '-ffast-math', '-fno-tree-partial-pre']
|
||||
},
|
||||
'sanitize': {
|
||||
'msvc': ['/Od', '/RTC1', '/MT'],
|
||||
|
||||
@@ -82,7 +82,6 @@ def project_key(l):
|
||||
return k
|
||||
|
||||
def fix_dos_path( path ):
|
||||
|
||||
path = path.replace('\\', '/')
|
||||
p = path.split('/')
|
||||
|
||||
@@ -110,6 +109,7 @@ def parse_vpcs( env ,vpcs, basedir ):
|
||||
for vpc in vpcs:
|
||||
f=open(vpc, 'r').read().replace('\\\n', ';')
|
||||
|
||||
re.sub(r'//.*', '', f)
|
||||
l = f.split('\n')
|
||||
|
||||
iBrackets = 0
|
||||
|
||||
@@ -255,7 +255,7 @@ class Android:
|
||||
if self.is_arm():
|
||||
if self.arch == 'armeabi-v7a':
|
||||
# ARMv7 support
|
||||
cflags += ['-mthumb', '-mfpu=neon', '-mcpu=cortex-a9', '-DHAVE_EFFICIENT_UNALIGNED_ACCESS', '-DVECTORIZE_SINCOS']
|
||||
cflags += ['-mthumb', '-mfpu=neon-vfpv4', '-mcpu=cortex-a7', '-mtune=cortex-a7', '-DHAVE_EFFICIENT_UNALIGNED_ACCESS', '-DVECTORIZE_SINCOS']
|
||||
|
||||
if not self.is_clang() and not self.is_host():
|
||||
cflags += [ '-mvectorize-with-neon-quad' ]
|
||||
|
||||
Reference in New Issue
Block a user