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

[<eli...@us...>]

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.