Fixed darwin build scripts

15 files changed, 12 insertions, 6 deletions

diff --git a/demos/java/gsviewer/build_darwin.sh b/demos/java/gsviewer/build_darwin.sh
index 6c9d96c7b..6c9d96c7b 100644..100755
--- a/demos/java/gsviewer/build_darwin.sh
+++ b/demos/java/gsviewer/build_darwin.sh
diff --git a/demos/java/gsviewer/build_linux.sh b/demos/java/gsviewer/build_linux.sh
index 67b3e9cfe..67b3e9cfe 100644..100755
--- a/demos/java/gsviewer/build_linux.sh
+++ b/demos/java/gsviewer/build_linux.sh
diff --git a/demos/java/gsviewer/build_win32.bat b/demos/java/gsviewer/build_win32.bat
index 0e279e9ff..0e279e9ff 100644..100755
--- a/demos/java/gsviewer/build_win32.bat
+++ b/demos/java/gsviewer/build_win32.bat
diff --git a/demos/java/gsviewer/install_darwin.sh b/demos/java/gsviewer/install_darwin.sh
index b6c58b869..bb3e3c90f 100644..100755
--- a/demos/java/gsviewer/install_darwin.sh
+++ b/demos/java/gsviewer/install_darwin.sh
@@ -3,9 +3,12 @@
 echo "Copy gs_jni.dylib"
 cp "../jni/gs_jni/gs_jni.dylib" "gs_jni.dylib"
 
+echo "Create libgpdl.dylib link"
+cp "../../../sobin/libgpdl.dylib" "libgpdl.dylib"
+
 cd ../../../sobin
 
-echo "Copy libgpdl.dylib"
+echo "Copy libgpdl.dylib target"
 cp $(readlink "libgpdl.dylib") "../demos/java/gsviewer"
 
-cd ../demos/java/gsviewer
\ No newline at end of file
+cd ../demos/java/gsviewer
diff --git a/demos/java/gsviewer/install_linux.sh b/demos/java/gsviewer/install_linux.sh
index 4772d70a6..4772d70a6 100644..100755
--- a/demos/java/gsviewer/install_linux.sh
+++ b/demos/java/gsviewer/install_linux.sh
diff --git a/demos/java/gsviewer/start_darwin.sh b/demos/java/gsviewer/start_darwin.sh
index 9e4004bd5..9e4004bd5 100644..100755
--- a/demos/java/gsviewer/start_darwin.sh
+++ b/demos/java/gsviewer/start_darwin.sh
diff --git a/demos/java/gsviewer/start_linux.sh b/demos/java/gsviewer/start_linux.sh
index 4ed9f5144..4ed9f5144 100644..100755
--- a/demos/java/gsviewer/start_linux.sh
+++ b/demos/java/gsviewer/start_linux.sh
diff --git a/demos/java/mtdemo/build_darwin.sh b/demos/java/mtdemo/build_darwin.sh
index 3bb7ebccf..9b6133f45 100644..100755
--- a/demos/java/mtdemo/build_darwin.sh
+++ b/demos/java/mtdemo/build_darwin.sh
@@ -8,7 +8,7 @@ bash build_darwin.sh
 
 cd ../mtdemo
 
-cp ../gsjava/gsjava.jar gsjava.jar
+cp ../mtdemo/gsjava.jar gsjava.jar
 
 echo "Compiling Java source..."
 javac -classpath "../gsjava/bin:." "Main.java" "Worker.java"
diff --git a/demos/java/mtdemo/build_linux.sh b/demos/java/mtdemo/build_linux.sh
index 2ed4529fa..2ed4529fa 100644..100755
--- a/demos/java/mtdemo/build_linux.sh
+++ b/demos/java/mtdemo/build_linux.sh
diff --git a/demos/java/mtdemo/build_win32.bat b/demos/java/mtdemo/build_win32.bat
index e77b63019..e77b63019 100644..100755
--- a/demos/java/mtdemo/build_win32.bat
+++ b/demos/java/mtdemo/build_win32.bat
diff --git a/demos/java/mtdemo/install_darwin.sh b/demos/java/mtdemo/install_darwin.sh
index 1a615c8fb..0dc21bc4d 100644..100755
--- a/demos/java/mtdemo/install_darwin.sh
+++ b/demos/java/mtdemo/install_darwin.sh
@@ -3,9 +3,12 @@
 echo "Copy gs_jni.dylib"
 cp "../jni/gs_jni/gs_jni.dylib" "gs_jni.dylib"
 
+echo "Create libgpdl.dylib link"
+cp "../../../sobin/libgpdl.dylib" "libgpdl.dylib"
+
 cd ../../../sobin
 
-echo "Copy libgpdl.dylib"
-cp $(readlink "libgpdl.dylib") "../demos/java/gsviewer"
+echo "Copy libgpdl.dylib target"
+cp $(readlink "libgpdl.dylib") "../demos/java/mtdemo"
 
-cd ../demos/java/gsviewer
+cd ../demos/java/mtdemo
diff --git a/demos/java/mtdemo/install_linux.sh b/demos/java/mtdemo/install_linux.sh
index 4772d70a6..4772d70a6 100644..100755
--- a/demos/java/mtdemo/install_linux.sh
+++ b/demos/java/mtdemo/install_linux.sh
diff --git a/demos/java/mtdemo/runmtd_darwin.sh b/demos/java/mtdemo/runmtd_darwin.sh
index 4e3b21140..4e3b21140 100644..100755
--- a/demos/java/mtdemo/runmtd_darwin.sh
+++ b/demos/java/mtdemo/runmtd_darwin.sh
diff --git a/demos/java/mtdemo/runmtd_linux.sh b/demos/java/mtdemo/runmtd_linux.sh
index 39e8bbc55..39e8bbc55 100644..100755
--- a/demos/java/mtdemo/runmtd_linux.sh
+++ b/demos/java/mtdemo/runmtd_linux.sh
diff --git a/demos/java/mtdemo/runmtd_win32.bat b/demos/java/mtdemo/runmtd_win32.bat
index f23ce990d..f23ce990d 100644..100755
--- a/demos/java/mtdemo/runmtd_win32.bat
+++ b/demos/java/mtdemo/runmtd_win32.bat