From 5efac59e8f260983b6b0611e8fa36dd58ab82e35 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 1 May 2019 19:05:15 +0300 Subject: [PATCH] android.mk: completely remove it, as we use waf everywhere now, add simple buildscript --- .gitignore | 9 ++--- .gitmodules | 6 ++-- build.sh | 9 ----- compile.sh | 23 ++++++++++++ jni/Android.mk | 9 ----- jni/Application.mk | 52 --------------------------- jni/src/Android.mk | 1 - jni/src/Xash3D/Android.mk | 1 - jni/src/hlsdk-xash3d | 1 - jni/xash3d_config.mk | 75 --------------------------------------- 10 files changed, 31 insertions(+), 155 deletions(-) delete mode 100755 build.sh create mode 100755 compile.sh delete mode 100644 jni/Android.mk delete mode 100644 jni/Application.mk delete mode 100644 jni/src/Android.mk delete mode 100644 jni/src/Xash3D/Android.mk delete mode 160000 jni/src/hlsdk-xash3d delete mode 100644 jni/xash3d_config.mk diff --git a/.gitignore b/.gitignore index 321f2908..feb6673c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,11 +16,12 @@ local.properties *.bin # Generated -assets/extras.pak -res/values/git-rev.xml -src/in/celest/xash3d/XashConfig.java +android/assets/extras.pak +android/res/values/git-rev.xml +android/src/in/celest/xash3d/XashConfig.java +android/lib *.pyc .lock-* .waf* -build/ +build*/ diff --git a/.gitmodules b/.gitmodules index 6fafae5c..18fe5b98 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "xash-extras"] path = xash-extras url = https://github.com/FWGS/xash-extras -[submodule "jni/src/hlsdk-xash3d"] - path = jni/src/hlsdk-xash3d - url = https://github.com/FWGS/hlsdk-xash3d +[submodule "jni/src/xash3d-fwgs"] + path = xash3d-fwgs + url = https://github.com/FWGS/xash3d-fwgs diff --git a/build.sh b/build.sh deleted file mode 100755 index 7c9f2171..00000000 --- a/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Generate configs -android/gen-config.sh android/ -android/gen-version.sh android/ - -# Run waf -./waf configure -T release -./waf diff --git a/compile.sh b/compile.sh new file mode 100755 index 00000000..09a98de7 --- /dev/null +++ b/compile.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +ARCHS="armeabi-v7a-hard armeabi x86" +TOOLCHAIN=4.9 +API=21 +ROOT="$PWD" # compile.sh must be run from root of android project sources + +# Generate configs +android/gen-config.sh android/ +android/gen-version.sh android/ + +build_native_project() +{ + ./waf -t $1 -o build-$1-$2 configure -T release --android="$2,$3,$4" build +} + +# Do it inside waf? +for i in $ARCHS; do + build_native_project "xash3d-fwgs" "$i" "$TOOLCHAIN" "$API" || exit 1 +done + +# Run waf +./waf configure -T release build diff --git a/jni/Android.mk b/jni/Android.mk deleted file mode 100644 index 4396ffa9..00000000 --- a/jni/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -# override some setup.mk defines - -override TARGET_arm_release_CFLAGS := -override TARGET_thumb_release_CFLAGS := -override TARGET_arm_debug_CFLAGS := -override TARGET_thumb_debug_CFLAGS := -override TARGET_CFLAGS := - -include $(call all-subdir-makefiles) diff --git a/jni/Application.mk b/jni/Application.mk deleted file mode 100644 index cc9e3501..00000000 --- a/jni/Application.mk +++ /dev/null @@ -1,52 +0,0 @@ - -# Uncomment this if you're using STL in your project -# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information -#APP_STL := stlport_static - -XASH_SDL ?= 0 -ifeq ($(XASH_SDL),1) -APP_PLATFORM := android-12 -else -APP_PLATFORM := android-9 -endif - -APP_CFLAGS += -Wl,--no-undefined - -# if non-zero, works only if single ABI selected -XASH_THREAD_NUM ?= 0 - - -CFLAGS_OPT := -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=256 -pipe -CFLAGS_OPT_ARM := -mthumb -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -fPIC -DHAVE_EFFICIENT_UNALIGNED_ACCESS -#CFLAGS_OPT_ARMv5 :=-mcpu=arm1136jf-s -mtune=arm1136jf-s -mthumb -mfpu=vfp -pipe -mfloat-abi=softfp -CFLAGS_OPT_ARMv5 := -march=armv5te -mthumb -msoft-float -CFLAGS_OPT_X86 := -mtune=atom -march=atom -mssse3 -mfpmath=sse -funroll-loops -pipe -DVECTORIZE_SINCOS -DHAVE_EFFICIENT_UNALIGNED_ACCESS -CFLAGS_HARDFP := -D_NDK_MATH_NO_SOFTFP=1 -mhard-float -mfloat-abi=hard -DLOAD_HARDFP -DSOFTFP_LINK -APPLICATIONMK_PATH = $(call my-dir) - -NANOGL_PATH := $(APPLICATIONMK_PATH)/src/NanoGL/nanogl - -XASH3D_PATH := $(APPLICATIONMK_PATH)/src/Xash3D/xash3d - -HLSDK_PATH := $(APPLICATIONMK_PATH)/src/HLSDK/halflife/ - -XASH3D_CONFIG := $(APPLICATIONMK_PATH)/xash3d_config.mk - -APP_ABI := x86 armeabi armeabi-v7a-hard -# Use armeabi-v7a to disable hardfloat, armeabi to build armv5 xash3d -# Change CFLAGS_OPT_ARMv5 to "-mfloat-abi=softfp -mfpu=vfp" and fix setup.mk of ndk to build armv6 -# Mods are built with both ABI support -# ARMv6 and ARMv5 xash3d builds use softfp only and compatible only with softfp mods -# Build both armeabi-v7a-hard and armeabi-v7a supported only for mods, not for engine - -APP_MODULES := xash menu client server NanoGL gpgs_support -ifeq ($(GOOGLE_PLAY_BUILD),1) - APP_STL := gnustl_static - APP_MODULES += libgpg-1 - CFLAGS_OPT += -DGOOGLE_PLAY_BUILD -endif - -ifeq ($(XASH_SDL),1) - APP_MODULES += SDL2 -endif - diff --git a/jni/src/Android.mk b/jni/src/Android.mk deleted file mode 100644 index 5053e7d6..00000000 --- a/jni/src/Android.mk +++ /dev/null @@ -1 +0,0 @@ -include $(call all-subdir-makefiles) diff --git a/jni/src/Xash3D/Android.mk b/jni/src/Xash3D/Android.mk deleted file mode 100644 index 5053e7d6..00000000 --- a/jni/src/Xash3D/Android.mk +++ /dev/null @@ -1 +0,0 @@ -include $(call all-subdir-makefiles) diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d deleted file mode 160000 index 4c55114a..00000000 --- a/jni/src/hlsdk-xash3d +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4c55114a3e16adca9a693016d3a461fb117e1058 diff --git a/jni/xash3d_config.mk b/jni/xash3d_config.mk deleted file mode 100644 index 1d02ea4a..00000000 --- a/jni/xash3d_config.mk +++ /dev/null @@ -1,75 +0,0 @@ -LOCAL_CFLAGS += $(CFLAGS_OPT) -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard) -LOCAL_CFLAGS += $(CFLAGS_OPT_ARM) $(CFLAGS_HARDFP) -endif -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) -LOCAL_CFLAGS += $(CFLAGS_OPT_ARM) -mfloat-abi=softfp -endif -ifeq ($(TARGET_ARCH_ABI),armeabi) -LOCAL_CFLAGS += $(CFLAGS_OPT_ARMv5) -endif -ifeq ($(TARGET_ARCH_ABI),x86) -LOCAL_CFLAGS += $(CFLAGS_OPT_X86) -endif -ifneq ($(XASH_THREAD_NUM),0) -ifneq (,$(findstring $(LOCAL_MODULE),nanogl server client)) -#LOCAL_LDFLAGS += -fopenmp -ftree-parallelize-loops=$(XASH_THREAD_NUM) -LOCAL_CFLAGS += -ftree-parallelize-loops=$(XASH_THREAD_NUM) -endif -LOCAL_LDFLAGS += -fopenmp -ftree-parallelize-loops=$(XASH_THREAD_NUM) -# this works only if single ABI selected -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_studio.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/cl_game.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/cl_frame.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/cl_parse.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_warp.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -#obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/cl_main.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -#obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/cl_tent.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/cl_events.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_sprite.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_image.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_cull.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -#obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_rpart.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -#obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_beams.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) - -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_rlight.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -#obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_rsurf.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_rmain.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) - -#obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/s_dsp.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -#obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/s_utils.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/s_vox.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/s_mouth.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/s_stream.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/s_load.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -#obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/s_mix.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_draw.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/client/gl_decals.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/soundlib/snd_wav.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/imagelib/img_tga.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/imagelib/img_wad.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/imagelib/img_bmp.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/imagelib/img_quant.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -#obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/console.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/net_buffer.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/net_encode.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/mod_studio.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/pm_trace.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/pm_surface.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/cvar.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/cmd.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/network.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/crtlib.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/crclib.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/filesystem.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/infostring.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/gamma.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/mathlib.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/matrixlib.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/common/touch.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/server/sv_move.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/server/sv_pmove.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/server/sv_world.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/server/sv_phys.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -obj/local/$(TARGET_ARCH_ABI)/objs/xash/server/sv_frame.o: override PRIVATE_CC = $(TARGET_CC) -ftree-parallelize-loops=$(XASH_THREAD_NUM) -endif