|
Lines 157-162
Link Here
|
| 157 |
<isset property="setup.noOpenGL"/> |
157 |
<isset property="setup.noOpenGL"/> |
| 158 |
</condition> |
158 |
</condition> |
| 159 |
|
159 |
|
|
|
160 |
<condition property="isLinuxARM"> |
| 161 |
<and> |
| 162 |
<istrue value="${isLinux}" /> |
| 163 |
<or> |
| 164 |
<os arch="arm" /> |
| 165 |
<os arch="armv4" /> |
| 166 |
<os arch="armv5" /> |
| 167 |
<os arch="armv6" /> |
| 168 |
<os arch="armv7" /> |
| 169 |
</or> |
| 170 |
</and> |
| 171 |
</condition> |
| 172 |
|
| 160 |
<property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.opengl}" /> |
173 |
<property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.opengl}" /> |
| 161 |
<echo message="java.excludes.all: ${java.excludes.all}" /> |
174 |
<echo message="java.excludes.all: ${java.excludes.all}" /> |
| 162 |
|
175 |
|
|
Lines 265-271
Link Here
|
| 265 |
<includepath path="/usr/local/include" /> |
278 |
<includepath path="/usr/local/include" /> |
| 266 |
</compiler> |
279 |
</compiler> |
| 267 |
|
280 |
|
| 268 |
<compiler id="compiler.cfg.linux.armv6.newt.x11" extends="compiler.cfg.linux.armv6"> |
281 |
<compiler id="compiler.cfg.linux.arm.newt.x11" extends="compiler.cfg.linux"> |
| 269 |
<!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> |
282 |
<!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> |
| 270 |
<compilerarg value="-idirafter" /> |
283 |
<compilerarg value="-idirafter" /> |
| 271 |
<compilerarg value="/usr/include" /> |
284 |
<compilerarg value="/usr/include" /> |
|
Lines 320-332
Link Here
|
| 320 |
<!--syslibset libs="X11-xcb" /--> |
333 |
<!--syslibset libs="X11-xcb" /--> |
| 321 |
</linker> |
334 |
</linker> |
| 322 |
|
335 |
|
| 323 |
<linker id="linker.cfg.linux.armv6.newt.x11" extends="linker.cfg.linux.armv6"> |
336 |
<linker id="linker.cfg.linux.arm.newt.x11" extends="linker.cfg.linux"> |
| 324 |
<syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> |
337 |
<syslibset libs="X11" /> |
| 325 |
<syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" /> |
338 |
<syslibset libs="Xrandr" /> |
| 326 |
</linker> |
339 |
</linker> |
| 327 |
|
340 |
|
| 328 |
<linker id="linker.cfg.android.newt" extends="linker.cfg.android"> |
341 |
<linker id="linker.cfg.android.newt" extends="linker.cfg.android"> |
| 329 |
<syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" /> |
342 |
<syslibset libs="android" /> |
| 330 |
</linker> |
343 |
</linker> |
| 331 |
|
344 |
|
| 332 |
<linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris"> |
345 |
<linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris"> |
|
Lines 410-420
Link Here
|
| 410 |
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
423 |
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
| 411 |
</target> |
424 |
</target> |
| 412 |
|
425 |
|
| 413 |
<target name="c.configure.linux.armv6" if="isLinuxARMv6"> |
426 |
<target name="c.configure.linux.arm" if="isLinuxARM"> |
| 414 |
<echo message="Linux.armv6" /> |
427 |
<echo message="Linux.arm" /> |
| 415 |
<property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.newt.x11" /> |
428 |
<property name="compiler.cfg.id" value="compiler.cfg.linux.arm.newt.x11" /> |
| 416 |
<condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.newt.x11" |
429 |
<condition property="linker.cfg.id.oswin" value="linker.cfg.linux.arm.newt.x11" |
| 417 |
else="linker.cfg.linux.armv6"> |
430 |
else="linker.cfg.linux.arm"> |
| 418 |
<isset property="isX11" /> |
431 |
<isset property="isX11" /> |
| 419 |
</condition> |
432 |
</condition> |
| 420 |
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
433 |
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> |
|
Lines 486-492
Link Here
|
| 486 |
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" /> |
499 |
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" /> |
| 487 |
</target> |
500 |
</target> |
| 488 |
|
501 |
|
| 489 |
<target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> |
502 |
<target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.arm,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> |
| 490 |
|
503 |
|
| 491 |
<target name="c.configure.android" if="isAndroid"> |
504 |
<target name="c.configure.android" if="isAndroid"> |
| 492 |
<echo message="Android" /> |
505 |
<echo message="Android" /> |