diff options
| author | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
|---|---|---|
| committer | Petr Skramovsky <[email protected]> | 2013-07-17 09:20:46 +0200 |
| commit | 9fce91044649c9f97bd94c5791a10270afad7570 (patch) | |
| tree | a69fa244ddeb78e52248d4306a4ecc6b27e924da /make/build-common.xml | |
| parent | 5116d72f0150bdd6353ee664ef76e414bd61f87e (diff) | |
| parent | bfb10d309d97c19a33f9b6758f647186f8e0ddd6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index dd33b1683..2061d55c9 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -19,6 +19,9 @@ <import file="${gluegen.root}/make/jogamp-androidtasks.xml" /> <import file="${gluegen.root}/make/jogamp-env.xml" /> + <!-- Add JOAL (optional) --> + <property name="joal.root" value="../../joal" /> + <property name="ant-contrib.jar" value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" /> <condition property="rootrel.build" value="build"> @@ -202,6 +205,8 @@ <property name="ant.jar" value="${ant.home}/lib/ant.jar" /> <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> + <property name="build.joal" value="${joal.root}/${rootrel.build}" /> <!-- optional --> + <property name="nativewindow.make" value="." /> <property name="nativewindow.build.xml" value="${nativewindow.make}/build-nativewindow.xml" /> <property name="build.nativewindow" value="${build}/nativewindow" /> @@ -414,6 +419,13 @@ <property name="jogl-all-android.jar" value="${jar}/jogl-all-android.jar" /> <property name="jogl-all-android.apk" value="${jar}/jogl-all-android-${android.abi}.apk" /> + <!-- JavaSE combinations . JOAL (optional) --> + <property name="joal.jar" value="${build.joal}/joal.jar" /> + <condition property="joal-jars.available"> + <available file="${joal.jar}"/> + </condition> + <echo message="joal-jars.available: ${joal-jars.available} ${joal.jar}" /> + <!-- NativeWindow Compilation .. --> <path id="swt_gluegen.classpath"> <pathelement location="${gluegen-rt.jar}" /> @@ -427,6 +439,13 @@ <path refid="nativewindow_all_atoms.classpath" /> </path> + <path id="nativewindow_gluegen_joal.classpath"> + <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${swt.jar}" /> + <pathelement location="${joal.jar}" /> + <path refid="nativewindow_all_atoms.classpath" /> + </path> + <path id="nativewindow_gluegen_android.classpath"> <pathelement location="${android.jar}" /> <pathelement location="${gluegen-rt-android.jar}" /> |