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

Brought to you by: kappa1, matzon, spasi

java-game-lib-cvs — Commits to the repository will be send to this list.

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (134)	Sep (52)	Oct (13)	Nov (342)	Dec (163)
2003	Jan (44)	Feb (62)	Mar (158)	Apr (38)	May (70)	Jun (58)	Jul (104)	Aug (207)	Sep (83)	Oct (122)	Nov (23)	Dec (49)
2004	Jan (119)	Feb (132)	Mar (192)	Apr (140)	May (77)	Jun (74)	Jul (201)	Aug (63)	Sep (102)	Oct (70)	Nov (173)	Dec (78)
2005	Jan (174)	Feb (197)	Mar (105)	Apr (59)	May (77)	Jun (43)	Jul (21)	Aug (18)	Sep (47)	Oct (37)	Nov (74)	Dec (50)
2006	Jan (44)	Feb (19)	Mar (32)	Apr (24)	May (31)	Jun (55)	Jul (138)	Aug (28)	Sep (12)	Oct (41)	Nov (58)	Dec (24)
2007	Jan (28)	Feb (14)	Mar (10)	Apr (68)	May (30)	Jun (26)	Jul (18)	Aug (63)	Sep (19)	Oct (29)	Nov (20)	Dec (10)
2008	Jan (38)	Feb (7)	Mar (37)	Apr (120)	May (41)	Jun (36)	Jul (39)	Aug (24)	Sep (28)	Oct (30)	Nov (36)	Dec (75)
2009	Jan (46)	Feb (22)	Mar (50)	Apr (70)	May (134)	Jun (105)	Jul (75)	Aug (34)	Sep (38)	Oct (34)	Nov (19)	Dec (20)
2010	Jan (11)	Feb (20)	Mar (65)	Apr (83)	May (104)	Jun (73)	Jul (78)	Aug (57)	Sep (43)	Oct (35)	Nov (9)	Dec (4)
2011	Jan (21)	Feb (11)	Mar (18)	Apr (10)	May (18)	Jun (15)	Jul (48)	Aug (25)	Sep (17)	Oct (45)	Nov (15)	Dec (12)
2012	Jan (21)	Feb (9)	Mar (12)	Apr (9)	May (9)	Jun (5)	Jul (1)	Aug (10)	Sep (12)	Oct (1)	Nov (28)	Dec (5)
2013	Jan (4)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb (1)	Mar (1)	Apr	May (2)	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2015	Jan (1)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov	Dec
2016	Jan (2)	Feb (1)	Mar (1)	Apr (1)	May (2)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
				1	2	3 (6)
4	5 (1)	6	7 (2)	8 (1)	9	10
11	12	13	14	15 (1)	16	17
18	19	20 (1)	21	22	23	24
25 (1)	26 (1)	27 (1)	28	29 (1)	30 (1)

Flat | Threaded

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3644] trunk/LWJGL/src/templates/org/lwjgl/opengl /GL32.java

From: <sp...@us...> - 2011-09-30 11:28:59

Revision: 3644
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3644&view=rev
Author:   spasi
Date:     2011-09-30 11:28:53 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
Removed GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT.

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

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2011-09-29 08:36:36 UTC (rev 3643)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2011-09-30 11:28:53 UTC (rev 3644)
@@ -244,7 +244,6 @@
 
 	/** Returned by CheckFramebufferStatusEXT: */
 	int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS = 0x8DA8;
-	int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT = 0x8DA9;
 
 	/**
 	 * Accepted by the &lt;pname&gt; parameter of GetFramebufferAttachment-

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3643] trunk/LWJGL

From: <sp...@us...> - 2011-09-29 08:36:42

Revision: 3643
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3643&view=rev
Author:   spasi
Date:     2011-09-29 08:36:36 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Added support for INTEL_immediate_execution.

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

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opencl/INTEL_immediate_execution.java

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2011-09-27 22:38:32 UTC (rev 3642)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2011-09-29 08:36:36 UTC (rev 3643)
@@ -17,7 +17,7 @@
 
 	<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"/>
 	<property name="opengles-template-pattern" value="org/lwjgl/opengles/GLES*.java,org/lwjgl/opengles/ARB*.java,org/lwjgl/opengles/EXT*.java,org/lwjgl/opengles/AMD*.java,org/lwjgl/opengles/ANGLE*.java,org/lwjgl/opengles/APPLE*.java,org/lwjgl/opengles/ARM*.java,org/lwjgl/opengles/DMP*.java,org/lwjgl/opengles/IMG*.java,org/lwjgl/opengles/NV*.java,org/lwjgl/opengles/OES*.java,org/lwjgl/opengles/QCOM*.java,org/lwjgl/opengles/VIV*.java"/>
-    <property name="opencl-template-pattern-extensions" value="org/lwjgl/opencl/KHR*.java,org/lwjgl/opencl/EXT*.java,org/lwjgl/opencl/APPLE*.java,org/lwjgl/opencl/AMD*.java,org/lwjgl/opencl/NV*.java"/>
+    <property name="opencl-template-pattern-extensions" value="org/lwjgl/opencl/KHR*.java,org/lwjgl/opencl/EXT*.java,org/lwjgl/opencl/APPLE*.java,org/lwjgl/opencl/AMD*.java,org/lwjgl/opencl/INTEL*.java,org/lwjgl/opencl/NV*.java"/>
     <property name="opencl-template-pattern" value="org/lwjgl/opencl/CL*.java,${opencl-template-pattern-extensions}"/>
 
 	<!-- ================================================================== -->

Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/INTEL_immediate_execution.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/INTEL_immediate_execution.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/INTEL_immediate_execution.java	2011-09-29 08:36:36 UTC (rev 3643)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface INTEL_immediate_execution {
+
+	// TODO: Update when spec is released publicly.
+
+	/** cl_command_queue_properties - bitfield */
+    int CL_QUEUE_IMMEDIATE_EXECUTION_ENABLE_INTEL = (1 << 2);
+
+    /** cl_device_exec_capabilities - bitfield */
+    int CL_EXEC_IMMEDIATE_EXECUTION_INTEL = (1 << 2);
+
+}
\ No newline at end of file

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3642] trunk/LWJGL/src/java/org/lwjgl/opengl/ LinuxDisplay.java

From: <ka...@us...> - 2011-09-27 22:38:39

Revision: 3642
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3642&view=rev
Author:   kappa1
Date:     2011-09-27 22:38:32 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
LinuxDisplay use proper constant name (X_SetInputFocus) for xembedded fix

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2011-09-26 20:03:59 UTC (rev 3641)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2011-09-27 22:38:32 UTC (rev 3642)
@@ -85,6 +85,8 @@
 	private static final int SetModeInsert = 0;
 	private static final int SaveSetRoot = 1;
 	private static final int SaveSetUnmap = 1;
+	
+	private static final int X_SetInputFocus = 42;
 
 	/** Window mode enum */
 	private static final int FULLSCREEN_LEGACY = 1;
