1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
--- jogl/make/build-jogl.xml.orig 2015-10-10 01:08:14 UTC
+++ jogl/make/build-jogl.xml
@@ -1184,9 +1184,9 @@
<!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
<compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
- <!-- Need to force X11R6 headers on to include path after stub_includes -->
- <includepath path="stub_includes/opengl"/>
- <includepath path="/usr/local/include" />
+ <!-- Force /usr/local/include headers on to include path after all others to fix build with clang -->
+ <compilerarg value="-idirafter" />
+ <compilerarg value="/usr/local/include" />
</compiler>
<compiler id="compiler.cfg.linux.armv6.jogl.x11" extends="compiler.cfg.linux.armv6">
@@ -1203,7 +1203,7 @@
<!-- linker configuration -->
- <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
+ <linker id="linker.cfg.freebsd.x86.jogl.x11" extends="linker.cfg.freebsd.x86">
<syslibset dir="/usr/local/lib" libs="X11"/>
</linker>
@@ -1401,7 +1401,7 @@
<target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
<echo message="FreeBSD" />
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" />
- <property name="linker.cfg.id.os" value="linker.cfg.freebsd.jogl.x11" />
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.x86.jogl.x11" />
</target>
<target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
--- jogl/make/build-nativewindow.xml.orig 2015-10-10 01:08:14 UTC
+++ jogl/make/build-nativewindow.xml
@@ -373,7 +373,7 @@
<!-- linker configuration -->
- <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd">
+ <linker id="linker.cfg.freebsd.x86.nativewindow.x11" extends="linker.cfg.freebsd.x86">
<syslibset dir="/usr/local/lib" libs="X11"/>
<syslibset dir="/usr/local/lib" libs="Xxf86vm" />
<syslibset dir="/usr/local/lib" libs="Xrender"/>
@@ -582,7 +582,7 @@
<target name="c.configure.freebsd.x86" if="isFreeBSDX86">
<echo message="FreeBSD.x86" />
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" />
- <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.nativewindow.x11" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.x86.nativewindow.x11" />
</target>
<target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
--- jogl/make/build-newt.xml.orig 2015-10-10 01:08:14 UTC
+++ jogl/make/build-newt.xml
@@ -289,7 +289,7 @@
<!-- linker configuration -->
- <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
+ <linker id="linker.cfg.freebsd.x86.newt.x11" extends="linker.cfg.freebsd.x86">
<linkerarg value="-L/usr/local/lib"/>
<syslibset libs="X11"/>
<syslibset libs="Xrandr"/>
@@ -560,8 +560,8 @@
<target name="c.configure.freebsd.x86" if="isFreeBSDX86">
<echo message="FreeBSD.x86" />
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" />
- <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.newt.x11"
- else="linker.cfg.freebsd">
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.x86.newt.x11"
+ else="linker.cfg.freebsd.x86">
<isset property="isX11" />
</condition>
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
|
