Added jogl windows natives

markpet42 · markpet42 · commit d50c306e620a · 2019-08-29T19:31:23.000-05:00
diff --git a/gluegen-rt-natives-windows-amd64.jar b/gluegen-rt-natives-windows-amd64.jar
diff --git a/jogl-all-natives-windows-amd64.jar b/jogl-all-natives-windows-amd64.jar
diff --git a/lib-external/jogl-gluegen/.gitignore b/lib-external/jogl-gluegen/.gitignore
@@ -0,0 +1,2 @@
+gluegen
+jogl
diff --git a/lib-external/jogl-gluegen/build-gluegen.sh b/lib-external/jogl-gluegen/build-gluegen.sh
@@ -0,0 +1,5 @@
+set -x
+
+cd gluegen/make
+ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=/home/mpeterson/d/jopengl/dummy.jar
+
diff --git a/lib-external/jogl-gluegen/build-jogl.sh b/lib-external/jogl-gluegen/build-jogl.sh
@@ -0,0 +1,5 @@
+set -x
+
+cd jogl/make
+ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=/home/mpeterson/d/jopengl/dummy.jar
+
diff --git a/lib-external/jogl-gluegen/clean-gluegen.sh b/lib-external/jogl-gluegen/clean-gluegen.sh
@@ -0,0 +1,5 @@
+set -x
+
+cd gluegen/make
+ant clean -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=/home/mpeterson/d/jopengl/dummy.jar
+
diff --git a/lib-external/jogl-gluegen/clean-jogl.sh b/lib-external/jogl-gluegen/clean-jogl.sh
@@ -0,0 +1,5 @@
+set -x
+
+cd jogl/make
+ant clean -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=/home/mpeterson/d/jopengl/dummy.jar
+
diff --git a/lib-external/jogl-gluegen/copy-jogl.sh b/lib-external/jogl-gluegen/copy-jogl.sh
@@ -0,0 +1,9 @@
+set -x 
+
+cp gluegen/build/gluegen-rt-natives-linux-amd64.jar ~/d/nasa/WorldWindJava
+cp gluegen/build/gluegen-rt.jar ~/d/nasa/WorldWindJava
+cp jogl/build/jar/jogl-all.jar ~/d/nasa/WorldWindJava
+cp jogl/build/jar/jogl-all-natives-linux-amd64.jar ~/d/nasa/WorldWindJava
+
+
+
diff --git a/lib-external/jogl-gluegen/get-source.sh b/lib-external/jogl-gluegen/get-source.sh
@@ -0,0 +1,5 @@
+set -x
+
+git clone --recurse-submodules git://jogamp.org/srv/scm/gluegen.git gluegen
+git clone --recurse-submodules git://jogamp.org/srv/scm/jogl.git jogl
+
diff --git a/lib-external/jogl-gluegen/win-build-gluegen.cmd b/lib-external/jogl-gluegen/win-build-gluegen.cmd
@@ -0,0 +1,4 @@
+REM Run in a MinGW-W64 Window
+
+cd gluegen/make
+ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=dummy.jar
diff --git a/lib-external/jogl-gluegen/win-build-jogl.cmd b/lib-external/jogl-gluegen/win-build-jogl.cmd
@@ -0,0 +1,5 @@
+REM Run in a MinGW-W64 Window
+
+cd jogl\make
+ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=dummy.jar
+
diff --git a/lib-external/jogl-gluegen/win-clean-gluegen.cmd b/lib-external/jogl-gluegen/win-clean-gluegen.cmd
@@ -0,0 +1,4 @@
+REM Run in a MinGW-W64 Window
+
+cd gluegen/make
+ant clean -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=dummy.jar
diff --git a/lib-external/jogl-gluegen/win-clean-jogl.cmd b/lib-external/jogl-gluegen/win-clean-jogl.cmd
@@ -0,0 +1,5 @@
+REM Run in a MinGW-W64 Window
+
+cd jogl\make
+ant clean -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=dummy.jar
+cd ..\..
diff --git a/lib-external/jogl-gluegen/win-copy-jogl.cmd b/lib-external/jogl-gluegen/win-copy-jogl.cmd
@@ -0,0 +1,8 @@
+
+copy gluegen\build\gluegen-rt-natives-windows-amd64.jar ..\..
+rem copy gluegen\build\gluegen-rt.jar c:\nasa\WorldWindJava
+rem copy jogl\build\jar\jogl-all.jar c:\nasa\WorldWindJava
+copy jogl\build\jar\jogl-all-natives-windows-amd64.jar ..\..
+
+
+
diff --git a/nbproject/private/config.properties b/nbproject/private/config.properties
@@ -1 +1 @@
-config=MultiFrame
+config=MultiFrame
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
@@ -1,8 +1,8 @@
-compile.on.save=true
-do.depend=false
-do.jar=true
-do.jlink=false
-javac.debug=true
-javadoc.preview=true
-jlink.strip=false
-user.properties.file=/home/mpeterson/.netbeans/11.1/build.properties
+compile.on.save=true
+do.depend=false
+do.jar=true
+do.jlink=false
+javac.debug=true
+javadoc.preview=true
+jlink.strip=false
+user.properties.file=C:\\Users\\mpeterson\\AppData\\Roaming\\NetBeans\\11.1\\build.properties
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/home/mpeterson/d/nasa/WorldWindJava/src/gov/nasa/worldwindx/examples/WMSLayerManager.java</file>
-            <file>file:/home/mpeterson/d/nasa/WorldWindJava/src/gov/nasa/worldwindx/examples/WMSLayersPanel.java</file>
-        </group>
-    </open-files>
-</project-private>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group/>
+    </open-files>
+</project-private>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +set -x
++
 +cd gluegen/make
 +ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=/home/mpeterson/d/jopengl/dummy.jar
++