diff options
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 88c876e5d..7ba8f74fc 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -124,28 +124,31 @@ <!-- Set swt.jar to the correct file for this platform. We point to the debug JARs to allow stepping into SWT calls using the accompanying source code zip archives. --> - <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86_64/swt-debug.jar"> + <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86_64/swt.jar"> <istrue value="${isWindowsAMD64}" /> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar"> - <istrue value="${isWindowsX86}" /> + <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt.jar"> + <istrue value="${isWindowsX86}" /> <!-- no more supported since SWT 4.10 --> </condition> <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar"> <istrue value="${isFreeBSDAMD64}" /> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar"> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt.jar"> <istrue value="${isLinuxAMD64}" /> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> - <istrue value="${isLinuxX86}" /> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt.jar"> + <istrue value="${isLinuxX86}" /> <!-- no more supported since SWT 4.10 --> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt.jar"> + <istrue value="${isLinuxARM64}" /> <!-- FIXME JAU .. hack --> + </condition> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt.jar"> <istrue value="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack --> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt.jar"> <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack --> </condition> - <property name="swt-cocoa-macosx-x86_64.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar"/> + <property name="swt-cocoa-macosx-x86_64.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt.jar"/> <condition property="swt.jar" value="${swt-cocoa-macosx-x86_64.jar}"> <and> <istrue value="${isOSX}" /> @@ -155,8 +158,8 @@ </or> </and> </condition> - <property name="swt-cocoa-macosx-x86_32.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar"/> - <condition property="swt.jar" value="${swt-cocoa-macosx-x86_32.jar}"> + <property name="swt-cocoa-macosx-x86_32.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt.jar"/> + <condition property="swt.jar" value="${swt-cocoa-macosx-x86_32.jar}"> <!-- no more supported since SWT 4.10 --> <and> <istrue value="${isOSX}" /> <or> @@ -165,17 +168,17 @@ </or> </and> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar"> - <istrue value="${isSolarisX86}" /> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt.jar"> + <istrue value="${isSolarisX86}" /> <!-- no more supported --> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar"> - <istrue value="${isSolarisAMD64}" /> <!-- FIXME JAU .. hack --> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86_64/swt.jar"> + <istrue value="${isSolarisAMD64}" /> <!-- no more supported --> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar"> - <istrue value="${isSolarisSparc}" /> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt.jar"> + <istrue value="${isSolarisSparc}" /> <!-- no more supported --> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar"> - <istrue value="${isSolarisSparcv9}" /> <!-- FIXME JAU .. hack --> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparcv9/swt.jar"> + <istrue value="${isSolarisSparcv9}" /> <!-- no more supported --> </condition> <echo message="swt.jar=${swt.jar}" /> @@ -388,6 +391,7 @@ <property name="newt-ogl.jar" value="${build.newt}/newt-ogl.jar" /> <property name="newt-awt.jar" value="${build.newt}/newt-awt.jar" /> <property name="newt-swt.jar" value="${build.newt}/newt-swt.jar" /> + <property name="newt-javafx.jar" value="${build.newt}/newt-javafx.jar" /> <property name="newt-event.jar" value="${build.newt}/newt-event.jar" /> <!-- using NEWT events w/o NEWT --> <property name="newt-driver-linux.jar" value="${build.newt}/newt-driver-linux.jar" /> <property name="newt-driver-x11.jar" value="${build.newt}/newt-driver-x11.jar" /> @@ -403,6 +407,7 @@ <pathelement location="${newt-ogl.jar}" /> <pathelement location="${newt-awt.jar}" /> <pathelement location="${newt-swt.jar}" /> + <pathelement location="${newt-javafx.jar}" /> <pathelement location="${newt-driver-linux.jar}" /> <pathelement location="${newt-driver-x11.jar}" /> <pathelement location="${newt-driver-win.jar}" /> |