diff options
| author | Sven Gothel <[email protected]> | 2011-07-24 22:04:40 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-07-24 22:04:40 +0200 |
| commit | 625727ee75b758bef4f9f5f3816b37547c9f6875 (patch) | |
| tree | 63fce88fa5e37abe2e852608a8b79ac8f28029d0 /make/build.xml | |
| parent | 26374fad042f4a33f799cdee367dc903b27a44f7 (diff) | |
Cleaned up android build ; Cross junit/java android test/script; Fix Test1p2ProcAddressEmitter
Fix Test1p2ProcAddressEmitter
- 3 tests used the wrong binding instance,
where no native lib was loaded for - duh :)
Cleaned up android build
- add unix src (UnixDynamicLinkerImpl_JNI.c)
- remove linker cmds in compile arguments
Cross junit/java android test works via script
- target command scrip is written to file, pushed and executed
Status: com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
- passed
- on par w/ linux-armv7
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index f91d3a2..b1b8616 100644 --- a/make/build.xml +++ b/make/build.xml @@ -302,6 +302,10 @@ <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> + <target name="declare.android" if="isAndroid" > + <property name="c.src.dir.os" value="unix" /> + </target> + <target name="declare.solaris32" if="isSolaris32Bit"> <echo message="Solaris" /> <property name="compiler.cfg.id" value="compiler.cfg.solaris" /> @@ -359,7 +363,7 @@ <property name="java.includes.dir.hpux" value="${java.includes.dir}/hp-ux" /> </target> - <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler,declare.win32,declare.linux,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" /> + <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler,declare.win32,declare.linux,declare.android,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" /> <target name="c.rename.lib.mingw" if="isMingW"> <!-- FIXME: this is a hack; the cpptask should have an option to change the |