@@ -299,7 +301,7 @@
 	private static native void synchronize(long display, boolean synchronize);
 
 	private static int globalErrorHandler(long display, long event_ptr, long error_display, long serial, long error_code, long request_code, long minor_code) throws LWJGLException {
-		if (xembedded && request_code == 42) return 0; // ignore X error in xembeded mode to fix a browser issue when dragging or switching tabs 
+		if (xembedded && request_code == X_SetInputFocus) return 0; // ignore X error in xembeded mode to fix a browser issue when dragging or switching tabs 
 		
 		if (display == getDisplay()) {
 			String error_msg = getErrorText(display, error_code);

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3641] trunk/LWJGL/src/java/org/lwjgl/opengl/ LinuxDisplay.java

From: <ka...@us...> - 2011-09-26 20:04:06

Revision: 3641
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3641&view=rev
Author:   kappa1
Date:     2011-09-26 20:03:59 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
limit scope of fix for Display.setParent when running in xembedded mode.

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2011-09-25 21:57:49 UTC (rev 3640)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2011-09-26 20:03:59 UTC (rev 3641)
@@ -299,7 +299,7 @@
 	private static native void synchronize(long display, boolean synchronize);
 
 	private static int globalErrorHandler(long display, long event_ptr, long error_display, long serial, long error_code, long request_code, long minor_code) throws LWJGLException {
-		if (xembedded) return 0; // ignore X errors in xembeded mode to fix browser issues like dragging or switching tabs 
+		if (xembedded && request_code == 42) return 0; // ignore X error in xembeded mode to fix a browser issue when dragging or switching tabs 
 		
 		if (display == getDisplay()) {
 			String error_msg = getErrorText(display, error_code);

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3640] trunk/LWJGL/src/java/org/lwjgl/opengl/ LinuxDisplay.java

From: <ka...@us...> - 2011-09-25 21:57:55

Revision: 3640
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3640&view=rev
Author:   kappa1
Date:     2011-09-25 21:57:49 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
Fix issues with LWJGL Applets when dragging or switching browser tabs

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2011-09-20 19:46:33 UTC (rev 3639)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2011-09-25 21:57:49 UTC (rev 3640)
@@ -142,7 +142,7 @@
 
 	private Canvas parent;
 	private long parent_window;
-	private boolean xembedded;
+	private static boolean xembedded;
 	private long parent_proxy_focus_window;
 	private boolean parent_focused;
 	private long last_window_focus = 0;
@@ -299,6 +299,8 @@
 	private static native void synchronize(long display, boolean synchronize);
 
 	private static int globalErrorHandler(long display, long event_ptr, long error_display, long serial, long error_code, long request_code, long minor_code) throws LWJGLException {
+		if (xembedded) return 0; // ignore X errors in xembeded mode to fix browser issues like dragging or switching tabs 
+		
 		if (display == getDisplay()) {
 			String error_msg = getErrorText(display, error_code);
 			throw new LWJGLException("X Error - disp: 0x" + Long.toHexString(error_display) + " serial: " + serial + " error: " + error_msg + " request_code: " + request_code + " minor_code: " + minor_code);
@@ -924,12 +926,6 @@
 		if (xembedded) {
 			long current_focus_window = 0;
 
-			try {
-				current_focus_window = nGetInputFocus(getDisplay());
-			} catch (LWJGLException e) {
-				return; // fail silently as it can fail whilst splitting browser tabs
-			}
-
 			if (last_window_focus != current_focus_window || parent_focused != focused) {
 				if (isParentWindowActive(current_focus_window)) {
 					if (parent_focused) {

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3639] trunk/LWJGL/src/native/linux/ org_lwjgl_opengl_LinuxKeyboard.c

From: <ka...@us...> - 2011-09-20 19:46:39

Revision: 3639
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3639&view=rev
Author:   kappa1
Date:     2011-09-20 19:46:33 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
fix for keyboard input not working on linux when an input method is set (like ibus).

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxKeyboard.c

Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxKeyboard.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxKeyboard.c	2011-09-15 17:22:43 UTC (rev 3638)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxKeyboard.c	2011-09-20 19:46:33 UTC (rev 3639)
@@ -84,6 +84,7 @@
 
 JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_LinuxKeyboard_openIM(JNIEnv *env, jclass unused, jlong display_ptr) {
 	Display *disp = (Display *)(intptr_t)display_ptr;
+	XSetLocaleModifiers ("@im=none");
 	XIM xim = XOpenIM(disp, NULL, NULL, NULL);
 	return (intptr_t)xim;
 }

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3638] trunk/LWJGL/src/native/macosx/context.m

From: <sp...@us...> - 2011-09-15 17:22:49

Revision: 3638
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3638&view=rev
Author:   spasi
Date:     2011-09-15 17:22:43 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Fix for GL32 support on MacOSX 10.7+.

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

Modified: trunk/LWJGL/src/native/macosx/context.m
===================================================================
--- trunk/LWJGL/src/native/macosx/context.m	2011-09-08 21:35:54 UTC (rev 3637)
+++ trunk/LWJGL/src/native/macosx/context.m	2011-09-15 17:22:43 UTC (rev 3638)
@@ -128,11 +128,12 @@
 	if (gl32) {
 		putAttrib(&attribs, 99); // NSOpenGLPFAOpenGLProfile
 		putAttrib(&attribs, 0x3200); // NSOpenGLProfileVersion3_2Core
+	} else {
+		if (support_window)
+			putAttrib(&attribs, NSOpenGLPFAWindow);
+		if (support_pbuffer)
+			putAttrib(&attribs, NSOpenGLPFAPixelBuffer);
 	}
-	if (support_window)
-		putAttrib(&attribs, NSOpenGLPFAWindow);
-	if (support_pbuffer)
-		putAttrib(&attribs, NSOpenGLPFAPixelBuffer);
 	if (stereo)
 		putAttrib(&attribs, NSOpenGLPFAStereo);
 	if (floating_point)

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3637] trunk/LWJGL

From: <ma...@us...> - 2011-09-08 21:36:01

Revision: 3637
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3637&view=rev
Author:   matzon
Date:     2011-09-08 21:35:54 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
applied maven patch by ruben01

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

Removed Paths:
-------------
    trunk/LWJGL/maven/jinput-platform.pom
    trunk/LWJGL/maven/jinput.pom

Modified: trunk/LWJGL/maven/build.xml
===================================================================
--- trunk/LWJGL/maven/build.xml	2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/maven/build.xml	2011-09-08 21:35:54 UTC (rev 3637)
@@ -4,198 +4,240 @@
 	<property name="mavenrepoId"		value="tmprepoid" />
 	
 	<target name="install">
-		<antcall target="execute">
+		<antcall target="execute-install">
 			<param name="mvncommand" value="org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file"/>
 		</antcall>
 	</target>
 	
+	
 	<target name="deploy">
 		<antcall target="execute">
-			<param name="mvncommand" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
+			<param name="mvncommand" value="org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy-file"/>
 		</antcall>
 	</target>
 	
+	<target name="deploy-gpg">
+		<antcall target="execute">
+			<param name="mvncommand" value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file"/>
+		</antcall>
+	</target>
+	
+	
+	
 	<target name="execute">
+			
+			<!-- parent.pom -->
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl-parent.pom" />
+				<arg value="-Dfile=lwjgl-parent.pom" />
+	            <arg value="-Plwjglgpg" />
+	        </artifact:mvn>  
+	            
+	        <!-- lwjgl.jar -->    
+	        
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl.pom" />
+				<arg value="-Dfile=lwjgl.jar" />
+				<arg value="-Dtypes=jar,jar" />
+				<arg value="-Dclassifiers=sources,javadoc" />
+				<arg value="-Dfiles=lwjgl-sources.jar,lwjgl-javadoc.jar" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			
+			<!-- lwjgl natives -->    
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl-platform.pom" />
+				<arg value="-Dfile=lwjgl-platform-natives-windows.jar" />
+				<arg value="-Dclassifier=natives-windows" />
+				<arg value="-Dtypes=jar,jar" />
+				<arg value="-Dclassifiers=natives-linux,natives-osx" />
+				<arg value="-Dfiles=lwjgl-platform-natives-linux.jar,lwjgl-platform-natives-osx.jar" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			
+			<!-- lwjgl_util.jar -->    
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl_util.pom" />
+				<arg value="-Dfile=lwjgl_util.jar" />
+				<arg value="-Dtypes=jar,jar" />
+				<arg value="-Dclassifiers=sources,javadoc" />
+				<arg value="-Dfiles=lwjgl_util-sources.jar,lwjgl_util-javadoc.jar" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<!-- lwjgl_util_applet.jar -->    
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl_util_applet.pom" />
+				<arg value="-Dfile=lwjgl_util_applet.jar" />
+				<arg value="-Dtypes=jar,jar" />
+				<arg value="-Dclassifiers=sources,javadoc" />
+				<arg value="-Dfiles=lwjgl_util_applet-sources.jar,lwjgl_util_applet-javadoc.jar" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+		</target>
+	
+	
+	<target name="execute-install">
+			
+			<!-- parent.pom -->
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl-parent.pom" />
+				<arg value="-Dfile=lwjgl-parent.pom" />
+	            <arg value="-Plwjglgpg" />
+	        </artifact:mvn>  
+	            
+	        <!-- lwjgl.jar -->    
+	        
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl.pom" />
+				<arg value="-Dfile=lwjgl.jar" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl.pom" />
+				<arg value="-Dfile=lwjgl-sources.jar" />
+				<arg value="-Dclassifier=sources" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl.pom" />
+				<arg value="-Dfile=lwjgl-javadoc.jar" />
+				<arg value="-Dclassifier=javadoc" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<!-- lwjgl natives -->    
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl-platform.pom" />
+				<arg value="-Dfile=lwjgl-platform-natives-windows.jar" />
+				<arg value="-Dclassifier=natives-windows" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl-platform.pom" />
+				<arg value="-Dfile=lwjgl-platform-natives-linux.jar" />
+				<arg value="-Dclassifier=natives-linux" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl-platform.pom" />
+				<arg value="-Dfile=lwjgl-platform-natives-osx.jar" />
+				<arg value="-Dclassifier=natives-osx" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<!-- lwjgl_util.jar -->    
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl_util.pom" />
+				<arg value="-Dfile=lwjgl_util.jar" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl_util.pom" />
+				<arg value="-Dfile=lwjgl_util-sources.jar" />
+				<arg value="-Dclassifier=sources" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl_util.pom" />
+				<arg value="-Dfile=lwjgl_util-javadoc.jar" />
+				<arg value="-Dclassifier=javadoc" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<!-- lwjgl_util_applet.jar -->    
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl_util_applet.pom" />
+				<arg value="-Dfile=lwjgl_util_applet.jar" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl_util_applet.pom" />
+				<arg value="-Dfile=lwjgl_util_applet-sources.jar" />
+				<arg value="-Dclassifier=sources" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+			
+			<artifact:mvn>
+				<arg value="${mvncommand}" />
+				<arg value="-Durl=${mavenrepo}" />
+				<arg value="-DrepositoryId=${mavenrepoId}" />
+				<arg value="-DpomFile=lwjgl_util_applet.pom" />
+				<arg value="-Dfile=lwjgl_util_applet-javadoc.jar" />
+				<arg value="-Dclassifier=javadoc" />
+	            <arg value="-Plwjglgpg" />
+			</artifact:mvn>
+		</target>
 		
-		<!-- parent.pom -->
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl-parent.pom" />
-			<arg value="-Dfile=lwjgl-parent.pom" />
-            <arg value="-Plwjglgpg" />
-        </artifact:mvn>  
-            
-        <!-- lwjgl.jar -->    
-        
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl.pom" />
-			<arg value="-Dfile=lwjgl.jar" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl.pom" />
-			<arg value="-Dfile=lwjgl-sources.jar" />
-			<arg value="-Dclassifier=sources" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl.pom" />
-			<arg value="-Dfile=lwjgl-javadoc.jar" />
-			<arg value="-Dclassifier=javadoc" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<!-- lwjgl natives -->    
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl-platform.pom" />
-			<arg value="-Dfile=lwjgl-platform-natives-win.jar" />
-			<arg value="-Dclassifier=natives-win" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl-platform.pom" />
-			<arg value="-Dfile=lwjgl-platform-natives-linux.jar" />
-			<arg value="-Dclassifier=natives-linux" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl-platform.pom" />
-			<arg value="-Dfile=lwjgl-platform-natives-mac.jar" />
-			<arg value="-Dclassifier=natives-mac" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<!-- lwjgl_util.jar -->    
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl_util.pom" />
-			<arg value="-Dfile=lwjgl_util.jar" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl_util.pom" />
-			<arg value="-Dfile=lwjgl_util-sources.jar" />
-			<arg value="-Dclassifier=sources" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl_util.pom" />
-			<arg value="-Dfile=lwjgl_util-javadoc.jar" />
-			<arg value="-Dclassifier=javadoc" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<!-- lwjgl_util_applet.jar -->    
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl_util_applet.pom" />
-			<arg value="-Dfile=lwjgl_util_applet.jar" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl_util.pom" />
-			<arg value="-Dfile=lwjgl_util_applet-sources.jar" />
-			<arg value="-Dclassifier=sources" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=lwjgl_util.pom" />
-			<arg value="-Dfile=lwjgl_util_applet-javadoc.jar" />
-			<arg value="-Dclassifier=javadoc" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<!-- jinput.jar -->    
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=jinput.pom" />
-			<arg value="-Dfile=jinput.jar" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<!-- jinput natives -->    
-				
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=jinput-platform.pom" />
-			<arg value="-Dfile=jinput-platform-natives-win.jar" />
-			<arg value="-Dclassifier=natives-win" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=jinput-platform.pom" />
-			<arg value="-Dfile=jinput-platform-natives-linux.jar" />
-			<arg value="-Dclassifier=natives-linux" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-		<artifact:mvn>
-			<arg value="${mvncommand}" />
-			<arg value="-Durl=${mavenrepo}" />
-			<arg value="-DrepositoryId=${mavenrepoId}" />
-			<arg value="-DpomFile=jinput-platform.pom" />
-			<arg value="-Dfile=jinput-platform-natives-mac.jar" />
-			<arg value="-Dclassifier=natives-mac" />
-            <arg value="-Plwjglgpg" />
-		</artifact:mvn>
-		
-	</target>
 	
-</project>
\ No newline at end of file
+	
+</project>

Deleted: trunk/LWJGL/maven/jinput-platform.pom
===================================================================
--- trunk/LWJGL/maven/jinput-platform.pom	2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/maven/jinput-platform.pom	2011-09-08 21:35:54 UTC (rev 3637)
@@ -1,32 +0,0 @@
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.lwjgl.lwjgl</groupId>
-		<artifactId>parent</artifactId>
-		<version>@VERSION@</version>
-	</parent>
-	<groupId>org.lwjgl.lwjgl</groupId>
-	<artifactId>jinput-platform</artifactId>
-	<packaging>jar</packaging>
-	<name>JInput - Java Game Controller API</name>
-	<version>@VERSION@</version>
-	<description>JInput - Java Game Controller API</description>
-	<url>http://java.net/projects/jinput</url>
-	<licenses>
-		<license>
-			<name>BSD</name>
-			<url>http://www.opensource.org/licenses/bsd-license.php</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-			<id>Members</id>
-			<url>http://java.net/projects/jinput/members</url>
-		</developer>
-	</developers>
-	<scm>
-		<url>http://java.net/projects/jinput/sources/svn/show</url>
-		<connection>https://svn.java.net/svn/jinput~svn </connection>
-	</scm>
-</project>

Deleted: trunk/LWJGL/maven/jinput.pom
===================================================================
--- trunk/LWJGL/maven/jinput.pom	2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/maven/jinput.pom	2011-09-08 21:35:54 UTC (rev 3637)
@@ -1,52 +0,0 @@
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.lwjgl.lwjgl</groupId>
-		<artifactId>parent</artifactId>
-		<version>@VERSION@</version>
-	</parent>
-	<groupId>org.lwjgl.lwjgl</groupId>
-	<artifactId>jinput</artifactId>
-	<packaging>jar</packaging>
-	<name>JInput - Java Game Controller API</name>
-	<version>@VERSION@</version>
-	<description>JInput - Java Game Controller API</description>
-	<url>http://java.net/projects/jinput</url>
-	<licenses>
-		<license>
-			<name>BSD</name>
-			<url>http://www.opensource.org/licenses/bsd-license.php</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-			<id>Members</id>
-			<url>http://java.net/projects/jinput/members</url>
-		</developer>
-	</developers>
-	<scm>
-		<url>http://java.net/projects/jinput/sources/svn/show</url>
-		<connection>https://svn.java.net/svn/jinput~svn </connection>
-	</scm>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>jinput-platform</artifactId>
-			<version>${project.version}</version>
-			<classifier>natives-win</classifier>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>jinput-platform</artifactId>
-			<version>${project.version}</version>
-			<classifier>natives-linux</classifier>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>jinput-platform</artifactId>
-			<version>${project.version}</version>
-			<classifier>natives-mac</classifier>
-		</dependency>
-	</dependencies>
-</project>

Modified: trunk/LWJGL/maven/lwjgl.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl.pom	2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/maven/lwjgl.pom	2011-09-08 21:35:54 UTC (rev 3637)
@@ -22,7 +22,7 @@
 			<groupId>${project.groupId}</groupId>
 			<artifactId>lwjgl-platform</artifactId>
 			<version>${project.version}</version>
-			<classifier>natives-win</classifier>
+			<classifier>natives-windows</classifier>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -34,12 +34,12 @@
 			<groupId>${project.groupId}</groupId>
 			<artifactId>lwjgl-platform</artifactId>
 			<version>${project.version}</version>
-			<classifier>natives-mac</classifier>
+			<classifier>natives-osx</classifier>
 		</dependency>
 		<dependency>
-			<groupId>${project.groupId}</groupId>
+			<groupId>net.java.jinput</groupId>
 			<artifactId>jinput</artifactId>
-			<version>${project.version}</version>
+			<version>@JINPUTVERSION@</version>
 		</dependency>
 	</dependencies>
 </project>

Modified: trunk/LWJGL/platform_build/build-maven.xml
===================================================================
--- trunk/LWJGL/platform_build/build-maven.xml	2011-09-07 21:28:01 UTC (rev 3636)
+++ trunk/LWJGL/platform_build/build-maven.xml	2011-09-08 21:35:54 UTC (rev 3637)
@@ -4,6 +4,7 @@
 	<property name="lwjgl.maven"			location="maven" />
 	<property name="lwjgl.dstMaven"			location="${lwjgl.temp}/maven" />
 	<property name="lwjgl.src.java" 		location="${lwjgl.src}/java" />
+	<property name="jinput.version"			value="2.0.5" />
 	
 	<fileset id="lwjgl-sources.manual.fileset" dir="${lwjgl.src.java}">
 		<patternset refid="lwjgl.package.pattern" />
@@ -36,6 +37,32 @@
 			]]>
 		</script>
 	</target>
+	
+	<target name="-checkjinputversion">
+			<script language="javascript" classpath="${lwjgl.lib}/jinput.jar">
+			<![CDATA[
+			importPackage(java.lang);
+			var version =  net.java.games.input.Version.getVersion()
+			project.setNewProperty("jinputversion",version);
+			var declaredJinputVersion = project.getProperty("jinput.version");
+			System.out.println("JINPUT Version: " + version + " - DeclaredVersion: " + declaredJinputVersion);
+				
+			if(declaredJinputVersion.equals(version)){
+				System.out.println("JINPUT Version Matches");
+				project.setNewProperty("jinputversionmatches", true);
+			} else {
+				System.out.println("JINPUT Version don't match");
+			}
+			]]>
+			</script>
+			<condition property="failjinputcheck">
+				<and>
+					<not><isset property="jinputversionmatches" /></not>
+					<not><isset property="overridejinput" /></not>
+				</and>
+			</condition>
+			<fail  if="failjinputcheck" message="Jinput version in project is different from the declared jinput version for maven add -Doverridejinput=true as a command line option to avoid this check" />
+		</target>
 
 	<target name="maven-full">
 		<antcall target="clean-java" />
@@ -47,7 +74,7 @@
         <antcall target="maven"/>
 	</target>
 	
-	<target name="maven" depends="-fixmavenversion"> <!-- Added as dependency because using antcall creates a new project scope -->
+	<target name="maven" depends="-fixmavenversion, -checkjinputversion"> <!-- Added as dependency because using antcall creates a new project scope -->
 		<delete dir="${lwjgl.dstMaven}" quiet="true" failonerror="false" taskname="cleaning maven dist" />
 		<mkdir dir="${lwjgl.dstMaven}"   taskname="initialiazing temp maven folder" />
 		<antcall target="-copylwjgljars" />
@@ -56,9 +83,14 @@
 		<antcall target="-createmavennativejars" />
 		<antcall target="-copymavenpoms"/>
 		<antcall target="-copymavendeploybuild"/>
-		<antcall target="-addjinput"/>
 		<antcall target="-copymaventdist"/>
 	</target>
+	
+	
+		
+	
+	
+	
 
 
 	<target name="-copylwjgljars">
@@ -127,7 +159,7 @@
 	</target>
 	
 	<target name="-createmavennativejars">
-		<jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-win.jar" taskname="lwjgl-platform-natives-win.jar">
+		<jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-windows.jar" taskname="lwjgl-platform-natives-windows.jar">
 			<fileset dir="${lwjgl.lib}/windows">
 				<patternset refid="lwjgl-windows-lwjgl.fileset"/>
 			</fileset>
@@ -137,7 +169,7 @@
 				<patternset refid="lwjgl-linux-lwjgl.fileset"/>
 			</fileset>
 		</jar>
-		<jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-mac.jar" taskname="lwjgl-platform-natives-mac.jar">
+		<jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-osx.jar" taskname="lwjgl-platform-natives-osx.jar">
 			<fileset dir="${lwjgl.lib}/macosx">
 				<patternset refid="lwjgl-macosx-lwjgl.fileset"/>
 			</fileset>
@@ -151,6 +183,7 @@
 			</fileset>
 			<filterset>
       			<filter token="VERSION" value="${lwjgl-maven-version}"/>
+				<filter token="JINPUTVERSION" value="${jinput.version}"/>
     		</filterset>	
 		</copy>
 	</target>
@@ -163,43 +196,6 @@
 		</copy>
 	</target>
 	
-	<!-- JINPUT -->
-	<target name="-addjinput">
-		<antcall target="-copyjinputjar" />
-		<antcall target="-createmavennativejinputjars" />
-	</target>
-	
-	<target name="-copyjinputjar">
-		<copy todir="${lwjgl.dstMaven}">
-			<fileset dir="${lwjgl.lib}">
-				<patternset>
-					<include name="jinput.jar" />
-				</patternset>
-			</fileset>
-		</copy>
-	</target>
-	
-	
-	<target name="-createmavennativejinputjars">
-		<jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-win.jar" taskname="jinput-platform-natives-win.jar">
-			<fileset dir="${lwjgl.lib}/windows">
-				<patternset refid="lwjgl-windows-jinput.fileset"/>
-			</fileset>
-		</jar>
-		<jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-linux.jar" taskname="jinput-platform-natives-linux.jar">
-			<fileset dir="${lwjgl.lib}/linux">
-				<patternset refid="lwjgl-linux-jinput.fileset"/>
-			</fileset>
-		</jar>
-		<jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-mac.jar" taskname="jinput-platform-natives-mac.jar">
-			<fileset dir="${lwjgl.lib}/macosx">
-				<patternset refid="lwjgl-macosx-jinput.fileset"/>
-			</fileset>
-		</jar>
-	</target>
-	
-	<!-- END JINPUT -->
-
 	<target name="-copymaventdist">
 		<zip destfile="${lwjgl.dist}/lwjgl-maven-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="maven/**" />
 	</target>

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3636] trunk/LWJGL/src/java/org/lwjgl/ MacOSXSysImplementation.java

From: <ka...@us...> - 2011-09-07 21:28:07

Revision: 3636
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3636&view=rev
Author:   kappa1
Date:     2011-09-07 21:28:01 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
bump mac native version

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

Modified: trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2011-09-07 18:28:19 UTC (rev 3635)
+++ trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2011-09-07 21:28:01 UTC (rev 3636)
@@ -42,7 +42,7 @@
  * $Id$
  */
 final class MacOSXSysImplementation extends J2SESysImplementation {
-	private static final int JNI_VERSION = 19;
+	private static final int JNI_VERSION = 20;
 
 	static {
 		// Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3635] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-09-07 18:28:25

Revision: 3635
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3635&view=rev
Author:   kappa1
Date:     2011-09-07 18:28:19 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Minor tweak to appletloader as an attempt to get nightly build server to build natives again.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-09-05 08:44:48 UTC (rev 3634)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-09-07 18:28:19 UTC (rev 3635)
@@ -899,10 +899,8 @@
 	            }
 			});
 			
-		} catch (AccessControlException ace) {
-			certificateRefused = true;
-			fatalErrorOccured(ace.getMessage(), ace);
 		} catch (Exception e) {
+			certificateRefused = e instanceof AccessControlException;
 			fatalErrorOccured("This occurred while '" + getDescriptionForState() + "'", e);
 		} finally {
 			loaderThread = null;

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3634] trunk/LWJGL/src/java/org/lwjgl/opengl/ MacOSXPeerInfo.java

From: <sp...@us...> - 2011-09-05 08:44:54

Revision: 3634
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3634&view=rev
Author:   spasi
Date:     2011-09-05 08:44:48 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
Added null check on ContextAttribs.

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPeerInfo.java	2011-09-03 19:08:27 UTC (rev 3633)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPeerInfo.java	2011-09-05 08:44:48 UTC (rev 3634)
@@ -48,7 +48,7 @@
 		if (pixel_format.isFloatingPoint() && !LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 4))
 			throw new LWJGLException("Floating point pixel format requested, but it requires MacOS X 10.4 or newer");
 
