From f80127dff3e35610d715ba6ea889a1af0680ef85 Mon Sep 17 00:00:00 2001 From: "techdragon.nguyen@gmail.com" Date: Tue, 17 Apr 2012 11:24:02 +0000 Subject: [PATCH] modified Android build to allow between a DEBUG vs RELEASE build of the native code. When doing an ndk build run the following to do a release build 'DEBUG=RELEASE ndk-build' --- projects/mtg/Android/jni/Android.mk | 5 +++-- projects/mtg/Android/jni/Application.mk | 5 ++++- projects/mtg/Android/project.properties | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/mtg/Android/jni/Android.mk b/projects/mtg/Android/jni/Android.mk index 3d74c1546..70a878950 100644 --- a/projects/mtg/Android/jni/Android.mk +++ b/projects/mtg/Android/jni/Android.mk @@ -11,8 +11,9 @@ SDL_PATH := $(JGE_PATH)/Dependencies/SDL BOOST_PATH := $(MY_WAGIC_ROOT)/Boost JPEG_PATH := $(JGE_PATH)/Dependencies/libjpeg PNG_PATH := $(JGE_PATH)/Dependencies/libpng +DEBUG ?= DEBUG -LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -D_DEBUG +LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -D_$(DEBUG) LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC LOCAL_CFLAGS += -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS LOCAL_STATIC_LIBRARIES := libpng libjpeg @@ -191,4 +192,4 @@ include $(CLEAR_VARS) # SDL dynamic lib include $(MY_LOCAL_PATH)/$(SDL_PATH)/Android.mk -include $(CLEAR_VARS) \ No newline at end of file +include $(CLEAR_VARS) diff --git a/projects/mtg/Android/jni/Application.mk b/projects/mtg/Android/jni/Application.mk index f4960f98e..01804bb30 100644 --- a/projects/mtg/Android/jni/Application.mk +++ b/projects/mtg/Android/jni/Application.mk @@ -2,4 +2,7 @@ APP_PROJECT_PATH := $(call my-dir)/.. APP_CPPFLAGS += -frtti -fexceptions APP_ABI := armeabi armeabi-v7a APP_STL := gnustl_static -APP_MODULES := libpng libjpeg main SDL \ No newline at end of file +APP_MODULES := libpng libjpeg main SDL + +#APP_OPTIM is 'release' by default +APP_OPTIM := release diff --git a/projects/mtg/Android/project.properties b/projects/mtg/Android/project.properties index 60bad6999..c6998b3d1 100644 --- a/projects/mtg/Android/project.properties +++ b/projects/mtg/Android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=Intel Corporation:Intel Atom x86 System Image:10 +target=android-9