diff options
Diffstat (limited to 'make/lib/gluegen-cpptasks-android-armv6.xml')
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv6.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml index bcb3f53..57999b2 100644 --- a/make/lib/gluegen-cpptasks-android-armv6.xml +++ b/make/lib/gluegen-cpptasks-android-armv6.xml @@ -110,7 +110,8 @@ <linkerarg value="--demangle" /> <linkerarg value="--gc-sections" /> <linkerarg value="--no-undefined" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> + <linkerarg value="-static-libstdc++" if="isGCC"/> <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin needs to be told where to find libgcc as the default location (gcc -print-search-dirs) is not correct. Not sure if this is a bug in the NDK or not. We also @@ -128,7 +129,7 @@ <property name="compiler.cfg.id.base" value="compiler.cfg.android" /> <property name="linker.cfg.id.base" value="linker.cfg.android" /> <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> </target> <target name="declare.linux.android"> |