diff options
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 19 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv7.xml | 6 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.android-armv7-cross.sh | 2 |
3 files changed, 23 insertions, 4 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index dd7f1cf..e7af64c 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -317,6 +317,7 @@ <and> <isfalse value="${isWindows}" /> <isfalse value="${isOSX}" /> + <isfalse value="${isAndroid}" /> <isfalse value="${noX11}" /> </and> </condition> @@ -600,6 +601,7 @@ <compiler id="compiler.cfg.freebsd" name="gcc"> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <define name="FREEBSD" /> <define name="BSD" /> <define name="_DEBUG" if="c.compiler.use-debug"/> @@ -611,6 +613,7 @@ <compiler id="compiler.cfg.linux" name="gcc"> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> <define name="NDEBUG" unless="c.compiler.use-debug"/> @@ -621,6 +624,7 @@ <compilerarg value="-m32"/> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> <define name="NDEBUG" unless="c.compiler.use-debug"/> @@ -632,6 +636,7 @@ <compilerarg value="-m64"/> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> <define name="NDEBUG" unless="c.compiler.use-debug"/> @@ -641,15 +646,21 @@ <compiler id="compiler.cfg.linux.armv7" name="gcc"> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <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> + <compiler id="compiler.cfg.android" name="gcc"> + <!-- shall be defined in custom ${gluegen-cpptasks.file} ! --> + </compiler> + <compiler id="compiler.cfg.freebsd" name="gcc"> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <define name="FREEBSD" /> <define name="BSD" /> <define name="_DEBUG" if="c.compiler.use-debug"/> @@ -669,6 +680,7 @@ <compilerarg value="+W942,129"/> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <!-- aCC doesn't seem to define a generic system macro, a la "__sun". The documentation claims it defines the following, but don't seem to work: __HP_aCC, __LP64__, __RISC_0__. @@ -688,6 +700,7 @@ <compiler id="compiler.cfg.solaris" name="gcc"> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> <define name="NDEBUG" unless="c.compiler.use-debug"/> @@ -701,6 +714,7 @@ <compilerarg value="-xarch=v9a" /> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> <define name="NDEBUG" unless="c.compiler.use-debug"/> @@ -715,6 +729,7 @@ <compilerarg value="-xcache=64/64/2:1024/64/16" /> <defineset> <define name="__unix__"/> + <define name="__X11__" if="isX11"/> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> <define name="NDEBUG" unless="c.compiler.use-debug"/> @@ -834,6 +849,10 @@ <linker id="linker.cfg.linux.armv7" name="gcc"> </linker> + <compiler id="linker.cfg.android" name="gcc"> + <!-- shall be defined in custom ${gluegen-cpptasks.file} ! --> + </compiler> + <linker id="linker.cfg.hpux" name="aCC"> </linker> diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml index 38b42f2..f2ed4cf 100644 --- a/make/lib/gluegen-cpptasks-android-armv7.xml +++ b/make/lib/gluegen-cpptasks-android-armv7.xml @@ -26,8 +26,10 @@ <compilerarg value="${env.TARGET_TOOL_PATH}/libexec/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}" /> <compilerarg value="-march=armv7-a" /> <compilerarg value="-fpic" /> - <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="-isystem" /> + <compilerarg value="${env.TARGET_OS_PATH}/include"/> + <compilerarg value="-isystem" /> + <compilerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/include" /> <!--includes stdarg.h --> <defineset> <define name="__unix__"/> <define name="ANDROID" /> diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh index 6cbd5cf..23b13b7 100755 --- a/make/scripts/make.gluegen.all.android-armv7-cross.sh +++ b/make/scripts/make.gluegen.all.android-armv7-cross.sh @@ -76,8 +76,6 @@ export NDK_READELF=${NDK_XBIN_PATH}/${TARGET_ARCH}-readelf export PATH=${NDK_XBIN_PATH}:$PATH -export NDK_INCLUDE="-I${TARGET_OS_PATH}/include" - export NDK_CFLAGS="\ -march=${TARGET_CPU_NAME} \ |