diff options
| author | Sven Gothel <[email protected]> | 2019-04-07 05:15:23 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-07 05:15:23 +0200 |
| commit | 12047cae51b5a594b38c9e162f135352452c46fd (patch) | |
| tree | e14a8fdc091219f66d6fa1e914e1c07c228dae38 /make/scripts | |
| parent | 302599570c04bae0d96e3b20981fab1ffcaf61ae (diff) | |
Bug 1190: Updating crosstools and enabling aarch64 + armv6hf 'ontarget'
Default is to crosscompile w/o testing, i.e. property 'isCrosscompilation' is set to 'true'.
'ontarget' includes testing, no crosscompilation.
Updated crosstools links to new build of jogamp-scripting commit e6692024687685d3af725555d9bb5490d85ecc8d
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/make.gluegen.all.linux-aarch64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.linux-armv6hf.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/make/scripts/make.gluegen.all.linux-aarch64.sh b/make/scripts/make.gluegen.all.linux-aarch64.sh index 53d2851..42c9ad3 100755 --- a/make/scripts/make.gluegen.all.linux-aarch64.sh +++ b/make/scripts/make.gluegen.all.linux-aarch64.sh @@ -11,7 +11,7 @@ export TARGET_PLATFORM_LIBS=/usr/lib/aarch64-linux-gnu export TARGET_JAVA_LIBS=/usr/lib/jvm/java-8-openjdk-aarch64/jre/lib/aarch64 -export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-aarch64.xml" +export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-aarch64-ontarget.xml" #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.gluegen.all.linux-armv6hf.sh b/make/scripts/make.gluegen.all.linux-armv6hf.sh index abf8ce1..e66f0e0 100755 --- a/make/scripts/make.gluegen.all.linux-armv6hf.sh +++ b/make/scripts/make.gluegen.all.linux-armv6hf.sh @@ -9,9 +9,9 @@ # arm-linux-gnueabihf == armhf triplet export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf -export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm +export TARGET_JAVA_LIBS=/usr/lib/jvm/java-8-openjdk-armhf/jre/lib/arm -export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml" +export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf-ontarget.xml" #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" |