blob: e043d7eb36e8002e7746777f0ba0fab73632f774 (
plain) (
blame)
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
|
--- jogl/make/build-common.xml.orig 2015-03-27 14:58:50 UTC
+++ jogl/make/build-common.xml
@@ -130,8 +130,8 @@
<condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
<istrue value="${isWindowsX86}" />
</condition>
- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar">
- <istrue value="${isFreeBSDAMD64}" />
+ <condition property="swt.jar" value="%%JAVALIBDIR%%/swt.jar">
+ <istrue value="${isFreeBSD}" />
</condition>
<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
<istrue value="${isLinuxAMD64}" />
@@ -210,7 +210,7 @@
<property name="gluegen.build.xml" value="${gluegen.make}/build.xml" />
<property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" />
<property name="obj.gluegen" value="${build.gluegen}/obj"/>
- <property name="gluegen.jar" value="${build.gluegen}/gluegen.jar" />
+ <property name="gluegen.jar" value="${build.gluegen}/gluegen2.jar" />
<property name="build.joal" value="${joal.root}/${rootrel.build}" /> <!-- optional -->
@@ -434,7 +434,7 @@
</path>
<!-- JavaSE combinations -->
- <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" />
+ <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen2-rt.jar" />
<property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" />
<property name="gluegen-test-util.jar" value="${build.gluegen}/gluegen-test-util.jar" />
<property name="jogl-test.jar" value="${jar}/jogl-test.jar"/>
|
