From: <eli...@us...> - 2008-05-28 08:40:41
|
Revision: 3071 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3071&view=rev Author: elias_naur Date: 2008-05-28 01:40:38 -0700 (Wed, 28 May 2008) Log Message: ----------- Mac OS X: Restore Mac OS X 10.3 compatibility 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 2008-05-23 11:03:31 UTC (rev 3070) +++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2008-05-28 08:40:38 UTC (rev 3071) @@ -32,7 +32,7 @@ <target name="link"> <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true"> - <arg line="${linkerflags} -mmacosx-version-min=10.4 -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/> + <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"> @@ -43,11 +43,17 @@ <target name="nativelibrary" depends="init"> <property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/> + <property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/> <property name="x86_64_sdkroot" location="/Developer/SDKs/MacOSX10.5.sdk"/> - <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/> <property name="universal_flags" value="-isysroot ${universal_sdkroot}"/> - <property name="legacy_flags" value="-F${legacy_sdkroot}/System/Library/Frameworks -arch ppc"/> + <property name="ppc_flags" value="-isysroot ${ppc_sdkroot}"/> <antcall target="compile"> + <param name="dstdir" location="ppc"/> + <param name="compiler" value="gcc-4.0"/> + <param name="sdkroot" location="${ppc_sdkroot}"/> + <param name="cflags" value="${universal_flags} -arch ppc -mmacosx-version-min=10.3"/> + </antcall> + <antcall target="compile"> <param name="dstdir" location="i386"/> <param name="compiler" value="gcc-4.0"/> <param name="sdkroot" location="${universal_sdkroot}"/> @@ -59,17 +65,17 @@ <param name="sdkroot" location="${universal_sdkroot}"/> <param name="cflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/> </antcall> - <antcall target="compile"> - <param name="dstdir" location="ppc"/> - <param name="compiler" value="gcc-3.3"/> - <param name="sdkroot" location="${legacy_sdkroot}"/> - <param name="cflags" value="${legacy_flags}"/> - </antcall> <exec vmlauncher="true" executable="sh" output="lwjgl.symbols" failonerror="true"> <arg path="../../platform_build/macosx_ant/build-symbol-list"/> <arg path="i386"/> </exec> <antcall target="link"> + <param name="objdir" location="ppc"/> + <param name="libname" value="liblwjgl-ppc.jnilib"/> + <param name="linker" value="gcc-4.0"/> + <param name="linkerflags" value="${universal_flags} -arch ppc -mmacosx-version-min=10.3"/> + </antcall> + <antcall target="link"> <param name="objdir" location="i386"/> <param name="libname" value="liblwjgl-i386.jnilib"/> <param name="linker" value="gcc-4.0"/> @@ -81,12 +87,6 @@ <param name="linker" value="gcc-4.0"/> <param name="linkerflags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/> </antcall> - <antcall target="link"> - <param name="objdir" location="ppc"/> - <param name="libname" value="liblwjgl-ppc.jnilib"/> - <param name="linker" value="gcc-3.3"/> - <param name="linkerflags" value="${legacy_flags} -Wl,-syslibroot -Wl,${legacy_sdkroot}"/> - </antcall> <apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" > <arg value="-create"/> <srcfile/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |