Menu
▾
▴
java-game-lib-cvs
|
From: <eli...@us...> - 2006-11-14 08:36:41
|
Revision: 2642
http://svn.sourceforge.net/java-game-lib/?rev=2642&view=rev
Author: elias_naur
Date: 2006-11-14 00:36:31 -0800 (Tue, 14 Nov 2006)
Log Message:
-----------
Mac OS X: Explicitly state the legacy build of lwjgl should be for the PPC architecture. This could fix the build problems on intel macs
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-11-13 12:21:31 UTC (rev 2641)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2006-11-14 08:36:31 UTC (rev 2642)
@@ -43,6 +43,7 @@
<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
<property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
<property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
+ <property name="legacy_flags" value="-arch ppc"/>
<antcall target="compile">
<param name="dstdir" location="intel"/>
<param name="compiler" value="gcc-4.0"/>
@@ -53,7 +54,7 @@
<param name="dstdir" location="ppc"/>
<param name="compiler" value="gcc-3.3"/>
<param name="sdkroot" location="${legacy_sdkroot}"/>
- <param name="cflags" value=""/>
+ <param name="cflags" value="${legacy_flags}"/>
</antcall>
<exec vmlauncher="false" executable="../../platform_build/macosx_ant/build-symbol-list" output="lwjgl.symbols" failonerror="true">
<arg path="intel"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-14 09:20:32
|
Revision: 2643
http://svn.sourceforge.net/java-game-lib/?rev=2643&view=rev
Author: elias_naur
Date: 2006-11-14 01:20:24 -0800 (Tue, 14 Nov 2006)
Log Message:
-----------
Mac OS X: Fix to intel mac 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 2006-11-14 08:36:31 UTC (rev 2642)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2006-11-14 09:20:24 UTC (rev 2643)
@@ -69,7 +69,7 @@
<param name="objdir" location="ppc"/>
<param name="libname" value="liblwjgl-ppc.jnilib"/>
<param name="linker" value="gcc-3.3"/>
- <param name="linkerflags" value=""/>
+ <param name="linkerflags" value="${legacy_flags}"/>
</antcall>
<apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
<arg value="-create"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2007-04-08 21:33:37
|
Revision: 2761
http://svn.sourceforge.net/java-game-lib/?rev=2761&view=rev
Author: elias_naur
Date: 2007-04-08 14:33:35 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
Mac OS X: Fix native compilation error by forcing all native source to be Objective C. This is needed the jawt headers use Objective C features
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 2007-04-07 19:14:40 UTC (rev 2760)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2007-04-08 21:33:35 UTC (rev 2761)
@@ -18,7 +18,7 @@
<target name="compile">
<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
- <arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/macosx"/>
+ <arg line="${cflags} -ObjC -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/macosx"/>
<!-- Map from *.m and *.c to .o -->
<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
<fileset dir="${native}/macosx" includes="*.m"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2007-07-30 05:22:48
|
Revision: 2865
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2865&view=rev
Author: elias_naur
Date: 2007-07-29 22:22:46 -0700 (Sun, 29 Jul 2007)
Log Message:
-----------
Mac OS X: Added the -Wunused gcc flag
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 2007-07-30 05:15:02 UTC (rev 2864)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2007-07-30 05:22:46 UTC (rev 2865)
@@ -18,7 +18,7 @@
<target name="compile">
<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
- <arg line="${cflags} -ObjC -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/macosx"/>
+ <arg line="${cflags} -ObjC -O2 -Wall -Wunused -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/macosx"/>
<!-- Map from *.m and *.c to .o -->
<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
<fileset dir="${native}/macosx" includes="*.m"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-01-25 10:46:22
|
Revision: 2959
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2959&view=rev
Author: elias_naur
Date: 2008-01-25 02:46:18 -0800 (Fri, 25 Jan 2008)
Log Message:
-----------
Mac OS X: Let gcc-3.3 build against 10.4 universal sdk
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-01-21 22:56:37 UTC (rev 2958)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2008-01-25 10:46:18 UTC (rev 2959)
@@ -41,9 +41,9 @@
<target name="nativelibrary" depends="init">
<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
- <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
+ <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
<property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
- <property name="legacy_flags" value="-arch ppc"/>
+ <property name="legacy_flags" value="-F${legacy_sdkroot}/System/Library/Frameworks -arch ppc"/>
<antcall target="compile">
<param name="dstdir" location="intel"/>
<param name="compiler" value="gcc-4.0"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-04-07 11:30:46
|
Revision: 2974
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2974&view=rev
Author: elias_naur
Date: 2008-04-07 04:30:43 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Mac OS X: 10.5 build fixes
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-04-07 10:18:09 UTC (rev 2973)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2008-04-07 11:30:43 UTC (rev 2974)
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+
<project name="OS X Native code" basedir="../../bin/lwjgl" default="nativelibrary">
<property name="native" location="../../src/native"/>
@@ -30,7 +30,7 @@
<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"/>
+ <arg line="${linkerflags} -mmacosx-version-min=10.4 -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">
@@ -42,7 +42,7 @@
<target name="nativelibrary" depends="init">
<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
<property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
- <property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
+ <property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386 -mmacosx-version-min=10.4"/>
<property name="legacy_flags" value="-F${legacy_sdkroot}/System/Library/Frameworks -arch ppc"/>
<antcall target="compile">
<param name="dstdir" location="intel"/>
@@ -56,7 +56,8 @@
<param name="sdkroot" location="${legacy_sdkroot}"/>
<param name="cflags" value="${legacy_flags}"/>
</antcall>
- <exec vmlauncher="false" executable="../../platform_build/macosx_ant/build-symbol-list" output="lwjgl.symbols" failonerror="true">
+ <exec vmlauncher="true" executable="sh" output="lwjgl.symbols" failonerror="true">
+ <arg path="../../platform_build/macosx_ant/build-symbol-list"/>
<arg path="intel"/>
</exec>
<antcall target="link">
@@ -69,7 +70,7 @@
<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}"/>
+ <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"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-04-07 11:48:23
|
Revision: 2975
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2975&view=rev
Author: elias_naur
Date: 2008-04-07 04:48:20 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Mac OS X: Added support for x86_64
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-04-07 11:30:43 UTC (rev 2974)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2008-04-07 11:48:20 UTC (rev 2975)
@@ -4,12 +4,14 @@
<target name="init">
<mkdir dir="ppc"/>
- <mkdir dir="intel"/>
+ <mkdir dir="i386"/>
+ <mkdir dir="x86_64"/>
</target>
<target name="clean">
<delete failonerror="false">
- <fileset dir="intel"/>
+ <fileset dir="i386"/>
+ <fileset dir="x86_64"/>
<fileset dir="ppc"/>
<fileset dir="." includes="liblwjgl.jnilib"/>
<fileset dir="." includes="lwjgl.symbols"/>
@@ -41,16 +43,23 @@
<target name="nativelibrary" depends="init">
<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.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} -arch i386 -mmacosx-version-min=10.4"/>
+ <property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
<property name="legacy_flags" value="-F${legacy_sdkroot}/System/Library/Frameworks -arch ppc"/>
<antcall target="compile">
- <param name="dstdir" location="intel"/>
+ <param name="dstdir" location="i386"/>
<param name="compiler" value="gcc-4.0"/>
<param name="sdkroot" location="${universal_sdkroot}"/>
- <param name="cflags" value="${universal_flags}"/>
+ <param name="cflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.4"/>
</antcall>
<antcall target="compile">
+ <param name="dstdir" location="x86_64"/>
+ <param name="compiler" value="gcc-4.0"/>
+ <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}"/>
@@ -58,15 +67,21 @@
</antcall>
<exec vmlauncher="true" executable="sh" output="lwjgl.symbols" failonerror="true">
<arg path="../../platform_build/macosx_ant/build-symbol-list"/>
- <arg path="intel"/>
+ <arg path="i386"/>
</exec>
<antcall target="link">
- <param name="objdir" location="intel"/>
- <param name="libname" value="liblwjgl-intel.jnilib"/>
+ <param name="objdir" location="i386"/>
+ <param name="libname" value="liblwjgl-i386.jnilib"/>
<param name="linker" value="gcc-4.0"/>
- <param name="linkerflags" value="${universal_flags}"/>
+ <param name="linkerflags" value="${universal_flags} -arch i386 -mmacosx-version-min=10.4"/>
</antcall>
<antcall target="link">
+ <param name="objdir" location="x86_64"/>
+ <param name="libname" value="liblwjgl-i86_64.jnilib"/>
+ <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"/>
@@ -78,7 +93,8 @@
<arg value="-output"/>
<arg path="liblwjgl.jnilib"/>
<fileset file="ppc/liblwjgl-ppc.jnilib"/>
- <fileset file="intel/liblwjgl-intel.jnilib"/>
+ <fileset file="i386/liblwjgl-i386.jnilib"/>
+ <fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
</apply>
</target>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
Thanks for helping keep SourceForge clean.
X