java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 2)

Revision: 2542
Author:   elias_naur
Date:     2006-08-01 07:10:17 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2542&view=rev

Log Message:
-----------
Mac OS X: Build fixes

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/macosx_ant/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-08-01 13:55:19 UTC (rev 2541)
+++ trunk/LWJGL/build.xml	2006-08-01 14:10:17 UTC (rev 2542)
@@ -711,7 +711,7 @@
 
 	<target name="-compile_native_macosx" if="lwjgl.platform.macosx">
 		<ant antfile="platform_build/macosx_ant/build.xml" inheritAll="false"/>
-		<copy file="${lwjgl.bin}/liblwjgl.jnilib" todir="${lwjgl.lib}/macosx"/>
+		<copy file="${lwjgl.bin}/lwjgl/liblwjgl.jnilib" todir="${lwjgl.lib}/macosx"/>
 	</target>
 
 	<!-- Compiles LWJGL on Mac OS X platforms  -->

Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml	2006-08-01 13:55:19 UTC (rev 2541)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml	2006-08-01 14:10:17 UTC (rev 2542)
@@ -29,11 +29,11 @@
 	</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"/>
+		<apply dir="." 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"/>
 			<fileset dir="${objdir}" includes="*.o"/>
 		</apply>
-		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
+		<apply dir="." executable="strip" os="Mac OS X" failonerror="true">
 			<arg line="-S -X"/>
 			<fileset dir="." file="${libname}"/>
 		</apply>


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

Revision: 2541
Author:   elias_naur
Date:     2006-08-01 06:55:19 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2541&view=rev

Log Message:
-----------
Mac OS X: Native compilation fix

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	2006-08-01 10:36:13 UTC (rev 2540)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml	2006-08-01 13:55:19 UTC (rev 2541)
@@ -55,7 +55,7 @@
 			<param name="sdkroot" location="${legacy_sdkroot}"/>
 			<param name="cflags" value=""/>
 		</antcall>
-		<exec vmlauncher="false" executable="../platform_build/macosx_ant/build-symbol-list" output="lwjgl.symbols" failonerror="true">
+		<exec vmlauncher="false" executable="../../platform_build/macosx_ant/build-symbol-list" output="lwjgl.symbols" failonerror="true">
 			<arg path="intel"/>
 		</exec>
 		<antcall target="link">


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

Revision: 2540
Author:   elias_naur
Date:     2006-08-01 03:36:13 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2540&view=rev

Log Message:
-----------
Make sure the mode member is never null in FullScreenWindowedTest

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java	2006-07-31 22:54:21 UTC (rev 2539)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java	2006-08-01 10:36:13 UTC (rev 2540)
@@ -245,7 +245,7 @@
 				return modes[i];
 			}
 		}
-		return null;
+		return Display.getDisplayMode();
 	}
 	/**
 	 * Initializes OGL


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