summaryrefslogtreecommitdiffstats
path: root/make/lib
diff options
context:
space:
mode:
Diffstat (limited to 'make/lib')
-rw-r--r--make/lib/gluegen-cpptasks-android-armv7.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml
index 17cb5c9..90db706 100644
--- a/make/lib/gluegen-cpptasks-android-armv7.xml
+++ b/make/lib/gluegen-cpptasks-android-armv7.xml
@@ -26,7 +26,6 @@
<compilerarg value="${env.TARGET_TOOL_PATH}/libexec/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}" />
<compilerarg value="-march=armv7-a" />
<compilerarg value="-fpic" />
- <compilerarg value="-DANDROID" />
<compilerarg value="${env.NDK_INCLUDE}" />
<compilerarg value="-I${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/include" /> <!--inclides stdarg.h -->
<compilerarg value="-Wl,--demangle" />
@@ -37,7 +36,6 @@
<compilerarg value="-Wl,-z,nocopyreloc" />
<compilerarg value="${env.TARGET_OS_PATH}/lib/libc.so" />
<compilerarg value="${env.TARGET_OS_PATH}/lib/libdl.so" />
-<!-- <compilerarg value="${env.TARGET_OS_PATH}/lib/libstdc++.so" /> -->
<compilerarg value="${env.TARGET_OS_PATH}/lib/libm.so" />
<!-- <compilerarg value="${env.TARGET_OS_PATH}/lib/crtbegin_dynamic.o" /> -->
<compilerarg value="-Wl,--no-undefined" />
@@ -45,7 +43,11 @@
<compilerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/${env.TARGET_CPU_NAME}/libgcc.a" />
<compilerarg value="${env.TARGET_OS_PATH}/lib/crtend_android.o" />
<defineset>
+ <define name="__unix__"/>
<define name="ANDROID" />
+ <define name="_DEBUG" if="c.compiler.use-debug"/>
+ <define name="DEBUG" if="c.compiler.use-debug"/>
+ <define name="NDEBUG" unless="c.compiler.use-debug"/>
</defineset>
</compiler>