Lines 1-16
Link Here
|
1 |
Obtained from http://foo.poildetroll.net/minecraft/lwjgl-2.7.1-freebsd.diff |
1 |
--- platform_build/linux_ant/build.xml.orig |
2 |
|
2 |
+++ platform_build/linux_ant/build.xml |
3 |
|
|
|
4 |
--- ./platform_build/linux_ant/build.xml.orig 2011-02-06 19:22:44.000000000 +0000 |
5 |
+++ ./platform_build/linux_ant/build.xml 2012-03-26 18:14:03.120371531 +0000 |
6 |
@@ -4,8 +4,8 @@ |
3 |
@@ -4,8 +4,8 @@ |
7 |
<property name="native" location="../../src/native"/> |
4 |
<property name="native" location="../../src/native"/> |
8 |
<property name="libname32" value="liblwjgl.so"/> |
5 |
<property name="libname32" value="liblwjgl.so"/> |
9 |
<property name="libname64" value="liblwjgl64.so"/> |
6 |
<property name="libname64" value="liblwjgl64.so"/> |
10 |
- <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" /> |
7 |
- <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" /> |
11 |
- <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" /> |
8 |
- <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" /> |
12 |
+ <property name="libs32" value="-L/usr/lib -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" /> |
9 |
+ <property name="libs32" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -pthread -L${java.home}/lib/i386 -ljawt" /> |
13 |
+ <property name="libs64" value="-L/usr/lib -L/usr/local/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" /> |
10 |
+ <property name="libs64" value="-LPREFIX/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -pthread -L${java.home}/lib/amd64 -ljawt" /> |
14 |
<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> |
11 |
<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> |
15 |
|
12 |
|
16 |
<target name="clean"> |
13 |
<target name="clean"> |
Lines 43-75
Link Here
|
43 |
</condition> |
40 |
</condition> |
44 |
|
41 |
|
45 |
<antcall target="compile32"/> |
42 |
<antcall target="compile32"/> |
46 |
@@ -69,11 +76,14 @@ |
43 |
@@ -72,10 +79,12 @@ |
47 |
<arg line="${cflags32} ${cflags_pthread}"/> |
|
|
48 |
<arg value="-I${java.home}/include"/> |
49 |
<arg value="-I${java.home}/include/linux"/> |
50 |
+ <arg value="-I${java.home}/include/freebsd"/> |
51 |
<arg value="-I${java.home}/../include"/> |
44 |
<arg value="-I${java.home}/../include"/> |
52 |
<arg value="-I${java.home}/../include/linux"/> |
45 |
<arg value="-I${java.home}/../include/linux"/> |
53 |
<arg value="-I${java.home}/../include/solaris"/> |
46 |
<arg value="-I${java.home}/../include/solaris"/> |
54 |
+ <arg value="-I${java.home}/../include/freebsd"/> |
47 |
+ <arg value="-I${java.home}/../include/freebsd"/> |
55 |
<arg value="-I${native}/common"/> |
48 |
<arg value="-I${native}/common"/> |
|
|
49 |
<arg value="-I${native}/common/opengl"/> |
56 |
<arg value="-I${native}/linux"/> |
50 |
<arg value="-I${native}/linux"/> |
57 |
+ <arg value="-I/usr/local/include"/> |
51 |
<arg value="-I${native}/linux/opengl"/> |
|
|
52 |
+ <arg value="-IPREFIX/include"/> |
58 |
<mapper type="glob" from="*.c" to="*.o"/> |
53 |
<mapper type="glob" from="*.c" to="*.o"/> |
59 |
<fileset dir="${native}/linux" includes="*.c"/> |
54 |
<fileset dir="${native}/common" includes="*.c"/> |
60 |
<fileset dir="${native}/generated" includes="*.c"/> |
55 |
<fileset dir="${native}/common/opengl" includes="*.c"/> |
61 |
@@ -95,11 +105,14 @@ |
56 |
@@ -104,10 +113,12 @@ |
62 |
<arg line="${cflags64} ${cflags_pthread}"/> |
|
|
63 |
<arg value="-I${java.home}/include"/> |
64 |
<arg value="-I${java.home}/include/linux"/> |
65 |
+ <arg value="-I${java.home}/include/freebsd"/> |
66 |
<arg value="-I${java.home}/../include"/> |
57 |
<arg value="-I${java.home}/../include"/> |
67 |
<arg value="-I${java.home}/../include/linux"/> |
58 |
<arg value="-I${java.home}/../include/linux"/> |
68 |
<arg value="-I${java.home}/../include/solaris"/> |
59 |
<arg value="-I${java.home}/../include/solaris"/> |
69 |
+ <arg value="-I${java.home}/../include/freebsd"/> |
60 |
+ <arg value="-I${java.home}/../include/freebsd"/> |
70 |
<arg value="-I${native}/common"/> |
61 |
<arg value="-I${native}/common"/> |
|
|
62 |
<arg value="-I${native}/common/opengl"/> |
71 |
<arg value="-I${native}/linux"/> |
63 |
<arg value="-I${native}/linux"/> |
72 |
+ <arg value="-I/usr/local/include"/> |
64 |
<arg value="-I${native}/linux/opengl"/> |
|
|
65 |
+ <arg value="-IPREFIX/include"/> |
73 |
<mapper type="glob" from="*.c" to="*.o"/> |
66 |
<mapper type="glob" from="*.c" to="*.o"/> |
74 |
<fileset dir="${native}/linux" includes="*.c"/> |
67 |
<fileset dir="${native}/common" includes="*.c"/> |
75 |
<fileset dir="${native}/generated" includes="*.c"/> |
68 |
<fileset dir="${native}/common/opengl" includes="*.c"/> |