Thread: [Java-game-lib-cvs] SF.net SVN: java-game-lib: [2317] trunk/LWJGL/src/native/macosx/build.xml

Revision: 2317
Author:   elias_naur
Date:     2006-05-01 05:14:16 -0700 (Mon, 01 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2317&view=rev

Log Message:
-----------
Mac OS X: native build.xml tweak

Modified Paths:
--------------
    trunk/LWJGL/src/native/macosx/build.xml
Modified: trunk/LWJGL/src/native/macosx/build.xml
===================================================================
--- trunk/LWJGL/src/native/macosx/build.xml	2006-05-01 12:07:58 UTC (rev 2316)
+++ trunk/LWJGL/src/native/macosx/build.xml	2006-05-01 12:14:16 UTC (rev 2317)
@@ -25,7 +25,7 @@
 	</target>
 	
 	<target name="link">
-		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true">
+		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" dest="${objdir}">
 			<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>


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

Revision: 2318
Author:   elias_naur
Date:     2006-05-01 05:24:13 -0700 (Mon, 01 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2318&view=rev

Log Message:
-----------
Mac OS X: native build.xml tweak

Modified Paths:
--------------
    trunk/LWJGL/src/native/macosx/build.xml
Modified: trunk/LWJGL/src/native/macosx/build.xml
===================================================================
--- trunk/LWJGL/src/native/macosx/build.xml	2006-05-01 12:14:16 UTC (rev 2317)
+++ trunk/LWJGL/src/native/macosx/build.xml	2006-05-01 12:24:13 UTC (rev 2318)
@@ -25,9 +25,10 @@
 	</target>
 	
 	<target name="link">
-		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" dest="${objdir}">
+		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" dest="${objdir}" 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"/>
+			<mapper type="merge" to="${libname}"/>
 		</apply>
 		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
 			<arg line="-S -X"/>


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

Revision: 2323
Author:   elias_naur
Date:     2006-05-06 12:45:12 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2323&view=rev

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

Modified Paths:
--------------
    trunk/LWJGL/src/native/macosx/build.xml
Modified: trunk/LWJGL/src/native/macosx/build.xml
===================================================================
--- trunk/LWJGL/src/native/macosx/build.xml	2006-05-05 08:14:28 UTC (rev 2322)
+++ trunk/LWJGL/src/native/macosx/build.xml	2006-05-06 19:45:12 UTC (rev 2323)
@@ -25,10 +25,9 @@
 	</target>
 	
 	<target name="link">
-		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" dest="${objdir}" skipemptyfilesets="true">
+		<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"/>
 			<fileset dir="${objdir}" includes="*.o"/>
-			<mapper type="merge" to="${libname}"/>
 		</apply>
 		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
 			<arg line="-S -X"/>
@@ -70,7 +69,6 @@
 			<srcfile/>
 			<arg value="-output"/>
 			<arg path="liblwjgl.jnilib"/>
-			<mapper type="merge" to="liblwjgl.jnilib"/>
 			<fileset file="ppc/liblwjgl-ppc.jnilib"/>
 			<fileset file="intel/liblwjgl-intel.jnilib"/>
 		</apply>


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