-		boolean gl32 = attribs.getMajorVersion() == 3 && attribs.getMinorVersion() == 2 && attribs.isProfileCore();
+		boolean gl32 = attribs != null && attribs.getMajorVersion() == 3 && attribs.getMinorVersion() == 2 && attribs.isProfileCore();
 		if ( gl32 && !LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 7) )
 			throw new LWJGLException("OpenGL 3.2 requested, but it requires MacOS X 10.7 or newer");
 

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3633] trunk/LWJGL/src/java/org/lwjgl/opengl/ AWTGLCanvas.java

From: <sp...@us...> - 2011-09-03 19:08:33

Revision: 3633
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3633&view=rev
Author:   spasi
Date:     2011-09-03 19:08:27 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
Added missing DrawableLWJGL method.

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2011-09-03 18:52:45 UTC (rev 3632)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2011-09-03 19:08:27 UTC (rev 3633)
@@ -107,6 +107,10 @@
 		}
 	}
 
+	public void setPixelFormat(final PixelFormatLWJGL pf) throws LWJGLException {
+		throw new UnsupportedOperationException();
+	}
+
 	public void setPixelFormat(final PixelFormatLWJGL pf, final ContextAttribs attribs) throws LWJGLException {
 		throw new UnsupportedOperationException();
 	}

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3632] trunk/LWJGL/src

