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
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
|
--- 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>
@@ -1211,6 +1211,10 @@
<syslibset dir="/usr/local/lib" libs="X11"/>
</linker>
+ <linker id="linker.cfg.freebsd.ppc.jogl.x11" extends="linker.cfg.freebsd.ppc">
+ <syslibset dir="/usr/local/lib" libs="X11"/>
+ </linker>
+
<linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
<syslibset libs="X11"/>
</linker>
@@ -1401,7 +1405,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">
@@ -1410,7 +1414,13 @@
<property name="linker.cfg.id.os" value="linker.cfg.freebsd.amd64.jogl.x11" />
</target>
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
+ <target name="c.configure.freebsd.ppc" depends="c.configure.x11" if="isFreeBSDPpc">
+ <echo message="FreeBSD" />
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" />
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc.jogl.x11" />
+ </target>
+
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD" />
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
<echo message="HP-UX" />
--- 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"/>
@@ -385,6 +385,12 @@
<syslibset dir="/usr/local/lib" libs="Xrender"/>
</linker>
+ <linker id="linker.cfg.freebsd.ppc.nativewindow.x11" extends="linker.cfg.freebsd.ppc">
+ <syslibset dir="/usr/local/lib" libs="X11" />
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
+ <syslibset dir="/usr/local/lib" libs="Xrender"/>
+ </linker>
+
<linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux">
<syslibset libs="X11"/>
<syslibset libs="Xxf86vm" />
@@ -582,7 +588,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">
@@ -590,8 +596,14 @@
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" />
<property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.nativewindow.x11" />
</target>
+
+ <target name="c.configure.freebsd.ppc" if="isFreeBSDPpc">
+ <echo message="FreeBSD.Ppc" />
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc.nativewindow.x11" />
+ </target>
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD" />
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
<echo message="HP-UX" />
--- 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"/>
@@ -303,6 +303,13 @@
<syslibset libs="Xcursor"/>
</linker>
+ <linker id="linker.cfg.freebsd.ppc.newt.x11" extends="linker.cfg.freebsd.ppc">
+ <linkerarg value="-L/usr/local/lib"/>
+ <syslibset libs="X11"/>
+ <syslibset libs="Xrandr"/>
+ <syslibset libs="Xcursor"/>
+ </linker>
+
<linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux">
<syslibset libs="EGL"/>
<syslibset libs="GLES_CM"/>
@@ -560,8 +567,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}" />
@@ -577,7 +584,17 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/>
+ <target name="c.configure.freebsd.ppc" if="isFreeBSDPpc">
+ <echo message="FreeBSD.Ppc" />
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" />
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc.newt.x11"
+ else="linker.cfg.freebsd.ppc">
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD"/>
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
<echo message="HP-UX" />
|
