diff options
| author | Sven Gothel <[email protected]> | 2012-01-22 18:41:21 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-01-22 18:41:21 +0100 |
| commit | 8eda2ed64fffea8242f5d58a9e5f867579cf3214 (patch) | |
| tree | dc4c4fee36c45617d4273a3c4fab8d901529261b | |
| parent | 2221eac3d1a462c75847bd095641ca12d7c250f9 (diff) | |
Fix Bug 516 (Determine Java Version) / See gluegen: 64639b805a32338385421f168e12c1ef7f749d00
| -rwxr-xr-x | make/build.xml | 8 | ||||
| -rwxr-xr-x | make/scripts/make.joal-demos.all.linux-x86_64.sh | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index 224117b..00ad211 100755 --- a/make/build.xml +++ b/make/build.xml @@ -132,7 +132,13 @@ <pathelement location="${build}/j-ogg-oggd.jar" /> <pathelement location="${build}/j-ogg-vorbisd.jar" /> </path> - <javac destdir="${classes.dir}" source="1.4" debug="true" debuglevel="source,lines"> + <javac destdir="${classes.dir}" + includeantruntime="false" + memoryMaximumSize="${javac.memorymax}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.dir}" /> <classpath refid="joal.classpath" /> </javac> diff --git a/make/scripts/make.joal-demos.all.linux-x86_64.sh b/make/scripts/make.joal-demos.all.linux-x86_64.sh index 746cf2d..c157266 100755 --- a/make/scripts/make.joal-demos.all.linux-x86_64.sh +++ b/make/scripts/make.joal-demos.all.linux-x86_64.sh @@ -19,5 +19,8 @@ fi # -Drootrel.build=build-x86_64 \ ant \ + -Dtarget.sourcelevel=1.6 \ + -Dtarget.targetlevel=1.6 \ + -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-x86_64 \ $* 2>&1 | tee make.joal-demos.all.linux-x86_64.log |