diff options
Diffstat (limited to 'make/gluegen-cpptasks-base.xml')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 5be1361..7ea3da4 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -24,7 +24,7 @@ - isLinuxAMD64 - isLinuxIA64 - isLinuxX86 - - isLinuxARM + - isLinuxARMv7l - isOSX - isOSXPPC - isSolaris @@ -94,7 +94,7 @@ - - compiler.cfg.linux - compiler.cfg.linux.amd64 - - compiler.cfg.linux.arm7 + - compiler.cfg.linux.armv7l - compiler.cfg.solaris - compiler.cfg.solaris.sparcv9 - compiler.cfg.solaris.amd64 @@ -106,7 +106,7 @@ - compiler.cfg.hpux - linker.cfg.linux - linker.cfg.linux.amd64 - - linker.cfg.linux.arm7 + - linker.cfg.linux.armv7l - linker.cfg.freebsd.x86 - linker.cfg.freebsd.amd64 - linker.cfg.solaris @@ -222,10 +222,13 @@ <condition property="isHPUX"> <os name="HP-UX" /> </condition> - <condition property="isLinuxARM7"> + <condition property="isLinuxARMv7l"> <and> <istrue value="${isLinux}" /> - <os arch="arm" /> + <or> + <os arch="arm" /> + <os arch="armv7l" /> + </or> </and> </condition> <condition property="isLinuxX86"> @@ -324,7 +327,7 @@ <echo message="LinuxAMD64=${isLinuxAMD64}" /> <echo message="LinuxIA64=${isLinuxIA64}" /> <echo message="LinuxX86=${isLinuxX86}" /> - <echo message="LinuxARM=${isLinuxARM}" /> + <echo message="LinuxARMv7l=${isLinuxARMv7l}" /> <echo message="OS X=${isOSX}" /> <echo message="OS X PPC=${use.macosppc}" /> <echo message="OS X x32=${use.macosx32}" /> @@ -366,11 +369,11 @@ <property name="os.and.arch" value="linux-i586" /> </target> - <target name="gluegen.cpptasks.detect.os.linux.arm7" unless="gluegen.cpptasks.detected.os.2" if="isLinuxARM7"> - <property name="os.and.arch" value="linux-arm7" /> + <target name="gluegen.cpptasks.detect.os.linux.armv7l" unless="gluegen.cpptasks.detected.os.2" if="isLinuxARMv7l"> + <property name="os.and.arch" value="linux-armv7l" /> </target> - <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.arm7" unless="gluegen.cpptasks.detected.os.2" /> + <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv7l" unless="gluegen.cpptasks.detected.os.2" /> <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX"> <property name="native.library.suffix" value="*lib" /> @@ -592,7 +595,7 @@ </defineset> </compiler> - <compiler id="compiler.cfg.linux.arm7" name="gcc"> + <compiler id="compiler.cfg.linux.armv7l" name="gcc"> <defineset> <define name="__unix__"/> <define name="_DEBUG" if="c.compiler.use-debug"/> @@ -770,7 +773,7 @@ <linkerarg value="-m64"/> </linker> - <linker id="linker.cfg.linux.arm7" name="gcc"> + <linker id="linker.cfg.linux.armv7l" name="gcc"> </linker> <linker id="linker.cfg.hpux" name="aCC"> @@ -908,10 +911,10 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" /> </target> - <target name="gluegen.cpptasks.declare.compiler.linux.arm7" if="isLinuxARM7"> - <echo message="Linux.arm7" /> - <property name="compiler.cfg.id.base" value="compiler.cfg.linux.arm7" /> - <property name="linker.cfg.id.base" value="linker.cfg.linux.arm7" /> + <target name="gluegen.cpptasks.declare.compiler.linux.armv7l" if="isLinuxARMv7l"> + <echo message="Linux.armv7l" /> + <property name="compiler.cfg.id.base" value="compiler.cfg.linux.armv7l" /> + <property name="linker.cfg.id.base" value="linker.cfg.linux.armv7l" /> <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/arm" /> </target> @@ -929,7 +932,7 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ia64" /> </target> - <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.arm7" if="isLinux"> + <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv7l" if="isLinux"> <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> |