summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build.xml3
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jogl.all.macosx.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jogl.all.win32.bat0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jogl.all.win64.bat0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jogl.all.x86.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jogl.all.x86_64.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jogl.cdcfp.macosx.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jogl.cdcfp.x86.sh0
8 files changed, 2 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml
index 836bb5a..1d9f38d 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -33,6 +33,7 @@
<!-- Pull in GlueGen cpptasks build file -->
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
<import file="${gluegen.root}/make/gluegen-archivetasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-env.xml" />
<property name="jogl.root" value="${project.root}/../jogl" />
<property name="jogl.build" value="${jogl.root}/${rootrel.build}" />
@@ -92,7 +93,7 @@
<property name="swt.jar" value="${user.swt.jar}"/>
</target>
- <target name="init" depends="gluegen.cpptasks.detect.os,java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt">
+ <target name="init" depends="jogamp.env.init,gluegen.cpptasks.detect.os,java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt">
<property name="jogl.core.jar" value="${jogl.build}/jogl/jogl.core.jar" />
<condition property="jogl.cg.jar" value="${jogl.build}/jogl/jogl.cg.jar">
<isset property="jogl.cg"/>
diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh
index 02f8ccc..02f8ccc 100644..100755
--- a/make/scripts/make.jogl.all.macosx.sh
+++ b/make/scripts/make.jogl.all.macosx.sh
diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat
index ba37559..ba37559 100644..100755
--- a/make/scripts/make.jogl.all.win32.bat
+++ b/make/scripts/make.jogl.all.win32.bat
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat
index 3ffc828..3ffc828 100644..100755
--- a/make/scripts/make.jogl.all.win64.bat
+++ b/make/scripts/make.jogl.all.win64.bat
diff --git a/make/scripts/make.jogl.all.x86.sh b/make/scripts/make.jogl.all.x86.sh
index 41fa16b..41fa16b 100644..100755
--- a/make/scripts/make.jogl.all.x86.sh
+++ b/make/scripts/make.jogl.all.x86.sh
diff --git a/make/scripts/make.jogl.all.x86_64.sh b/make/scripts/make.jogl.all.x86_64.sh
index dc49ee4..dc49ee4 100644..100755
--- a/make/scripts/make.jogl.all.x86_64.sh
+++ b/make/scripts/make.jogl.all.x86_64.sh
diff --git a/make/scripts/make.jogl.cdcfp.macosx.sh b/make/scripts/make.jogl.cdcfp.macosx.sh
index 8677f88..8677f88 100644..100755
--- a/make/scripts/make.jogl.cdcfp.macosx.sh
+++ b/make/scripts/make.jogl.cdcfp.macosx.sh
diff --git a/make/scripts/make.jogl.cdcfp.x86.sh b/make/scripts/make.jogl.cdcfp.x86.sh
index 60b7f4a..60b7f4a 100644..100755
--- a/make/scripts/make.jogl.cdcfp.x86.sh
+++ b/make/scripts/make.jogl.cdcfp.x86.sh