build with DEBUG=1 on android for now

libretro · Nov 15, 2016 · a7f78db · a7f78db
1 parent ff4c152
commit a7f78db
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 DEBUG = 0
+GIT_VERSION := " $(shell git describe --dirty --always --tags)"
 
 ifeq ($(platform),)
 	platform = unix
@@ -239,6 +240,9 @@ else
 
 endif
 
+CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+
 ifeq ($(DEBUG), 1)
 	CFLAGS += -O0 -g
 	CXXFLAGS += -O0 -g

diff --git a/jni/Android.mk b/jni/Android.mk
@@ -1,4 +1,7 @@
+DEBUG = 1
+
 LOCAL_PATH := $(call my-dir)
+GIT_VERSION := " $(shell git rev-parse --short HEAD)"
 
 include $(CLEAR_VARS)
 
@@ -21,8 +24,14 @@ CORE_DIR := ..
 
 include $(CORE_DIR)/Makefile.common
 
+ifeq ($(DEBUG), 1)
+   APP_OPTIM := -g -DDEBUG
+else
+   APP_OPTIM := -DNDEBUG
+endif
+
 LOCAL_SRC_FILES    =  $(SOURCES_CXX)
-LOCAL_CXXFLAGS = -DANDROID -D__LIBRETRO__ -Wall -Wno-multichar -Wno-unused-variable -Wno-sign-compare -DNDEBUG $(INCFLAGS)
+LOCAL_CXXFLAGS = -DANDROID -D__LIBRETRO__ -Wall -Wno-multichar -Wno-unused-variable -Wno-sign-compare $(APP_OPTIM) $(INCFLAGS) -DGIT_VERSION=\"$(GIT_VERSION)\"
 
 LOCAL_C_INCLUDES = $(INCFLAGS)