java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 3661
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3661&view=rev
Author:   kappa1
Date:     2011-10-11 22:39:32 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
minor tweak to the order in which CALayer support is detected.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2011-10-11 22:30:55 UTC (rev 3660)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2011-10-11 22:39:32 UTC (rev 3661)
@@ -80,8 +80,8 @@
 		// It is only needed on first call, so we avoid it on all subsequent calls
 		// due to performance..
         
-		// Allow the use of a Core Animation Layer only when using Display.setParent() or AWTGLCanvas and when not in fullscreen
-		final boolean allowCALayer = (Display.getParent() != null || component instanceof AWTGLCanvas) && !Display.isFullscreen();
+		// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
+		final boolean allowCALayer = (Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas;
 		
 		if (firstLockSucceeded)
 			return lockAndInitHandle(lock_buffer, component, allowCALayer);

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-10-11 22:30:55 UTC (rev 3660)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-10-11 22:39:32 UTC (rev 3661)
@@ -50,8 +50,8 @@
 	}
 
 	protected void initHandle(Canvas component) throws LWJGLException {
-		// Allow the use of a Core Animation Layer only when using Display.setParent() or AWTGLCanvas and when not in fullscreen
-		final boolean allowCALayer = (Display.getParent() != null || component instanceof AWTGLCanvas) && !Display.isFullscreen();
+		// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
+		final boolean allowCALayer = (Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas;
 		
 		nInitHandle(awt_surface.lockAndGetHandle(component), getHandle(), allowCALayer);
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3660
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3660&view=rev
Author:   kappa1
Date:     2011-10-11 22:30:55 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Limit the use to CALayer only to when using Display.setParent(), an AWTGLCanvas in non fullscreen mode.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
    trunk/LWJGL/src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c
    trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2011-10-11 21:51:45 UTC (rev 3659)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2011-10-11 22:30:55 UTC (rev 3660)
@@ -79,14 +79,17 @@
 		// http://192.18.37.44/forums/index.php?topic=10572 for a discussion.
 		// It is only needed on first call, so we avoid it on all subsequent calls
 		// due to performance..
-        final Canvas parent = component instanceof AWTGLCanvas ? component : Display.getParent();
+        
+		// Allow the use of a Core Animation Layer only when using Display.setParent() or AWTGLCanvas and when not in fullscreen
+		final boolean allowCALayer = (Display.getParent() != null || component instanceof AWTGLCanvas) && !Display.isFullscreen();
+		
 		if (firstLockSucceeded)
-			return lockAndInitHandle(lock_buffer, component, parent);
+			return lockAndInitHandle(lock_buffer, component, allowCALayer);
 		else
 			try {
 				firstLockSucceeded = AccessController.doPrivileged(new PrivilegedExceptionAction<Boolean>() {
 					public Boolean run() throws LWJGLException {
-						return lockAndInitHandle(lock_buffer, component, parent);
+						return lockAndInitHandle(lock_buffer, component, allowCALayer);
 					}
 				});
 				return firstLockSucceeded;
@@ -95,7 +98,7 @@
 			}
 	}
 
-	private static native boolean lockAndInitHandle(ByteBuffer lock_buffer, Canvas component, Canvas display_parent) throws LWJGLException;
+	private static native boolean lockAndInitHandle(ByteBuffer lock_buffer, Canvas component, boolean allowCALayer) throws LWJGLException;
 
 	void unlock() throws LWJGLException {
 		nUnlock(lock_buffer);

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-10-11 21:51:45 UTC (rev 3659)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-10-11 22:30:55 UTC (rev 3660)
@@ -50,9 +50,12 @@
 	}
 
 	protected void initHandle(Canvas component) throws LWJGLException {
-		nInitHandle(awt_surface.lockAndGetHandle(component), getHandle());
+		// Allow the use of a Core Animation Layer only when using Display.setParent() or AWTGLCanvas and when not in fullscreen
+		final boolean allowCALayer = (Display.getParent() != null || component instanceof AWTGLCanvas) && !Display.isFullscreen();
+		
+		nInitHandle(awt_surface.lockAndGetHandle(component), getHandle(), allowCALayer);
 	}
-	private static native void nInitHandle(ByteBuffer surface_buffer, ByteBuffer peer_info_handle) throws LWJGLException;
+	private static native void nInitHandle(ByteBuffer surface_buffer, ByteBuffer peer_info_handle, boolean allowCALayer) throws LWJGLException;
 
 	protected void doUnlock() throws LWJGLException {
 		awt_surface.unlock();

Modified: trunk/LWJGL/src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c	2011-10-11 21:51:45 UTC (rev 3659)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c	2011-10-11 22:30:55 UTC (rev 3660)
@@ -49,7 +49,7 @@
 }
 
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_AWTSurfaceLock_lockAndInitHandle
-  (JNIEnv *env, jclass clazz, jobject lock_buffer_handle, jobject canvas, jobject display_parent) {
+  (JNIEnv *env, jclass clazz, jobject lock_buffer_handle, jobject canvas, jboolean allowCALayer) {
 	JAWT awt;
 	JAWT_DrawingSurface* ds;
 	JAWT_DrawingSurfaceInfo *dsi;
@@ -58,7 +58,7 @@
     jboolean result = JNI_FALSE;
 	
 	#ifdef __MACH__
-	if (display_parent) {
+	if (allowCALayer) {
         //first try CALAYER
         awt.version = JAWT_VERSION_1_4 | 0x80000000;//JAWT_MACOSX_USE_CALAYER;
         result = JAWT_GetAWT(env, &awt);

Modified: trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
===================================================================
--- trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-10-11 21:51:45 UTC (rev 3659)
+++ trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-10-11 22:30:55 UTC (rev 3660)
@@ -65,56 +65,60 @@
 
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXCanvasPeerInfo_nInitHandle
-(JNIEnv *env, jclass clazz, jobject lock_buffer_handle, jobject peer_info_handle) {
+(JNIEnv *env, jclass clazz, jobject lock_buffer_handle, jobject peer_info_handle, jboolean allowCALayer) {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	
 	MacOSXPeerInfo *peer_info = (MacOSXPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
 	AWTSurfaceLock *surface = (AWTSurfaceLock *)(*env)->GetDirectBufferAddress(env, lock_buffer_handle);
 	JAWT_MacOSXDrawingSurfaceInfo *macosx_dsi = (JAWT_MacOSXDrawingSurfaceInfo *)surface->dsi->platformInfo;
     
-    // check for CALayer support
-    if(surface->awt.version & 0x80000000) { //JAWT_MACOSX_USE_CALAYER) {
-        jint width = surface->dsi->bounds.width;
-        jint height = surface->dsi->bounds.height;
-        
-        if(peer_info->pbuffer == NULL ||
-           width != [peer_info->pbuffer pixelsWide] || height != [peer_info->pbuffer pixelsHigh]) {
-            if(peer_info->pbuffer != NULL) {
-                [peer_info->pbuffer release];
-            }
+    if (allowCALayer) {
+		// check for CALayer support
+		if(surface->awt.version & 0x80000000) { //JAWT_MACOSX_USE_CALAYER) {
+			jint width = surface->dsi->bounds.width;
+			jint height = surface->dsi->bounds.height;
+			
+			if(peer_info->pbuffer == NULL || width != [peer_info->pbuffer pixelsWide] || height != [peer_info->pbuffer pixelsHigh]) {
+				if(peer_info->pbuffer != NULL) {
+					[peer_info->pbuffer release];
+				}
             
-            // make pbuffer
-            NSOpenGLPixelBuffer *pbuffer = nil;
-            NSLog(@"Make pbuffer: %d x %d", width, height);
-            pbuffer = [[NSOpenGLPixelBuffer alloc] initWithTextureTarget:GL_TEXTURE_RECTANGLE_EXT
-                                                   textureInternalFormat:GL_RGBA
-                                                   textureMaxMipMapLevel:0
-                                                              pixelsWide:width
-                                                              pixelsHigh:height];
+				// make pbuffer
+				NSOpenGLPixelBuffer *pbuffer = nil;
+				NSLog(@"Make pbuffer: %d x %d", width, height);
+				pbuffer = [[NSOpenGLPixelBuffer alloc] initWithTextureTarget:GL_TEXTURE_RECTANGLE_EXT
+													   textureInternalFormat:GL_RGBA
+													   textureMaxMipMapLevel:0
+														pixelsWide:width
+														pixelsHigh:height];
             
-            peer_info->pbuffer = pbuffer;
-            peer_info->window = false;
-            peer_info->canDrawGL = true;
-        }
+				peer_info->pbuffer = pbuffer;
+				peer_info->window = false;
+				peer_info->canDrawGL = true;
+			}
         
-        if (macosx_dsi != NULL) {
-            [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
-                // attach the "root layer" to the AWT Canvas surface layers
-                id <JAWT_SurfaceLayers> surfaceLayers = (id <JAWT_SurfaceLayers>)macosx_dsi;//dsi->platformInfo;
-                if(surfaceLayers.layer == NULL) {
-                    PBufferGLLayer *caGLLayer = [[PBufferGLLayer new] autorelease];
-                    caGLLayer.peer_info = peer_info;
-                    caGLLayer.asynchronous = YES;
-                    caGLLayer.needsDisplayOnBoundsChange = YES;
-                    caGLLayer.opaque = YES;
-                    surfaceLayers.layer = caGLLayer;                
-                }
-            }];
-        }
-    } else {
-        peer_info->nsview = macosx_dsi->cocoaViewRef;
-        peer_info->window = true;
-    }
+			if (macosx_dsi != NULL) {
+				[JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+					// attach the "root layer" to the AWT Canvas surface layers
+					id <JAWT_SurfaceLayers> surfaceLayers = (id <JAWT_SurfaceLayers>)macosx_dsi;//dsi->platformInfo;
+					if(surfaceLayers.layer == NULL) {
+						PBufferGLLayer *caGLLayer = [[PBufferGLLayer new] autorelease];
+						caGLLayer.peer_info = peer_info;
+						caGLLayer.asynchronous = YES;
+						caGLLayer.needsDisplayOnBoundsChange = YES;
+						caGLLayer.opaque = YES;
+						surfaceLayers.layer = caGLLayer;                
+					}
+				}];
+			}
+			
+			[pool release];
+			return;
+		}
+	}
+	
+	peer_info->nsview = macosx_dsi->cocoaViewRef;
+    peer_info->window = true;
     
 	[pool release];
 }
@@ -122,9 +126,6 @@
 // rotates a red square when asked to draw
 @implementation PBufferGLLayer
 
-//@synthesize peer_info;
-//@synthesize textureID;
-
 // override to draw custom GL content
 -(void)drawInCGLContext:(CGLContextObj)glContext
 			pixelFormat:(CGLPixelFormatObj)pixelFormat

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3659
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3659&view=rev
Author:   kappa1
Date:     2011-10-11 21:51:45 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Remove the use of Properties from Objective C code to allow binary compatibility on OS X < 10.5

Modified Paths:
--------------
    trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m

Modified: trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
===================================================================
--- trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-10-11 19:24:55 UTC (rev 3658)
+++ trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-10-11 21:51:45 UTC (rev 3659)
@@ -55,8 +55,12 @@
     BOOL canDraw;
 }
 
-@property (nonatomic) MacOSXPeerInfo *peer_info;
-@property (nonatomic) GLuint textureID;
+- (MacOSXPeerInfo*) peer_info;
+- (GLuint) textureID;
+
+- (void) setPeer_info: (MacOSXPeerInfo*)input;
+- (void) setTextureID: (GLuint)input;
+
 @end
 
 
@@ -118,8 +122,8 @@
 // rotates a red square when asked to draw
 @implementation PBufferGLLayer
 
-@synthesize peer_info;
-@synthesize textureID;
+//@synthesize peer_info;
+//@synthesize textureID;
 
 // override to draw custom GL content
 -(void)drawInCGLContext:(CGLContextObj)glContext
@@ -191,4 +195,20 @@
     return peer_info->canDrawGL ? YES : NO;
 }
 
+- (MacOSXPeerInfo*) peer_info {
+    return peer_info;
+}
+
+- (GLuint) textureID {
+    return textureID;
+}
+
+- (void) setPeer_info: (MacOSXPeerInfo*)input {
+    peer_info = input;
+}
+
+- (void) setTextureID: (GLuint)input {
+    textureID = input;
+}
+
 @end
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3658
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3658&view=rev
Author:   matzon
Date:     2011-10-11 19:24:55 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
undoing r3539 to fix issue with fullscreen

Revision Links:
--------------
    http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3539&view=rev

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2011-10-11 17:39:37 UTC (rev 3657)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2011-10-11 19:24:55 UTC (rev 3658)
@@ -259,7 +259,7 @@
 	}
 
 	private static DisplayMode getEffectiveMode() {
-		return !isFullscreen() && parent != null ? (current_mode = new DisplayMode(parent.getWidth(), parent.getHeight())) : current_mode;
+		return !isFullscreen() && parent != null ? new DisplayMode(parent.getWidth(), parent.getHeight()) : current_mode;
 	}
 
 	private static int getWindowX() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3657
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3657&view=rev
Author:   matzon
Date:     2011-10-11 17:39:37 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
bumping version to 2.8.1

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2011-10-11 16:06:23 UTC (rev 3656)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2011-10-11 17:39:37 UTC (rev 3657)
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 				location="doc" />
 	<property name="lwjgl.temp" 				location="temp" />
 	<property name="lwjgl.res" 					location="res" />
-	<property name="lwjgl.version" 				value="2.8.0" />
+	<property name="lwjgl.version" 				value="2.8.1" />
 	<property name="lwjgl.web" 						location="www" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2011-10-11 16:06:23 UTC (rev 3656)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2011-10-11 17:39:37 UTC (rev 3657)
@@ -54,7 +54,7 @@
 	private static final String JNI_LIBRARY_NAME = "lwjgl";
 
 	/** Current version of library */
-	private static final String VERSION = "2.8.0";
+	private static final String VERSION = "2.8.1";
 
 	private static final String POSTFIX64BIT = "64";
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3656
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3656&view=rev
Author:   spasi
Date:     2011-10-11 16:06:23 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Fixed build to include missing OpenGL ES classes on which Display depends.
Excluded desktop OpenGL extensions from the OpenGL ES build.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/platform_build/build-maven.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2011-10-10 10:18:03 UTC (rev 3655)
+++ trunk/LWJGL/build.xml	2011-10-11 16:06:23 UTC (rev 3656)
@@ -132,6 +132,7 @@
 		<!-- Create lwjgl.jar -->
 		<jar destfile="${lwjgl.temp}/jar/lwjgl-debug.jar" taskname="lwjgl-debug.jar">
 			<fileset refid="lwjgl.fileset" />
+			<fileset refid="lwjgl.fileset.dependencies"/>
 			<manifest>
 				<attribute name="Sealed" value="true"/>
 			</manifest>
@@ -143,12 +144,7 @@
 		<!-- Create lwjgl.jar -->
 		<jar destfile="${lwjgl.temp}/jar/lwjgl.jar" taskname="lwjgl.jar">
 			<fileset refid="lwjgl.fileset" />
-			<fileset dir="${lwjgl.bin}"> <!-- Display has a dependency on these -->
-				<patternset>
-					<include name="org/lwjgl/opengles/ContextAttribs.*"/>
-					<include name="org/lwjgl/opengles/PixelFormat.*"/>
-				</patternset>
-			</fileset>
+			<fileset refid="lwjgl.fileset.dependencies"/>
 			<manifest>
 				<attribute name="Sealed" value="true"/>
 			</manifest>
@@ -177,9 +173,40 @@
 
 	<!-- Packages the java files for the ES build -->
 	<target name="-createjars_es">
+		<!-- ================================================================== -->
+		<!-- Generate a list of the OpenGL extension classes					-->
+		<!-- ================================================================== -->
+		<fileset id="opengl-template-fileset" dir="${lwjgl.src}/generated" includes="${opengl-template-pattern}"/>
+		<property name="opengl-template-files" refid="opengl-template-fileset"/>
+
+		<tempfile property="temp.file"/>
+		<echo file="${temp.file}" message="${opengl-template-files}" taskname=""/>
+
+		<loadfile srcfile="${temp.file}" property="opengl-template-classes">
+			<filterchain>
+				<tokenfilter delimoutput=",">
+					<stringtokenizer delims=";"/>
+					<replaceregex pattern="org\${file.separator}lwjgl\${file.separator}opengl\${file.separator}(.+)[.]java"
+					              replace="org/lwjgl/opengl/\1.class"/>
+				</tokenfilter>
+			</filterchain>
+		</loadfile>
+
+		<delete file="${temp.file}" />
+
 		<!-- Create lwjgl.jar -->
 		<jar destfile="${lwjgl.temp}/jar/lwjgl.jar" taskname="lwjgl.jar">
-			<fileset refid="lwjgl_es.fileset"/>
+			<!-- Files to include in the lwjgl.jar file, for the ES build -->
+			<fileset dir="${lwjgl.bin}" excludes="${opengl-template-classes}">
+				<patternset id="lwjgl_es.package.pattern">
+					<include name="org/**/*"/>
+					<exclude name="org/lwjgl/d3d/**"/>
+					<exclude name="org/lwjgl/test/**"/>
+					<exclude name="org/lwjgl/util/**"/>
+					<exclude name="org/lwjgl/examples/**"/>
+				</patternset>
+			</fileset>
+
 			<manifest>
 				<attribute name="Sealed" value="true"/>
 			</manifest>

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2011-10-10 10:18:03 UTC (rev 3655)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2011-10-11 16:06:23 UTC (rev 3656)
@@ -35,15 +35,10 @@
 			<exclude name="org/lwjgl/examples/**" />
 		</patternset>
 	</fileset>
-
-	<!-- Files to include in the lwjgl.jar file, for the ES build -->
-	<fileset id="lwjgl_es.fileset" dir="${lwjgl.bin}">
-		<patternset id="lwjgl_es.package.pattern">
-			<include name="org/**/*"/>
-			<exclude name="org/lwjgl/d3d/**"/>
-			<exclude name="org/lwjgl/test/**"/>
-			<exclude name="org/lwjgl/util/**"/>
-			<exclude name="org/lwjgl/examples/**"/>
+	<fileset id="lwjgl.fileset.dependencies" dir="${lwjgl.bin}">
+		<patternset id="lwjgl.package.dependencies.pattern">
+			<include name="org/lwjgl/opengles/ContextAttribs*.*"/>
+			<include name="org/lwjgl/opengles/PixelFormat*.*"/>
 		</patternset>
 	</fileset>
 

Modified: trunk/LWJGL/platform_build/build-maven.xml
===================================================================
--- trunk/LWJGL/platform_build/build-maven.xml	2011-10-10 10:18:03 UTC (rev 3655)
+++ trunk/LWJGL/platform_build/build-maven.xml	2011-10-11 16:06:23 UTC (rev 3656)
@@ -8,6 +8,7 @@
 	
 	<fileset id="lwjgl-sources.manual.fileset" dir="${lwjgl.src.java}">
 		<patternset refid="lwjgl.package.pattern" />
+		<patternset refid="lwjgl.package.dependencies.pattern"/>
 	</fileset>
 
 	<fileset id="lwjgl-sources.generated.fileset" dir="${lwjgl.src.generated}">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.