aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build.xml10
-rwxr-xr-xmake/jawt-CustomJavaCode.java2
-rwxr-xr-xmake/jawt-DrawingSurfaceInfo-CustomJavaCode.java6
-rw-r--r--make/jawt-macosx.cfg6
-rw-r--r--make/jawt-win32.cfg6
-rw-r--r--make/jawt-x11.cfg6
6 files changed, 18 insertions, 18 deletions
diff --git a/make/build.xml b/make/build.xml
index 72205f662..08717369f 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -161,7 +161,7 @@
value="javax/media/opengl/TraceGLES2.*, javax/media/opengl/DebugGLES2.*"/>
<property name="java.part.awt"
- value="javax/media/opengl/awt/**, javax/media/opengl/j2d/**, javax/media/opengl/util/swing/**, com/sun/opengl/impl/j2d/**, com/sun/opengl/impl/awt/packrect/**"/>
+ value="javax/media/opengl/awt/**, javax/media/opengl/j2d/**, javax/media/opengl/util/swing/**, com/sun/opengl/impl/j2d/**, com/sun/opengl/impl/awt/**"/>
<property name="java.part.util"
value="com/sun/opengl/util/io/**, com/sun/opengl/util/texture/**"/>
@@ -218,7 +218,7 @@
</condition>
<condition property="java.excludes.awt"
- value="${java.part.awt}, ${java.part.util.awt}, com/sun/opengl/impl/awt/**">
+ value="${java.part.awt}, ${java.part.util.awt}">
<isset property="jogl.noAWT"/>
</condition>
@@ -1417,7 +1417,7 @@
<jar manifest="tempversion" destfile="${jogl.core.jar}">
<fileset dir="${classes}"
includes="javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**"
- excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.gl2}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.x11}, ${java.part.win}, ${java.part.macosx}, ${java.part.newt}, com/sun/opengl/impl/awt/**"/>
+ excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.gl2}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.x11}, ${java.part.win}, ${java.part.macosx}, com/sun/opengl/impl/jawt/**, ${java.part.newt}"/>
</jar>
<jar manifest="tempversion" destfile="${jogl.gles1.jar}">
<fileset dir="${classes}"
@@ -1453,7 +1453,7 @@
<jar manifest="tempversion" destfile="${jogl.awt.jar}">
<fileset dir="${classes}"
includes="${java.part.awt}"
- excludes="com/sun/opengl/impl/x11/**, com/sun/opengl/impl/windows/**, com/sun/opengl/impl/macosx/**, com/sun/opengl/impl/awt/*"/>
+ excludes="com/sun/opengl/impl/x11/**, com/sun/opengl/impl/windows/**, com/sun/opengl/impl/macosx/**"/>
</jar>
<jar manifest="tempversion" destfile="${jogl.newt.jar}">
<fileset dir="${classes}"
@@ -1461,7 +1461,7 @@
</jar>
<jar manifest="tempversion" destfile="${jogl.oswin.jar}">
<fileset dir="${classes}"
- includes="${java.part.x11}, ${java.part.win}, ${java.part.macosx}, com/sun/opengl/impl/awt/*"
+ includes="${java.part.x11}, ${java.part.win}, ${java.part.macosx}, com/sun/opengl/impl/jawt/*"
excludes="com/sun/opengl/impl/**/glx/**, com/sun/opengl/impl/**/wgl/**, com/sun/opengl/impl/**/cgl/**"/>
</jar>
<jar manifest="tempversion" destfile="${jogl.util.jar}">
diff --git a/make/jawt-CustomJavaCode.java b/make/jawt-CustomJavaCode.java
index c1a56b7f6..f1ef91075 100755
--- a/make/jawt-CustomJavaCode.java
+++ b/make/jawt-CustomJavaCode.java
@@ -5,7 +5,7 @@ public static JAWT getJAWT() {
if (jawt == null) {
synchronized (JAWT.class) {
if (jawt == null) {
- AWTNativeLibLoader.loadAWTImpl();
+ JAWTNativeLibLoader.loadAWTImpl();
// Workaround for 4845371.
// Make sure the first reference to the JNI GetDirectBufferAddress is done
// from a privileged context so the VM's internal class lookups will succeed.
diff --git a/make/jawt-DrawingSurfaceInfo-CustomJavaCode.java b/make/jawt-DrawingSurfaceInfo-CustomJavaCode.java
index 2e9bd37b6..43ad16cbd 100755
--- a/make/jawt-DrawingSurfaceInfo-CustomJavaCode.java
+++ b/make/jawt-DrawingSurfaceInfo-CustomJavaCode.java
@@ -16,12 +16,12 @@ private static JAWT_PlatformInfo newPlatformInfo(ByteBuffer buf) {
try {
Class factoryClass;
if (osName.startsWith("wind")) {
- factoryClass = Class.forName("com.sun.opengl.impl.windows.JAWT_Win32DrawingSurfaceInfo");
+ factoryClass = Class.forName("com.sun.opengl.impl.jawt.windows.JAWT_Win32DrawingSurfaceInfo");
} else if (osName.startsWith("mac os x")) {
- factoryClass = Class.forName("com.sun.opengl.impl.macosx.JAWT_MacOSXDrawingSurfaceInfo");
+ factoryClass = Class.forName("com.sun.opengl.impl.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo");
} else {
// Assume Linux, Solaris, etc. Should probably test for these explicitly.
- factoryClass = Class.forName("com.sun.opengl.impl.x11.JAWT_X11DrawingSurfaceInfo");
+ factoryClass = Class.forName("com.sun.opengl.impl.jawt.x11.JAWT_X11DrawingSurfaceInfo");
}
platformInfoFactoryMethod = factoryClass.getMethod("create",
new Class[] { ByteBuffer.class });
diff --git a/make/jawt-macosx.cfg b/make/jawt-macosx.cfg
index 1cabe39be..8cb3025c2 100644
--- a/make/jawt-macosx.cfg
+++ b/make/jawt-macosx.cfg
@@ -1,7 +1,7 @@
# This .cfg file is used to generate the interface to the JAWT, which
# is used by the MacOSXOnscreenGLContext.
Style AllStatic
-Package com.sun.opengl.impl.awt
+Package com.sun.opengl.impl.jawt
JavaClass JAWTFactory
JavaOutputDir ../build/gensrc/classes
NativeOutputDir ../build/gensrc/native/jogl/OSX
@@ -22,8 +22,8 @@ CustomCCode #include <jawt.h>
CustomCCode #include </usr/include/machine/types.h>
import java.security.*
-import com.sun.opengl.impl.awt.*
-StructPackage JAWT_MacOSXDrawingSurfaceInfo com.sun.opengl.impl.macosx.awt
+import com.sun.opengl.impl.jawt.*
+StructPackage JAWT_MacOSXDrawingSurfaceInfo com.sun.opengl.impl.jawt.macosx
EmitStruct JAWT_MacOSXDrawingSurfaceInfo
Implements JAWT_MacOSXDrawingSurfaceInfo JAWT_PlatformInfo
diff --git a/make/jawt-win32.cfg b/make/jawt-win32.cfg
index 8a7f769e3..e3f4bb7eb 100644
--- a/make/jawt-win32.cfg
+++ b/make/jawt-win32.cfg
@@ -1,7 +1,7 @@
# This .cfg file is used to generate the interface to the JAWT, which
# is used by the WindowsOnscreenGLContext.
Style AllStatic
-Package com.sun.opengl.impl.awt
+Package com.sun.opengl.impl.jawt
JavaClass JAWTFactory
JavaOutputDir ../build/gensrc/classes
NativeOutputDir ../build/gensrc/native/jogl/Windows
@@ -22,8 +22,8 @@ CustomCCode #include <jawt.h>
Include intptr.cfg
import java.security.*
-import com.sun.opengl.impl.awt.*
-StructPackage JAWT_Win32DrawingSurfaceInfo com.sun.opengl.impl.windows.awt
+import com.sun.opengl.impl.jawt.*
+StructPackage JAWT_Win32DrawingSurfaceInfo com.sun.opengl.impl.jawt.windows
EmitStruct JAWT_Win32DrawingSurfaceInfo
Implements JAWT_Win32DrawingSurfaceInfo JAWT_PlatformInfo
diff --git a/make/jawt-x11.cfg b/make/jawt-x11.cfg
index 70d5caa31..3f0d8a3ee 100644
--- a/make/jawt-x11.cfg
+++ b/make/jawt-x11.cfg
@@ -1,7 +1,7 @@
# This .cfg file is used to generate the interface to the JAWT, which
# is used by the X11OnscreenGLContext.
Style AllStatic
-Package com.sun.opengl.impl.awt
+Package com.sun.opengl.impl.jawt
JavaClass JAWTFactory
JavaOutputDir ../build/gensrc/classes
NativeOutputDir ../build/gensrc/native/jogl/X11
@@ -22,8 +22,8 @@ CustomCCode #include <inttypes.h>
CustomCCode #include <jawt.h>
import java.security.*
-import com.sun.opengl.impl.awt.*
-StructPackage JAWT_X11DrawingSurfaceInfo com.sun.opengl.impl.x11.awt
+import com.sun.opengl.impl.jawt.*
+StructPackage JAWT_X11DrawingSurfaceInfo com.sun.opengl.impl.jawt.x11
EmitStruct JAWT_X11DrawingSurfaceInfo
Implements JAWT_X11DrawingSurfaceInfo JAWT_PlatformInfo
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 01:44:07 +0000