diff options
author | Sven Gothel <[email protected]> | 2010-04-08 04:11:07 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-04-08 04:11:07 +0200 |
commit | f8cbd63d360a8d138a82d31bb53e65485ae64b42 (patch) | |
tree | 53e7e77598f4973cfb8166cef5debf609797b4ae /src | |
parent | 35bd7f95ace4654a13a94222d443c14e74280879 (diff) |
Added doc/deployment:
JOGL-JAR-BUNDELING.txt
A first FAQ about the (new) JAR partitioning.
lstjars/lstjars.linux_amd64-20100406.log
A first deployment payload measurement in kBytes :)
New JAR Partitioning:
All-In-One (*all*):
- with AWT
- without AWT
See JOGL-JAR-BUNDELING.txt
Atomic:
See JOGL-JAR-BUNDELING.txt
- Removed property setup.noall, since the *all* targets are mandatory now.
Currently
- Added gl4 part (still empty)
- Fixed make/lstjars.sh and etc/profile.jogl (new JAR bundles)
- Fixed make/lstjars.sh to produce JAR and PACK200 numbers,
and using the *all* bundles if possible.
MacOsX:
- Fix missing refactoring in src/newt/native/MacWindow.m
- Adding missing NSWindowDelegate protocol to NewtMacWindow
as mandatory since 10.3.6
Misc:
- Applied: 'gluegen.cpptasks.striplibs' to all native libraries.
- Use path.seperator (ant) and system.env.library.path (gluegen),
for junit runs.
Diffstat (limited to 'src')
-rw-r--r-- | src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java | 2 | ||||
-rwxr-xr-x | src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java | 4 | ||||
-rw-r--r-- | src/newt/native/MacWindow.m | 2 | ||||
-rw-r--r-- | src/newt/native/NewtMacWindow.h | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java index 0e5885349..b6024f240 100644 --- a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java +++ b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java @@ -61,7 +61,7 @@ public class NativeLibLoader extends NativeLibLoaderBase { public static void loadGLDesktop() { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - loadLibrary("jogl_gl2", nativeOSPreload, true); + loadLibrary("jogl_desktop", nativeOSPreload, true); return null; } }); diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java index bf80ec7b3..56d669756 100755 --- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java +++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java @@ -118,4 +118,8 @@ public class Texture1 { frame.dispose(); frame=null; } + + public static void main(String args[]) { + org.junit.runner.JUnitCore.main(Texture1.class.getName()); + } } diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m index 01563a0d1..8c9792b19 100644 --- a/src/newt/native/MacWindow.m +++ b/src/newt/native/MacWindow.m @@ -33,7 +33,7 @@ #import <inttypes.h> -#import "com_sun_newt_macosx_MacWindow.h" +#import "com_jogamp_newt_macosx_MacWindow.h" #import "NewtMacWindow.h" #import "EventListener.h" diff --git a/src/newt/native/NewtMacWindow.h b/src/newt/native/NewtMacWindow.h index e19be2ed8..560cfe408 100644 --- a/src/newt/native/NewtMacWindow.h +++ b/src/newt/native/NewtMacWindow.h @@ -55,7 +55,7 @@ @end -@interface NewtMacWindow : NSWindow +@interface NewtMacWindow : NSWindow <NSWindowDelegate> { } |