fixed build system, to build on x86 and amd64, tested with gentoo & debian

git-svn-id: http://manut.eu/svn/yalp/trunk@13 f059d3a0-6783-47b7-97ff-1fe0bbf25129

6 files changed, 12 insertions, 10 deletions

diff --git a/ClientConfiguration.xml b/ClientConfiguration.xml
index 7eff5e7..fef3b6b 100644
--- a/ClientConfiguration.xml
+++ b/ClientConfiguration.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
- <string>127.0.0.1</string> 
- <int>5002</int> 
- <int>5001</int> 
- <string>&quot;/usr/bin/vlc&quot;</string> 
-</java> 
+<?xml version="1.0" encoding="UTF-8"?>
+<java version="1.6.0_0" class="java.beans.XMLDecoder">
+ <string>127.0.0.1</string>
+ <int>5002</int>
+ <int>5001</int>
+ <string>&quot;/usr/bin/vlc&quot;</string>
+</java>
diff --git a/build.xml b/build.xml
index eafc123..d94b0e2 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
 

 	<property name="log4jLibs" value="lib/log4j-1.2.15.jar"/>

 	<property name="vlctelnetLibs" value="lib/commons-net-1.4.1.jar"/>

-	<property name="swtLibs" value="lib/swt.jar"/>

+	<property name="swtLibs" value="/usr/lib/java/swt.jar /usr/share/swt-3/lib/swt.jar"/>

 	<property name="dbLibs" value="lib/postgresql-8.1-404.jdbc3.jar"/>

 

 	<property name="idlj" value="../idlj.sh"/>

diff --git a/client.sh b/client.sh
index ec5be80..7766aee 100755
--- a/client.sh
+++ b/client.sh
@@ -1 +1,2 @@
-java -Djava.library.path=./lib -jar yalpSWTClient.jar -ORBInitialPort 1050 -ORBInitialHost 10.0.3.20 -ORBInitRef NameService=corbaloc:iiop:10.0.3.20:1050/NameService
+export LD_LIBRARY_PATH=/usr/lib/jni
+java -Dswt.library.path=/usr/lib/java -jar yalpSWTClient.jar -ORBInitialPort 1050 -ORBInitialHost 10.0.3.20 -ORBInitRef NameService=corbaloc:iiop:10.0.3.20:1050/NameService
diff --git a/idlj.sh b/idlj.sh
index df8fd5e..e7f3123 100755
--- a/idlj.sh
+++ b/idlj.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
-/usr/bin/idlj -fall $@
+export PATH=$PATH:/opt/sun-jdk-1.6.0.07/bin
+idlj -fall $@
 #/opt/ibm-java-i386-60/bin/idlj -fall $@
diff --git a/lib/libswt-gtk-3139.so b/lib/libswt-gtk-3139.so
deleted file mode 100755
index ccf617f..0000000
--- a/lib/libswt-gtk-3139.so
+++ /dev/null
diff --git a/lib/libswt-pi-gtk-3139.so b/lib/libswt-pi-gtk-3139.so
deleted file mode 100755
index 6fc3306..0000000
--- a/lib/libswt-pi-gtk-3139.so
+++ /dev/null