summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2020-01-04 21:01:22 +0100
committerSven Gothel <[email protected]>2020-01-04 21:01:22 +0100
commitc9e85c8effac97d679891219cae6918ff561c368 (patch)
treec4ad9463f1b85a583f61fb8ea904a1d9ea7c88a8 /make
parentb15522b677b8473b2eb193f6d9484687b894e5a7 (diff)
swt.jar: On linux-i586 and windows-i586 we have to use any 64bit for compilation - as 32bit builds are no more supported since SWT 4.10
Diffstat (limited to 'make')
-rw-r--r--make/build-common.xml8
1 files changed, 2 insertions, 6 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index b6bf47fc5..0d2f7e9e2 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -151,20 +151,16 @@
<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.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.jar">
<istrue value="${isLinuxAMD64}" />
</condition>
- <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_64/swt.jar">
<or>
+ <istrue value="${isWindowsX86}" /> <!-- FIXME JAU .. hack -->
+ <istrue value="${isLinuxX86}" /> <!-- FIXME JAU .. hack -->
<istrue value="${isLinuxARM64}" /> <!-- FIXME JAU .. hack -->
<istrue value="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack -->
<istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->