summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-newt.xml2
-rw-r--r--make/build.xml4
-rwxr-xr-xmake/scripts/java-run-all.sh1
3 files changed, 4 insertions, 3 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 2cb848588..0d9ee2118 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -122,7 +122,7 @@
<isset property="setup.noOpenGL"/>
</condition>
- <property name="java.excludes.cdcfp" value="${java.part.awt}"/>
+ <property name="java.excludes.cdcfp" value="${java.part.awt}, com/jogamp/newt/impl/macosx/*"/>
<condition property="java.excludes.desktop"
value="${java.part.x11} ${java.part.windows}, ${java.part.macosx}, ${java.part.awt}">
diff --git a/make/build.xml b/make/build.xml
index 9a1cf81ce..4b6c2cabe 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -63,7 +63,7 @@
</copy>
</target>
- <target name="one.dir" depends="one-lib-dir,one-jar-dir"/>
+ <target name="one-dir" depends="one-lib-dir,one-jar-dir"/>
<target name="repack-jars" depends="one-jar-dir">
<!-- Re-pack jars we have the intent to compress later, after signing -->
@@ -155,7 +155,7 @@
- Main build target.
-->
- <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-lib-dir,one-jar-dir,developer-zip-archive,source-archive" />
+ <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-dir,developer-zip-archive,source-archive" />
<target name="junit.compile">
<ant antfile="build-junit.xml" target="junit.compile" inheritRefs="true" inheritAll="true"/>
diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh
index 0e5be242a..5f6cff28a 100755
--- a/make/scripts/java-run-all.sh
+++ b/make/scripts/java-run-all.sh
@@ -38,6 +38,7 @@ uname -a | grep -i Darwin && MOSX=1
# D_ARGS="-Dnewt.debug=all -Dnativewindow.debug=all"
# D_ARGS="-Dnewt.debug=all"
# D_ARGS="-Dnewt.debug.Window"
+# D_ARGS="-Dnewt.debug.Display"
# D_ARGS="-Djogl.debug=all"
rm -f java-run.log