Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert usage of ant release and remove the DEBUG define in the NDK makefile to remove the testsuite

Browse Source
This commit is contained in:
xawotihs
2016-07-19 22:24:26 +01:00
parent 775085eca1
commit a6211e371e
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/Android/jni/Android.mk
+1 -2
View File
@@ -11,9 +11,8 @@ SDL_PATH := $(JGE_PATH)/Dependencies/SDL
BOOST_PATH := $(MY_WAGIC_ROOT)/Boost BOOST_PATH := $(MY_WAGIC_ROOT)/Boost
JPEG_PATH := $(JGE_PATH)/Dependencies/libjpeg JPEG_PATH := $(JGE_PATH)/Dependencies/libjpeg
PNG_PATH := $(JGE_PATH)/Dependencies/libpng PNG_PATH := $(JGE_PATH)/Dependencies/libpng
DEBUG ?= DEBUG
LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -D_$(DEBUG) LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG
LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC -DTIXML_USE_STL LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC -DTIXML_USE_STL
LOCAL_CFLAGS += -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS LOCAL_CFLAGS += -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS
LOCAL_STATIC_LIBRARIES := libpng libjpeg LOCAL_STATIC_LIBRARIES := libpng libjpeg
tools/travis-script.sh
+1 -1
View File
@@ -62,7 +62,7 @@ if [ "$BUILD_ANDROID" = "YES" ]; then
android-ndk-r9/ndk-build -C projects/mtg/Android -j4 android-ndk-r9/ndk-build -C projects/mtg/Android -j4
$ANDROID list targets $ANDROID list targets
$ANDROID update project -t 1 -p projects/mtg/Android $ANDROID update project -t 1 -p projects/mtg/Android
ant release -f projects/mtg/Android/build.xml ant debug -f projects/mtg/Android/build.xml
fi fi
# we're building a Qt version with GUI here # we're building a Qt version with GUI here