From: <sp...@us...> - 2011-09-03 18:52:53

Revision: 3632
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3632&view=rev
Author:   spasi
Date:     2011-09-03 18:52:45 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
Added support for OpenGL 3.2 on MacOS X 10.7+.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGL.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableLWJGL.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxCanvasImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTGLCanvasPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPbufferPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPeerInfo.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsCanvasImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/native/macosx/context.h
    trunk/LWJGL/src/native/macosx/context.m
    trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
    trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXPeerInfo.m

Removed Paths:
-------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasImplementation.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasImplementation.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -47,7 +47,7 @@
 	/**
 	 * Return an opaque handle to the canvas peer information required to create a context from it.
 	 */
-	PeerInfo createPeerInfo(Canvas component, PixelFormat pixel_format) throws LWJGLException;
+	PeerInfo createPeerInfo(Canvas component, PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException;
 
 	/**
 	 * Find a proper GraphicsConfiguration from the given GraphicsDevice and PixelFormat.

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -107,7 +107,7 @@
 		}
 	}
 
-	public void setPixelFormat(final PixelFormatLWJGL pf) throws LWJGLException {
+	public void setPixelFormat(final PixelFormatLWJGL pf, final ContextAttribs attribs) throws LWJGLException {
 		throw new UnsupportedOperationException();
 	}
 
@@ -311,7 +311,7 @@
 				return;
 			try {
 				if ( peer_info == null ) {
-					this.peer_info = implementation.createPeerInfo(this, pixel_format);
+					this.peer_info = implementation.createPeerInfo(this, pixel_format, attribs);
 				}
 				peer_info.lockAndGetHandle();
 				try {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -51,6 +51,10 @@
  * If the forwardCompatible
  * attribute is used, LWJGL will not load the deprecated functionality (as defined in the OpenGL 3.0 specification). This
  * means that developers can start working on cleaning up their applications without an OpenGL 3.0 complaint driver.
+ * <p/>
+ * This extension is not supported on MacOS X. However, in order to enable the GL 3.2 context on MacOS X 10.7 or newer, an
+ * instance of this class must be passed to LWJGL. The only valid configuration is <code>new ContextAttribs(3, 2).withProfileCore()</code>,
+ * anything else will be ignored.
  *
  * @author spasi <sp...@us...>
  */
@@ -243,14 +247,15 @@
 				return new LinuxContextAttribs();
 			case LWJGLUtil.PLATFORM_WINDOWS:
 				return new WindowsContextAttribs();
-			case LWJGLUtil.PLATFORM_MACOSX:
-				return new MacOSXContextAttribs();
 			default:
 				throw new IllegalStateException("Unsupported platform");
 		}
 	}
 
 	IntBuffer getAttribList() {
+		if ( LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_MACOSX )
+			return null;
+
 		ContextAttribsImplementation implementation = getImplementation();
 
 		int attribCount = 0;

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -93,10 +93,10 @@
 	 * unlike GL, where it is typically at the bottom of the display.
 	 */
 	private static int y = -1;
-	
+
 	/** the width of the Display window */
 	private static int width = 0;
-	
+
 	/** the height of the Display window */
 	private static int height = 0;
 
@@ -115,9 +115,9 @@
 	private static boolean window_created;
 
 	private static boolean parent_resized;
-	
+
 	private static boolean window_resized;
-	
+
 	private static boolean window_resizable;
 
 	/** Initial Background Color of Display */
@@ -305,7 +305,7 @@
 		DisplayMode mode = getEffectiveMode();
 		display_impl.createWindow(drawable, mode, tmp_parent, getWindowX(), getWindowY());
 		window_created = true;
-		
+
 		width = Display.getDisplayMode().getWidth();
 		height = Display.getDisplayMode().getHeight();
 
@@ -674,9 +674,9 @@
 					throw new RuntimeException(e);
 				}
 			}
