Lines 22-39
Link Here
|
22 |
<syslibset dir="/usr/local/lib" libs="X11"/> |
22 |
<syslibset dir="/usr/local/lib" libs="X11"/> |
23 |
</linker> |
23 |
</linker> |
24 |
|
24 |
|
25 |
@@ -1211,6 +1211,10 @@ |
25 |
@@ -1211,6 +1211,14 @@ |
26 |
<syslibset dir="/usr/local/lib" libs="X11"/> |
26 |
<syslibset dir="/usr/local/lib" libs="X11"/> |
27 |
</linker> |
27 |
</linker> |
28 |
|
28 |
|
29 |
+ <linker id="linker.cfg.freebsd.ppc.jogl.x11" extends="linker.cfg.freebsd.ppc"> |
29 |
+ <linker id="linker.cfg.freebsd.ppc64.jogl.x11" extends="linker.cfg.freebsd.ppc64"> |
30 |
+ <syslibset dir="/usr/local/lib" libs="X11"/> |
30 |
+ <syslibset dir="/usr/local/lib" libs="X11"/> |
31 |
+ </linker> |
31 |
+ </linker> |
32 |
+ |
32 |
+ |
|
|
33 |
+ <linker id="linker.cfg.freebsd.ppc64le.jogl.x11" extends="linker.cfg.freebsd.ppc64le"> |
34 |
+ <syslibset dir="/usr/local/lib" libs="X11"/> |
35 |
+ </linker> |
36 |
+ |
33 |
<linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux"> |
37 |
<linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux"> |
34 |
<syslibset libs="X11"/> |
38 |
<syslibset libs="X11"/> |
35 |
</linker> |
39 |
</linker> |
36 |
@@ -1401,7 +1405,7 @@ |
40 |
@@ -1401,7 +1409,7 @@ |
37 |
<target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86"> |
41 |
<target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86"> |
38 |
<echo message="FreeBSD" /> |
42 |
<echo message="FreeBSD" /> |
39 |
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> |
43 |
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> |
Lines 42-59
Link Here
|
42 |
</target> |
46 |
</target> |
43 |
|
47 |
|
44 |
<target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64"> |
48 |
<target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64"> |
45 |
@@ -1410,7 +1414,13 @@ |
49 |
@@ -1410,7 +1418,19 @@ |
46 |
<property name="linker.cfg.id.os" value="linker.cfg.freebsd.amd64.jogl.x11" /> |
50 |
<property name="linker.cfg.id.os" value="linker.cfg.freebsd.amd64.jogl.x11" /> |
47 |
</target> |
51 |
</target> |
48 |
|
52 |
|
49 |
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> |
53 |
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> |
50 |
+ <target name="c.configure.freebsd.ppc" depends="c.configure.x11" if="isFreeBSDPpc"> |
54 |
+ <target name="c.configure.freebsd.ppc64" depends="c.configure.x11" if="isFreeBSDPpc64"> |
51 |
+ <echo message="FreeBSD" /> |
55 |
+ <echo message="FreeBSD" /> |
52 |
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> |
56 |
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> |
53 |
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc.jogl.x11" /> |
57 |
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64.jogl.x11" /> |
54 |
+ </target> |
58 |
+ </target> |
55 |
+ |
59 |
+ |
56 |
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD" /> |
60 |
+ <target name="c.configure.freebsd.ppc64le" depends="c.configure.x11" if="isFreeBSDPpc64le"> |
|
|
61 |
+ <echo message="FreeBSD" /> |
62 |
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> |
63 |
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64le.jogl.x11" /> |
64 |
+ </target> |
65 |
+ |
66 |
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD" /> |
57 |
|
67 |
|
58 |
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> |
68 |
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> |
59 |
<echo message="HP-UX" /> |
69 |
<echo message="HP-UX" /> |
Lines 68-87
Link Here
|
68 |
<syslibset dir="/usr/local/lib" libs="X11"/> |
78 |
<syslibset dir="/usr/local/lib" libs="X11"/> |
69 |
<syslibset dir="/usr/local/lib" libs="Xxf86vm" /> |
79 |
<syslibset dir="/usr/local/lib" libs="Xxf86vm" /> |
70 |
<syslibset dir="/usr/local/lib" libs="Xrender"/> |
80 |
<syslibset dir="/usr/local/lib" libs="Xrender"/> |
71 |
@@ -385,6 +385,12 @@ |
81 |
@@ -385,6 +385,18 @@ |
72 |
<syslibset dir="/usr/local/lib" libs="Xrender"/> |
82 |
<syslibset dir="/usr/local/lib" libs="Xrender"/> |
73 |
</linker> |
83 |
</linker> |
74 |
|
84 |
|
75 |
+ <linker id="linker.cfg.freebsd.ppc.nativewindow.x11" extends="linker.cfg.freebsd.ppc"> |
85 |
+ <linker id="linker.cfg.freebsd.ppc64.nativewindow.x11" extends="linker.cfg.freebsd.ppc64"> |
76 |
+ <syslibset dir="/usr/local/lib" libs="X11" /> |
86 |
+ <syslibset dir="/usr/local/lib" libs="X11" /> |
77 |
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> |
87 |
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> |
78 |
+ <syslibset dir="/usr/local/lib" libs="Xrender"/> |
88 |
+ <syslibset dir="/usr/local/lib" libs="Xrender"/> |
79 |
+ </linker> |
89 |
+ </linker> |
80 |
+ |
90 |
+ |
|
|
91 |
+ <linker id="linker.cfg.freebsd.ppc64le.nativewindow.x11" extends="linker.cfg.freebsd.ppc64le"> |
92 |
+ <syslibset dir="/usr/local/lib" libs="X11" /> |
93 |
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> |
94 |
+ <syslibset dir="/usr/local/lib" libs="Xrender"/> |
95 |
+ </linker> |
96 |
+ |
81 |
<linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux"> |
97 |
<linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux"> |
82 |
<syslibset libs="X11"/> |
98 |
<syslibset libs="X11"/> |
83 |
<syslibset libs="Xxf86vm" /> |
99 |
<syslibset libs="Xxf86vm" /> |
84 |
@@ -582,7 +588,7 @@ |
100 |
@@ -582,7 +594,7 @@ |
85 |
<target name="c.configure.freebsd.x86" if="isFreeBSDX86"> |
101 |
<target name="c.configure.freebsd.x86" if="isFreeBSDX86"> |
86 |
<echo message="FreeBSD.x86" /> |
102 |
<echo message="FreeBSD.x86" /> |
87 |
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> |
103 |
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> |
Lines 90-108
Link Here
|
90 |
</target> |
106 |
</target> |
91 |
|
107 |
|
92 |
<target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64"> |
108 |
<target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64"> |
93 |
@@ -590,8 +596,14 @@ |
109 |
@@ -590,8 +602,20 @@ |
94 |
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> |
110 |
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> |
95 |
<property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.nativewindow.x11" /> |
111 |
<property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.nativewindow.x11" /> |
96 |
</target> |
112 |
</target> |
97 |
+ |
113 |
+ |
98 |
+ <target name="c.configure.freebsd.ppc" if="isFreeBSDPpc"> |
114 |
+ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64"> |
99 |
+ <echo message="FreeBSD.Ppc" /> |
115 |
+ <echo message="FreeBSD.Ppc64" /> |
100 |
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> |
116 |
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> |
101 |
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc.nativewindow.x11" /> |
117 |
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.nativewindow.x11" /> |
102 |
+ </target> |
118 |
+ </target> |
103 |
|
119 |
|
104 |
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> |
120 |
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> |
105 |
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD" /> |
121 |
+ <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le"> |
|
|
122 |
+ <echo message="FreeBSD.Ppc64le" /> |
123 |
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> |
124 |
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.nativewindow.x11" /> |
125 |
+ </target> |
126 |
+ |
127 |
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD" /> |
106 |
|
128 |
|
107 |
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> |
129 |
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> |
108 |
<echo message="HP-UX" /> |
130 |
<echo message="HP-UX" /> |
Lines 117-127
Link Here
|
117 |
<linkerarg value="-L/usr/local/lib"/> |
139 |
<linkerarg value="-L/usr/local/lib"/> |
118 |
<syslibset libs="X11"/> |
140 |
<syslibset libs="X11"/> |
119 |
<syslibset libs="Xrandr"/> |
141 |
<syslibset libs="Xrandr"/> |
120 |
@@ -303,6 +303,13 @@ |
142 |
@@ -303,6 +303,20 @@ |
121 |
<syslibset libs="Xcursor"/> |
143 |
<syslibset libs="Xcursor"/> |
122 |
</linker> |
144 |
</linker> |
123 |
|
145 |
|
124 |
+ <linker id="linker.cfg.freebsd.ppc.newt.x11" extends="linker.cfg.freebsd.ppc"> |
146 |
+ <linker id="linker.cfg.freebsd.ppc64.newt.x11" extends="linker.cfg.freebsd.ppc64"> |
125 |
+ <linkerarg value="-L/usr/local/lib"/> |
147 |
+ <linkerarg value="-L/usr/local/lib"/> |
126 |
+ <syslibset libs="X11"/> |
148 |
+ <syslibset libs="X11"/> |
127 |
+ <syslibset libs="Xrandr"/> |
149 |
+ <syslibset libs="Xrandr"/> |
Lines 128-137
Link Here
|
128 |
+ <syslibset libs="Xcursor"/> |
150 |
+ <syslibset libs="Xcursor"/> |
129 |
+ </linker> |
151 |
+ </linker> |
130 |
+ |
152 |
+ |
|
|
153 |
+ <linker id="linker.cfg.freebsd.ppc64le.newt.x11" extends="linker.cfg.freebsd.ppc64le"> |
154 |
+ <linkerarg value="-L/usr/local/lib"/> |
155 |
+ <syslibset libs="X11"/> |
156 |
+ <syslibset libs="Xrandr"/> |
157 |
+ <syslibset libs="Xcursor"/> |
158 |
+ </linker> |
159 |
+ |
131 |
<linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux"> |
160 |
<linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux"> |
132 |
<syslibset libs="EGL"/> |
161 |
<syslibset libs="EGL"/> |
133 |
<syslibset libs="GLES_CM"/> |
162 |
<syslibset libs="GLES_CM"/> |
134 |
@@ -560,8 +567,8 @@ |
163 |
@@ -560,8 +574,8 @@ |
135 |
<target name="c.configure.freebsd.x86" if="isFreeBSDX86"> |
164 |
<target name="c.configure.freebsd.x86" if="isFreeBSDX86"> |
136 |
<echo message="FreeBSD.x86" /> |
165 |
<echo message="FreeBSD.x86" /> |
137 |
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> |
166 |
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> |
Lines 142-163
Link Here
|
142 |
<isset property="isX11" /> |
171 |
<isset property="isX11" /> |
143 |
</condition> |
172 |
</condition> |
144 |
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
173 |
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
145 |
@@ -577,7 +584,17 @@ |
174 |
@@ -577,7 +591,27 @@ |
146 |
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
175 |
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
147 |
</target> |
176 |
</target> |
148 |
|
177 |
|
149 |
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/> |
178 |
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/> |
150 |
+ <target name="c.configure.freebsd.ppc" if="isFreeBSDPpc"> |
179 |
+ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64"> |
151 |
+ <echo message="FreeBSD.Ppc" /> |
180 |
+ <echo message="FreeBSD.Ppc64" /> |
152 |
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> |
181 |
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> |
153 |
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc.newt.x11" |
182 |
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.newt.x11" |
154 |
+ else="linker.cfg.freebsd.ppc"> |
183 |
+ else="linker.cfg.freebsd.ppc64"> |
155 |
+ <isset property="isX11" /> |
184 |
+ <isset property="isX11" /> |
156 |
+ </condition> |
185 |
+ </condition> |
157 |
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
186 |
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
158 |
+ </target> |
187 |
+ </target> |
159 |
+ |
188 |
+ |
160 |
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD"/> |
189 |
+ <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le"> |
|
|
190 |
+ <echo message="FreeBSD.Ppc64le" /> |
191 |
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> |
192 |
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.newt.x11" |
193 |
+ else="linker.cfg.freebsd.ppc64le"> |
194 |
+ <isset property="isX11" /> |
195 |
+ </condition> |
196 |
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
197 |
+ </target> |
198 |
+ |
199 |
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD"/> |
161 |
|
200 |
|
162 |
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> |
201 |
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> |
163 |
<echo message="HP-UX" /> |
202 |
<echo message="HP-UX" /> |