vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compile.sh: enable building native code

Browse source
This commit is contained in:
Alibek Omarov 2019-09-10 11:27:21 +06:00
parent 24a56795aa
commit b7d97bc21b
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/wscript
View file

@ -18,7 +18,7 @@ def build(bld):
srcdir = 'src', srcdir = 'src',
compat = '1.6', compat = '1.6',
name = 'xashdroid-src', name = 'xashdroid-src',
# jni = 'lib', jni = 'lib',
debug = bld.env.D8_DEBUG, debug = bld.env.D8_DEBUG,
target_api = 19) target_api = 19)
return return

16
compile.sh
View file

@ -6,13 +6,13 @@ if echo "$HOME" | grep "com.termux"; then
export JAVA=true # /bin/true does nothing but returns success export JAVA=true # /bin/true does nothing but returns success
export JAR=true export JAR=true
export JAVADOC=true export JAVADOC=true
# export AAPT2=aapt
TERMUX_ARG="--termux" TERMUX_ARG="--termux"
TOOLCHAIN=host
else else
echo "-- Configuring for Android SDK/NDK" echo "-- Configuring for Android SDK/NDK"
ARCHS="armeabi-v7a armeabi x86" TOOLCHAIN=4.9
fi fi
TOOLCHAIN=4.9 ARCHS="armeabi-v7a armeabi x86"
API=9 API=9
ROOT="$PWD" # compile.sh must be run from root of android project sources ROOT="$PWD" # compile.sh must be run from root of android project sources
SUBDIRS="xash3d-fwgs hlsdk-xash3d" SUBDIRS="xash3d-fwgs hlsdk-xash3d"
@ -54,11 +54,11 @@ build_native_project()
} }
# Do it inside waf? # Do it inside waf?
#for i in $ARCHS; do for i in $ARCHS; do
# for j in $SUBDIRS; do for j in $SUBDIRS; do
# build_native_project "$j" "$i" "$TOOLCHAIN" "$API" build_native_project "$j" "$i" "$TOOLCHAIN" "$API"
# done done
#done done
# Run waf # Run waf
./waf build -v|| exit 1 ./waf build -v|| exit 1

2
hlsdk-xash3d

@ -1 +1 @@
Subproject commit 745d722a5a8bd1811596778a57dd3a8de4acf468 Subproject commit 6143c74dc9ec26016767976f2d606979490b5728

2
xash3d-fwgs

@ -1 +1 @@
Subproject commit ba69f9e62a927b8538397a0d3a90be352ddb471b Subproject commit d1ac48b2a11f633f491fa89fb67af9182438ecb6