-			
+
 			window_resized = !isFullscreen() && parent == null && display_impl.wasResized();
-			
+
 			if ( window_resized ) {
 				width = display_impl.getWidth();
 				height = display_impl.getHeight();
@@ -894,7 +894,7 @@
 			Display.drawable = drawable;
 
 			try {
-				drawable.setPixelFormat(pixel_format);
+				drawable.setPixelFormat(pixel_format, attribs);
 				try {
 					createWindow();
 					try {
@@ -1008,6 +1008,11 @@
 				switchDisplayMode();
 
 			final DrawableGLES drawable = new DrawableGLES() {
+
+				public void setPixelFormat(final PixelFormatLWJGL pf, final ContextAttribs attribs) throws LWJGLException {
+					throw new UnsupportedOperationException();
+				}
+
 				public void destroy() {
 					synchronized ( GlobalLock.lock ) {
 						if ( !isCreated() )
@@ -1269,11 +1274,11 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * Enable or disable the Display window to be resized.
 	 *
-	 * @param set true to make the Display window resizable; 
+	 * @param resizable set to true to make the Display window resizable;
 	 * false to disable resizing on the Display window.
 	 */
 	public static void setResizable(boolean resizable) {
@@ -1282,65 +1287,65 @@
 			display_impl.setResizable(resizable);
 		}
 	}
-	
+
 	/**
 	 * @return true if the Display window is resizable.
 	 */
 	public static boolean isResizable() {
 		return window_resizable;
 	}
-	
+
 	/**
 	 * @return true if the Display window has been resized.
 	 * This value will be updated after a call to Display.update().
-	 * 
+	 *
 	 * This will return false if running in fullscreen or with Display.setParent(Canvas parent)
 	 */
 	public static boolean wasResized() {
 		return window_resized;
 	}
-	
+
 	/**
 	 * @return this method will return the width of the Display window.
-	 * 
+	 *
 	 * If running in fullscreen mode it will return the width of the current set DisplayMode.
 	 * If running Display.setParent(Canvas parent) is being used, the width of the parent
 	 * will be returned.
-	 * 
+	 *
 	 * This value will be updated after a call to Display.update().
 	 */
 	public static int getWidth() {
-		
+
 		if (Display.isFullscreen()) {
 			return Display.getDisplayMode().getWidth();
 		}
-		
+
 		if (parent != null) {
 			return parent.getWidth();
 		}
-		
+
 		return width;
 	}
-	
+
 	/**
 	 * @return this method will return the height of the Display window.
-	 *  
+	 *
 	 * If running in fullscreen mode it will return the height of the current set DisplayMode.
 	 * If running Display.setParent(Canvas parent) is being used, the height of the parent
 	 * will be returned.
-	 * 
+	 *
 	 * This value will be updated after a call to Display.update().
 	 */
 	public static int getHeight() {
-		
+
 		if (Display.isFullscreen()) {
 			return Display.getDisplayMode().getHeight();
-		} 
-		
+		}
+
 		if (parent != null) {
 			return parent.getHeight();
 		}
-		
+
 		return height;
 	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -108,7 +108,7 @@
 	 * Create the native PeerInfo.
 	 * @throws LWJGLException
 	 */
-	PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException;
+	PeerInfo createPeerInfo(PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException;
 
 //	void destroyPeerInfo();
 
@@ -136,7 +136,7 @@
 	/**
 	 * Method to create a Pbuffer
 	 */
-	PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format,
+	PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, ContextAttribs attribs,
 			IntBuffer pixelFormatCaps,
 			IntBuffer pBufferAttribs) throws LWJGLException;
 
@@ -159,25 +159,25 @@
 	 * @return number of icons used.
 	 */
 	int setIcon(ByteBuffer[] icons);
-	
+
 	/**
 	 * Enable or disable the Display window to be resized.
 	 *
-	 * @param set true to make the Display window resizable; 
+	 * @param resizable set to true to make the Display window resizable;
 	 * false to disable resizing on the Display window.
 	 */
 	void setResizable(boolean resizable);
-	
+
 	/**
 	 * @return true if the Display window has been resized since this method was last called.
 	 */
 	boolean wasResized();
-	
+
 	/**
 	 * @return this method will return a the width of the Display window.
 	 */
 	int getWidth();
-	
+
 	/**
 	 * @return this method will return a the height of the Display window.
 	 */

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGL.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableGL.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -53,8 +53,12 @@
 	}
 
 	public void setPixelFormat(final PixelFormatLWJGL pf) throws LWJGLException {
+		throw new UnsupportedOperationException();
+	}
+
+	public void setPixelFormat(final PixelFormatLWJGL pf, final ContextAttribs attribs) throws LWJGLException {
 		this.pixel_format = (PixelFormat)pf;
-		this.peer_info = Display.getImplementation().createPeerInfo(pixel_format);
+		this.peer_info = Display.getImplementation().createPeerInfo(pixel_format, attribs);
 	}
 
 	public PixelFormatLWJGL getPixelFormat() {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableLWJGL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableLWJGL.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/DrawableLWJGL.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -42,6 +42,8 @@
 
 	void setPixelFormat(PixelFormatLWJGL pf) throws LWJGLException;
 
+	void setPixelFormat(PixelFormatLWJGL pf, ContextAttribs attribs) throws LWJGLException;
+
 	PixelFormatLWJGL getPixelFormat();
 
 	/**

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxCanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxCanvasImplementation.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxCanvasImplementation.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -76,7 +76,7 @@
 		}
 	}
 
-	public PeerInfo createPeerInfo(Canvas component, PixelFormat pixel_format) throws LWJGLException {
+	public PeerInfo createPeerInfo(Canvas component, PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException {
 		return new LinuxAWTGLCanvasPeerInfo(component);
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -33,8 +33,6 @@
 
 /**
  * An implementation of ContextAttribs using GLX_create_context.
- * <p/><p/>
- * ---- WIP - GLX_create_context has not been defined yet ----
  *
  * @author spasi <sp...@us...>
  */
@@ -42,14 +40,13 @@
 
 	private static final int GLX_CONTEXT_MAJOR_VERSION_ARB = 0x2091;
 	private static final int GLX_CONTEXT_MINOR_VERSION_ARB = 0x2092;
-	private static final int GLX_CONTEXT_LAYER_PLANE_ARB = 0x2093;
-	private static final int GLX_CONTEXT_FLAGS_ARB = 0x2094;
-	private static final int GLX_CONTEXT_PROFILE_MASK_ARB = 0x9126;
+	private static final int GLX_CONTEXT_FLAGS_ARB         = 0x2094;
+	private static final int GLX_CONTEXT_PROFILE_MASK_ARB  = 0x9126;
 
-	private static final int GLX_CONTEXT_DEBUG_BIT_ARB = 0x0001;
+	private static final int GLX_CONTEXT_DEBUG_BIT_ARB              = 0x0001;
 	private static final int GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB = 0x0002;
 
-	private static final int GLX_CONTEXT_CORE_PROFILE_BIT_ARB = 0x00000001;
+	private static final int GLX_CONTEXT_CORE_PROFILE_BIT_ARB          = 0x00000001;
 	private static final int GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB = 0x00000002;
 
 	LinuxContextAttribs() {
@@ -64,7 +61,7 @@
 	}
 
 	public int getLayerPlaneAttrib() {
-		return GLX_CONTEXT_LAYER_PLANE_ARB;
+		throw new UnsupportedOperationException();
 	}
 
 	public int getFlagsAttrib() {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -516,7 +516,7 @@
 
 	private static long getHandle(Canvas parent) throws LWJGLException {
 		AWTCanvasImplementation awt_impl = AWTGLCanvas.createImplementation();
-		LinuxPeerInfo parent_peer_info = (LinuxPeerInfo)awt_impl.createPeerInfo(parent, null);
+		LinuxPeerInfo parent_peer_info = (LinuxPeerInfo)awt_impl.createPeerInfo(parent, null, null);
 		ByteBuffer parent_peer_info_handle = parent_peer_info.lockAndGetHandle();
 		try {
 			return parent_peer_info.getDrawable();
@@ -757,7 +757,7 @@
 		return result;
 	}
 
-	public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException {
+	public PeerInfo createPeerInfo(PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException {
 		peer_info = new LinuxDisplayPeerInfo(pixel_format);
 		return peer_info;
 	}
@@ -1243,7 +1243,7 @@
 		return false;
 	}
 
-	public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format,
+	public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, ContextAttribs attribs,
 			IntBuffer pixelFormatCaps,
 			IntBuffer pBufferAttribs) throws LWJGLException {
 		return new LinuxPbufferPeerInfo(width, height, pixel_format);

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTGLCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTGLCanvasPeerInfo.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTGLCanvasPeerInfo.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -44,8 +44,8 @@
 final class MacOSXAWTGLCanvasPeerInfo extends MacOSXCanvasPeerInfo {
 	private final Canvas component;
 
-	MacOSXAWTGLCanvasPeerInfo(Canvas component, PixelFormat pixel_format, boolean support_pbuffer) throws LWJGLException {
-		super(pixel_format, support_pbuffer);
+	MacOSXAWTGLCanvasPeerInfo(Canvas component, PixelFormat pixel_format, ContextAttribs attribs, boolean support_pbuffer) throws LWJGLException {
+		super(pixel_format, attribs, support_pbuffer);
 		this.component = component;
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -44,11 +44,11 @@
  * $Id$
  */
 final class MacOSXCanvasImplementation implements AWTCanvasImplementation {
-	public PeerInfo createPeerInfo(Canvas component, PixelFormat pixel_format) throws LWJGLException {
+	public PeerInfo createPeerInfo(Canvas component, PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException {
 		try {
-			return new MacOSXAWTGLCanvasPeerInfo(component, pixel_format, true);
+			return new MacOSXAWTGLCanvasPeerInfo(component, pixel_format, attribs, true);
 		} catch (LWJGLException e) {
-			return new MacOSXAWTGLCanvasPeerInfo(component, pixel_format, false);
+			return new MacOSXAWTGLCanvasPeerInfo(component, pixel_format, attribs, false);
 		}
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -45,8 +45,8 @@
 abstract class MacOSXCanvasPeerInfo extends MacOSXPeerInfo {
 	private final AWTSurfaceLock awt_surface = new AWTSurfaceLock();
 
-	protected MacOSXCanvasPeerInfo(PixelFormat pixel_format, boolean support_pbuffer) throws LWJGLException {
-		super(pixel_format, true, true, support_pbuffer, true);
+	protected MacOSXCanvasPeerInfo(PixelFormat pixel_format, ContextAttribs attribs, boolean support_pbuffer) throws LWJGLException {
+		super(pixel_format, attribs, true, true, support_pbuffer, true);
 	}
 
 	protected void initHandle(Canvas component) throws LWJGLException {

Deleted: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2002-2008 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-/**
- * An implementation of ContextAttribs for MacOS X.
- * <p/><p/>
- * ---- WIP - No XGL_create_context has been defined for MacOS X yet ----
- *
- * @author spasi <sp...@us...>
- */
-final class MacOSXContextAttribs implements ContextAttribsImplementation {
-
-	private static final int XGL_CONTEXT_MAJOR_VERSION_ARB = 0x2091;
-	private static final int XGL_CONTEXT_MINOR_VERSION_ARB = 0x2092;
-	private static final int XGL_CONTEXT_LAYER_PLANE_ARB = 0x2093;
-	private static final int XGL_CONTEXT_FLAGS_ARB = 0x2094;
-	private static final int XGL_CONTEXT_PROFILE_MASK_ARB = 0x9126;
-
-	private static final int XGL_CONTEXT_DEBUG_BIT_ARB = 0x0001;
-	private static final int XGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB = 0x0002;
-
-	private static final int XGL_CONTEXT_CORE_PROFILE_BIT_ARB = 0x00000001;
-	private static final int XGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB = 0x00000002;
-
-	MacOSXContextAttribs() {
-	}
-
-	public int getMajorVersionAttrib() {
-		return XGL_CONTEXT_MAJOR_VERSION_ARB;
-	}
-
-	public int getMinorVersionAttrib() {
-		return XGL_CONTEXT_MINOR_VERSION_ARB;
-	}
-
-	public int getLayerPlaneAttrib() {
-		return XGL_CONTEXT_LAYER_PLANE_ARB;
-	}
-
-	public int getFlagsAttrib() {
-		return XGL_CONTEXT_FLAGS_ARB;
-	}
-
-	public int getDebugBit() {
-		return XGL_CONTEXT_DEBUG_BIT_ARB;
-	}
-
-	public int getForwardCompatibleBit() {
-		return XGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
-	}
-
-	public int getProfileMaskAttrib() {
-		return XGL_CONTEXT_PROFILE_MASK_ARB;
-	}
-
-	public int getProfileCoreBit() {
-		return XGL_CONTEXT_CORE_PROFILE_BIT_ARB;
-	}
-
-	public int getProfileCompatibilityBit() {
-		return XGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB;
-	}
-
-}
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -46,13 +46,13 @@
 	public ByteBuffer create(PeerInfo peer_info, IntBuffer attribs, ByteBuffer shared_context_handle) throws LWJGLException {
 		ByteBuffer peer_handle = peer_info.lockAndGetHandle();
 		try {
-			return nCreate(peer_handle, attribs, shared_context_handle);
+			return nCreate(peer_handle, shared_context_handle);
 		} finally {
 			peer_info.unlock();
 		}
 	}
 
-	private static native ByteBuffer nCreate(ByteBuffer peer_handle, IntBuffer attribs, ByteBuffer shared_context_handle) throws LWJGLException;
+	private static native ByteBuffer nCreate(ByteBuffer peer_handle, ByteBuffer shared_context_handle) throws LWJGLException;
 
 	public void swapBuffers() throws LWJGLException {
 		ContextGL current_context = ContextGL.getCurrentContext();

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -240,11 +240,11 @@
 		return frame != null && frame.getCanvas().syncIsDirty();
 	}
 
-	public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException {
+	public PeerInfo createPeerInfo(PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException {
 		try {
-			return new MacOSXDisplayPeerInfo(pixel_format, true);
+			return new MacOSXDisplayPeerInfo(pixel_format, attribs, true);
 		} catch (LWJGLException e) {
-			return new MacOSXDisplayPeerInfo(pixel_format, false);
+			return new MacOSXDisplayPeerInfo(pixel_format, attribs, false);
 		}
 	}
 
@@ -434,10 +434,10 @@
 		return false;
 	}
 
-	public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format,
+	public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, ContextAttribs attribs,
 			IntBuffer pixelFormatCaps,
 			IntBuffer pBufferAttribs) throws LWJGLException {
-		return new MacOSXPbufferPeerInfo(width, height, pixel_format);
+		return new MacOSXPbufferPeerInfo(width, height, pixel_format, attribs);
 	}
 
 	public void setPbufferAttrib(PeerInfo handle, int attrib, int value) {
@@ -507,13 +507,13 @@
     public boolean isInsideWindow() {
     		return true;
     }
-    
+
     public void setResizable(boolean resizable) {
 		frame.setResizable(resizable);
 	}
-	
+
 	public boolean wasResized() {
 		return canvas_listener.wasResized();
 	}
-	
+
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -44,8 +44,8 @@
 final class MacOSXDisplayPeerInfo extends MacOSXCanvasPeerInfo {
 	private boolean locked;
 
-	MacOSXDisplayPeerInfo(PixelFormat pixel_format, boolean support_pbuffer) throws LWJGLException {
-		super(pixel_format, support_pbuffer);
+	MacOSXDisplayPeerInfo(PixelFormat pixel_format, ContextAttribs attribs, boolean support_pbuffer) throws LWJGLException {
+		super(pixel_format, attribs, support_pbuffer);
 	}
 
 	protected void doLockAndInitHandle() throws LWJGLException {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPbufferPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPbufferPeerInfo.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPbufferPeerInfo.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -42,8 +42,8 @@
  * $Id$
  */
 final class MacOSXPbufferPeerInfo extends MacOSXPeerInfo {
-	MacOSXPbufferPeerInfo(int width, int height, PixelFormat pixel_format) throws LWJGLException {
-		super(pixel_format, false, false, true, false);
+	MacOSXPbufferPeerInfo(int width, int height, PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException {
+		super(pixel_format, attribs, false, false, true, false);
 		nCreate(getHandle(), width, height);
 	}
 	private static native void nCreate(ByteBuffer handle, int width, int height) throws LWJGLException;

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPeerInfo.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPeerInfo.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -43,18 +43,23 @@
  * $Id$
  */
 abstract class MacOSXPeerInfo extends PeerInfo {
-	MacOSXPeerInfo(PixelFormat pixel_format, boolean use_display_bpp, boolean support_window, boolean support_pbuffer, boolean double_buffered) throws LWJGLException {
+	MacOSXPeerInfo(PixelFormat pixel_format, ContextAttribs attribs, boolean use_display_bpp, boolean support_window, boolean support_pbuffer, boolean double_buffered) throws LWJGLException {
 		super(createHandle());
 		if (pixel_format.isFloatingPoint() && !LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 4))
-			throw new LWJGLException("Floating point pixel format requested, but is not supported");
-		choosePixelFormat(pixel_format, use_display_bpp, support_window, support_pbuffer, double_buffered);
+			throw new LWJGLException("Floating point pixel format requested, but it requires MacOS X 10.4 or newer");
+
+		boolean gl32 = attribs.getMajorVersion() == 3 && attribs.getMinorVersion() == 2 && attribs.isProfileCore();
+		if ( gl32 && !LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 7) )
+			throw new LWJGLException("OpenGL 3.2 requested, but it requires MacOS X 10.7 or newer");
+
+		choosePixelFormat(pixel_format, gl32, use_display_bpp, support_window, support_pbuffer, double_buffered);
 	}
 	private static native ByteBuffer createHandle();
 
-	private void choosePixelFormat(PixelFormat pixel_format, boolean use_display_bpp, boolean support_window, boolean support_pbuffer, boolean double_buffered) throws LWJGLException {
-		nChoosePixelFormat(getHandle(), pixel_format, use_display_bpp, support_window, support_pbuffer, double_buffered);
+	private void choosePixelFormat(PixelFormat pixel_format, boolean gl32, boolean use_display_bpp, boolean support_window, boolean support_pbuffer, boolean double_buffered) throws LWJGLException {
+		nChoosePixelFormat(getHandle(), pixel_format, gl32, use_display_bpp, support_window, support_pbuffer, double_buffered);
 	}
-	private static native void nChoosePixelFormat(ByteBuffer peer_info_handle, PixelFormat pixel_format, boolean use_display_bpp, boolean support_window, boolean support_pbuffer, boolean double_buffered) throws LWJGLException;
+	private static native void nChoosePixelFormat(ByteBuffer peer_info_handle, PixelFormat pixel_format, boolean gl32, boolean use_display_bpp, boolean support_window, boolean support_pbuffer, boolean double_buffered) throws LWJGLException;
 
 	public void destroy() {
 		nDestroy(getHandle());

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -216,7 +216,7 @@
 			throw new NullPointerException("Pixel format must be non-null");
 		this.width = width;
 		this.height = height;
-		this.peer_info = createPbuffer(width, height, pixel_format, renderTexture);
+		this.peer_info = createPbuffer(width, height, pixel_format, attribs, renderTexture);
 		Context shared_context = null;
 		if ( shared_drawable == null )
 			shared_drawable = Display.getDrawable(); // May be null
@@ -225,15 +225,15 @@
 		this.context = new ContextGL(peer_info, attribs, (ContextGL)shared_context);
 	}
 
-	private static PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, RenderTexture renderTexture) throws LWJGLException {
+	private static PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, ContextAttribs attribs, RenderTexture renderTexture) throws LWJGLException {
 		if ( renderTexture == null ) {
 			// Though null is a perfectly valid argument, Matrox Parhelia drivers expect
 			// a 0 terminated list, or else they crash. Supplying NULL or 0, should
 			// cause the drivers to use default settings
 			IntBuffer defaultAttribs = BufferUtils.createIntBuffer(1);
-			return Display.getImplementation().createPbuffer(width, height, pixel_format, null, defaultAttribs);
+			return Display.getImplementation().createPbuffer(width, height, pixel_format, attribs, null, defaultAttribs);
 		} else
-			return Display.getImplementation().createPbuffer(width, height, pixel_format,
+			return Display.getImplementation().createPbuffer(width, height, pixel_format, attribs,
 					renderTexture.pixelFormatCaps,
 					renderTexture.pBufferAttribs);
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsCanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsCanvasImplementation.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsCanvasImplementation.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -66,7 +66,7 @@
 		});
 	}
 
-	public PeerInfo createPeerInfo(Canvas component, PixelFormat pixel_format) throws LWJGLException {
+	public PeerInfo createPeerInfo(Canvas component, PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException {
 		return new WindowsAWTGLCanvasPeerInfo(component, pixel_format);
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -40,14 +40,14 @@
 
 	private static final int WGL_CONTEXT_MAJOR_VERSION_ARB = 0x2091;
 	private static final int WGL_CONTEXT_MINOR_VERSION_ARB = 0x2092;
-	private static final int WGL_CONTEXT_LAYER_PLANE_ARB = 0x2093;
-	private static final int WGL_CONTEXT_FLAGS_ARB = 0x2094;
-	private static final int WGL_CONTEXT_PROFILE_MASK_ARB = 0x9126;
+	private static final int WGL_CONTEXT_LAYER_PLANE_ARB   = 0x2093;
+	private static final int WGL_CONTEXT_FLAGS_ARB         = 0x2094;
+	private static final int WGL_CONTEXT_PROFILE_MASK_ARB  = 0x9126;
 
-	private static final int WGL_CONTEXT_DEBUG_BIT_ARB = 0x0001;
+	private static final int WGL_CONTEXT_DEBUG_BIT_ARB              = 0x0001;
 	private static final int WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB = 0x0002;
 
-	private static final int WGL_CONTEXT_CORE_PROFILE_BIT_ARB = 0x00000001;
+	private static final int WGL_CONTEXT_CORE_PROFILE_BIT_ARB          = 0x00000001;
 	private static final int WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB = 0x00000002;
 
 	WindowsContextAttribs() {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2011-09-03 18:52:45 UTC (rev 3632)
@@ -247,7 +247,7 @@
 
 	private static long getHwnd(Canvas parent) throws LWJGLException {
 		AWTCanvasImplementation awt_impl = AWTGLCanvas.createImplementation();
-		WindowsPeerInfo parent_peer_info = (WindowsPeerInfo)awt_impl.createPeerInfo(parent, null);
+		WindowsPeerInfo parent_peer_info = (WindowsPeerInfo)awt_impl.createPeerInfo(parent, null, null);
 		ByteBuffer parent_peer_info_handle = parent_peer_info.lockAndGetHandle();
 		try {
 			return parent_peer_info.getHwnd();
@@ -463,7 +463,7 @@
 		return saved;
 	}
 
-	public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException {
+	public PeerInfo createPeerInfo(PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException {
 		peer_info = new WindowsDisplayPeerInfo(false);
 		return peer_info;
 	}
@@ -657,7 +657,7 @@
 		return ((WindowsPbufferPeerInfo)handle).isBufferLost();
 	}
 
-	public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format,
+	public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, ContextAttribs attribs,
 			IntBuffer pixelFormatCaps,
 			IntBuffer pBufferAttribs) throws LWJGLException {
 		return new WindowsPbufferPeerInfo(width, height, pixel_format, pixelFormatCaps, pBufferAttribs);

Modified: trunk/LWJGL/src/native/macosx/context.h
===================================================================
--- trunk/LWJGL/src/native/macosx/context.h	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/native/macosx/context.h	2011-09-03 18:52:45 UTC (rev 3632)
@@ -1,31 +1,31 @@
-/* 
+/*
  * Copyright (c) 2002-2008 LWJGL Project
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
+ * modification, are permitted provided that the following conditions are
  * met:
- * 
- * * Redistributions of source code must retain the above copyright 
+ *
+ * * Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  *
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
@@ -57,5 +57,5 @@
 	};
 } MacOSXPeerInfo;
 
-NSOpenGLPixelFormat *choosePixelFormat(JNIEnv *env, jobject pixel_format, bool use_display_bpp, bool support_window, bool support_pbuffer, bool double_buffered);
+NSOpenGLPixelFormat *choosePixelFormat(JNIEnv *env, jobject pixel_format, bool gl32, bool use_display_bpp, bool support_window, bool support_pbuffer, bool double_buffered);
 #endif

Modified: trunk/LWJGL/src/native/macosx/context.m
===================================================================
--- trunk/LWJGL/src/native/macosx/context.m	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/native/macosx/context.m	2011-09-03 18:52:45 UTC (rev 3632)
@@ -1,31 +1,31 @@
-/* 
+/*
  * Copyright (c) 2002-2008 LWJGL Project
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
+ * modification, are permitted provided that the following conditions are
  * met:
- * 
- * * Redistributions of source code must retain the above copyright 
+ *
+ * * Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  *
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
@@ -51,12 +51,12 @@
 	return address;
 }
 
-static CFBundleRef loadFramework(JNIEnv *env) {   
+static CFBundleRef loadFramework(JNIEnv *env) {
 	CFStringRef framework_path = CFSTR("/System/Library/Frameworks/OpenGL.framework");
 	if (framework_path == NULL) {
 		printfDebugJava(env, "Failed to allocate string");
 		return NULL;
-	}   
+	}
 	CFURLRef url = CFURLCreateWithFileSystemPath(NULL, framework_path, kCFURLPOSIXPathStyle, TRUE);
 	if (url == NULL) {
 		printfDebugJava(env, "Failed to allocate URL");
@@ -87,14 +87,14 @@
 	}
 }
 
-NSOpenGLPixelFormat *choosePixelFormat(JNIEnv *env, jobject pixel_format, bool use_display_bpp, bool support_window, bool support_pbuffer, bool double_buffered) {
+NSOpenGLPixelFormat *choosePixelFormat(JNIEnv *env, jobject pixel_format, bool gl32, bool use_display_bpp, bool support_window, bool support_pbuffer, bool double_buffered) {
 	int bpp;
 	jclass cls_pixel_format = (*env)->GetObjectClass(env, pixel_format);
 	if (use_display_bpp)
 		bpp = CGDisplayBitsPerPixel(kCGDirectMainDisplay);
 	else
 		bpp = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "bpp", "I"));
-	
+
 	int alpha = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "alpha", "I"));
 	int depth = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "depth", "I"));
 	int stencil = (int)(*env)->GetIntField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "stencil", "I"));
@@ -125,6 +125,10 @@
 	putAttrib(&attribs, NSOpenGLPFASampleBuffers); putAttrib(&attribs, samples > 0 ? 1 : 0);
 	putAttrib(&attribs, NSOpenGLPFASamples); putAttrib(&attribs, samples);
 	putAttrib(&attribs, NSOpenGLPFAAuxBuffers); putAttrib(&attribs, num_aux_buffers);
+	if (gl32) {
+		putAttrib(&attribs, 99); // NSOpenGLPFAOpenGLProfile
+		putAttrib(&attribs, 0x3200); // NSOpenGLProfileVersion3_2Core
+	}
 	if (support_window)
 		putAttrib(&attribs, NSOpenGLPFAWindow);
 	if (support_pbuffer)

Modified: trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
===================================================================
--- trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m	2011-09-03 18:52:45 UTC (rev 3632)
@@ -1,31 +1,31 @@
-/* 
+/*
  * Copyright (c) 2002-2008 LWJGL Project
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
+ * modification, are permitted provided that the following conditions are
  * met:
- * 
- * * Redistributions of source code must retain the above copyright 
+ *
+ * * Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  *
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
@@ -49,7 +49,7 @@
 } MacOSXContext;
 
 JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_MacOSXContextImplementation_nCreate
-  (JNIEnv *env, jclass clazz, jobject peer_info_handle, jobject attribs, jobject shared_context_handle) {
+  (JNIEnv *env, jclass clazz, jobject peer_info_handle, jobject shared_context_handle) {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	MacOSXPeerInfo *peer_info;
 	MacOSXContext *shared_context_info;
@@ -75,7 +75,7 @@
 	context_info->context = context;
     context_info->peer_info = peer_info;
 	[pool release];
-	return context_handle;		
+	return context_handle;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXContextImplementation_nSwapBuffers

Modified: trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXPeerInfo.m
===================================================================
--- trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXPeerInfo.m	2011-09-03 18:41:22 UTC (rev 3631)
+++ trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXPeerInfo.m	2011-09-03 18:52:45 UTC (rev 3632)
@@ -1,31 +1,31 @@
-/* 
+/*
  * Copyright (c) 2002-2008 LWJGL Project
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
+ * modification, are permitted provided that the following conditions are
  * met:
- * 
- * * Redistributions of source code must retain the above copyright 
+ *
+ * * Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  *
  * * Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
@@ -52,10 +52,10 @@
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXPeerInfo_nChoosePixelFormat
-  (JNIEnv *env, jclass clazz, jobject peer_info_handle, jobject pixel_format, jboolean use_display_bpp, jboolean support_window, jboolean support_pbuffer, jboolean double_buffered) {
+  (JNIEnv *env, jclass clazz, jobject peer_info_handle, jobject pixel_format, jboolean gl32, jboolean use_display_bpp, jboolean support_window, jboolean support_pbuffer, jboolean double_buffered) {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	MacOSXPeerInfo *peer_info = (MacOSXPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
-	NSOpenGLPixelFormat *macosx_pixel_format = choosePixelFormat(env, pixel_format, use_display_bpp, support_window, support_pbuffer, double_buffered);
+	NSOpenGLPixelFormat *macosx_pixel_format = choosePixelFormat(env, pixel_format, gl32, use_display_bpp, support_window, support_pbuffer, double_buffered);
 	if (pixel_format == nil) {
 		throwException(env, "Could not find pixel format");
 		return;

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3631] trunk/LWJGL/applet

From: <ka...@us...> - 2011-09-03 18:41:28

Revision: 3631
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3631&view=rev
Author:   kappa1
Date:     2011-09-03 18:41:22 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
update applet html files to include al_min_jre tag

Modified Paths:
--------------
    trunk/LWJGL/applet/advance/appletloader.html
    trunk/LWJGL/applet/basic/basicapplet.html

Modified: trunk/LWJGL/applet/advance/appletloader.html
===================================================================
--- trunk/LWJGL/applet/advance/appletloader.html	2011-09-03 14:47:11 UTC (rev 3630)
+++ trunk/LWJGL/applet/advance/appletloader.html	2011-09-03 18:41:22 UTC (rev 3631)
@@ -38,6 +38,9 @@
     <!-- Version of Applet (case insensitive String), applet files not redownloaded if same version already in cache -->
     <!-- <param name="al_version" value="0.1"> -->
     
+    <!-- Specify the minimum JRE version required by your applet, defaults to "1.5" -->
+    <!-- <param name="al_min_jre" value="1.6"> -->
+    
     <!-- background color to paint with, defaults to white -->
     <!-- <param name="boxbgcolor" value="#000000"> -->
     

Modified: trunk/LWJGL/applet/basic/basicapplet.html
===================================================================
--- trunk/LWJGL/applet/basic/basicapplet.html	2011-09-03 14:47:11 UTC (rev 3630)
+++ trunk/LWJGL/applet/basic/basicapplet.html	2011-09-03 18:41:22 UTC (rev 3631)
@@ -38,6 +38,9 @@
     <!-- Version of Applet (case insensitive String), applet files not redownloaded if same version already in cache -->
     <!-- <param name="al_version" value="0.1"> -->
     
+    <!-- Specify the minimum JRE version required by your applet, defaults to "1.5" -->
+    <!-- <param name="al_min_jre" value="1.6"> -->
+    
     <!-- background color to paint with, defaults to white -->
     <!-- <param name="boxbgcolor" value="#000000"> -->
     

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3630] trunk/LWJGL

From: <ka...@us...> - 2011-09-03 14:47:17

Revision: 3630
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3630&view=rev
Author:   kappa1
Date:     2011-09-03 14:47:11 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
update credits

Modified Paths:
--------------
    trunk/LWJGL/doc/CREDITS
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
    trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
    trunk/LWJGL/www/credits.php

Modified: trunk/LWJGL/doc/CREDITS
===================================================================
--- trunk/LWJGL/doc/CREDITS	2011-09-03 11:04:04 UTC (rev 3629)
+++ trunk/LWJGL/doc/CREDITS	2011-09-03 14:47:11 UTC (rev 3630)
@@ -12,12 +12,13 @@
  - Jos Hirth <jh...@ka...>
  - Kevin Glass <ke...@co...>
  - Atsuya Takagi
- - kappaOne
+ - kappaOne <one...@gm...>
  - Simon Felix
  - Ryan McNally 
  - Ciardhubh <ciardhubh[at]ciardhubh.de>
  - Jens von Pilgrim
  - Ruben Garat
+ - Pelle Johnsen <pel...@gm...>
  
 additional credits goes to:
  - Joseph I. Valenzuela [OpenAL stuff]

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-09-03 11:04:04 UTC (rev 3629)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-09-03 14:47:11 UTC (rev 3630)
@@ -151,7 +151,7 @@
  * <li>Matthias Mann</li>
  * <li>Mickelukas</li>
  * <li>NateS</li>
- * <li>pjohnsen</li>
+ * <li>Pelle Johnsen</li>
  * <li>Riven</li>
  * <li>Ruben01</li>
  * <li>Shannon Smith</li>

Modified: trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
===================================================================
--- trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-09-03 11:04:04 UTC (rev 3629)
+++ trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-09-03 14:47:11 UTC (rev 3630)
@@ -34,6 +34,7 @@
  * $Id$
  *
  * @author elias_naur <eli...@us...>
+ * @author Pelle Johnsen
  * @version $Revision$
  */
 

Modified: trunk/LWJGL/www/credits.php
===================================================================
--- trunk/LWJGL/www/credits.php	2011-09-03 11:04:04 UTC (rev 3629)
+++ trunk/LWJGL/www/credits.php	2011-09-03 14:47:11 UTC (rev 3630)
@@ -22,6 +22,7 @@
 	<li>Simon Felix</li>
 	<li>Ryan McNally</li>
 	<li>Ciardhubh</li>
+	<li>Pelle Johnsen</li>
 </ul>
 <p>
 	<b>Additional credits goes to</b>

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3629] trunk/LWJGL/platform_build/macosx_ant/ build.xml

From: <sp...@us...> - 2011-09-03 11:04:11

Revision: 3629
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3629&view=rev
Author:   spasi
Date:     2011-09-03 11:04:04 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
Attempt (2) to fix MacOS build.

Modified Paths:
--------------
    trunk/LWJGL/platform_build/macosx_ant/build.xml

Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml	2011-09-03 10:58:20 UTC (rev 3628)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml	2011-09-03 11:04:04 UTC (rev 3629)
@@ -27,7 +27,9 @@
 			<fileset dir="${native}/macosx" includes="*.c"/>
 			<fileset dir="${native}/common" includes="*.c"/>
 			<fileset dir="${native}/common/opengl" includes="*.c"/>
-			<fileset dir="${native}/generated" includes="*.c"/>
+			<fileset dir="${native}/generated/openal" includes="*.c"/>
+			<fileset dir="${native}/generated/opencl" includes="*.c"/>
+			<fileset dir="${native}/generated/opengl" includes="*.c"/>
 		</apply>
 	</target>
 

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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3628] trunk/LWJGL/platform_build/macosx_ant/ build.xml

From: <sp...@us...> - 2011-09-03 10:58:27

Revision: 3628
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3628&view=rev
Author:   spasi
Date:     2011-09-03 10:58:20 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
Attempt to fix MacOS build.

Modified Paths:
--------------
    trunk/LWJGL/platform_build/macosx_ant/build.xml

Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml	2011-08-31 21:06:46 UTC (rev 3627)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml	2011-09-03 10:58:20 UTC (rev 3628)
@@ -7,7 +7,7 @@
 		<mkdir dir="i386"/>
 		<mkdir dir="x86_64"/>
 	</target>
-	
+
 	<target name="clean">
 		<delete failonerror="false">
 			<fileset dir="i386"/>
@@ -20,16 +20,17 @@
 
 	<target name="compile">
 		<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
-			<arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/macosx -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework/Versions/A/Headers"/>
+			<arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/common/opengl -I${native}/macosx -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework/Versions/A/Headers"/>
 			<!-- Map from *.m and *.c to .o -->
 			<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
 			<fileset dir="${native}/macosx" includes="*.m"/>
 			<fileset dir="${native}/macosx" includes="*.c"/>
 			<fileset dir="${native}/common" includes="*.c"/>
+			<fileset dir="${native}/common/opengl" includes="*.c"/>
 			<fileset dir="${native}/generated" includes="*.c"/>
 		</apply>
 	</target>
-	
+
 	<target name="link">
 		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
 			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework JavaNativeFoundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
@@ -40,7 +41,7 @@
 			<fileset dir="." file="${libname}"/>
 		</apply>
 	</target>
-	
+
 	<target name="nativelibrary" depends="init">
 		<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>
 		<property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.6.sdk"/>

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

Flat | Threaded

S	M	T	W	T	F	S
				1	2	3 (6)
4	5 (1)	6	7 (2)	8 (1)	9	10
11	12	13	14	15 (1)	16	17
18	19	20 (1)	21	22	23	24
25 (1)	26 (1)	27 (1)	28	29 (1)	30 (1)