Update build scripts for all platforms

9 files changed, 36 insertions, 14 deletions

diff --git a/demos/java/gsjava/build_darwin.sh b/demos/java/gsjava/build_darwin.sh
index 212dfb365..460e9ee0a 100644
--- a/demos/java/gsjava/build_darwin.sh
+++ b/demos/java/gsjava/build_darwin.sh
@@ -2,8 +2,6 @@
 
 mkdir -p bin
 
-echo "Compiling gs_jni C++ source..."
-
 cd "../jni/gs_jni"
 
 bash build_darwin.sh
diff --git a/demos/java/gsjava/build_linux.sh b/demos/java/gsjava/build_linux.sh
index 2866c07e9..290540ae7 100644
--- a/demos/java/gsjava/build_linux.sh
+++ b/demos/java/gsjava/build_linux.sh
@@ -2,8 +2,6 @@
 
 mkdir -p bin
 
-echo "Compiling gs_jni C++ source..."
-
 cd "../jni/gs_jni"
 
 bash build_linux.sh
diff --git a/demos/java/gsjava/build_win32.bat b/demos/java/gsjava/build_win32.bat
index d773b4d54..85b81abc4 100644
--- a/demos/java/gsjava/build_win32.bat
+++ b/demos/java/gsjava/build_win32.bat
@@ -2,7 +2,7 @@
 
 if not exist bin mkdir bin
 
-echo Compiling Java source...
+echo Compiling gsjava Java source...
 javac -sourcepath src\ -d bin^
 	src\com\artifex\gsjava\GSAPI.java^
 	src\com\artifex\gsjava\GSInstance.java^
diff --git a/demos/java/jni/gs_jni/build_linux.sh b/demos/java/jni/gs_jni/build_linux.sh
index 1d492b5ee..f66a48831 100644
--- a/demos/java/jni/gs_jni/build_linux.sh
+++ b/demos/java/jni/gs_jni/build_linux.sh
@@ -7,7 +7,7 @@ mkdir -p obin
 echo "Compiling gs_jni C++ source..."
 
 echo "Compile callbacks.cpp"
-g++ -c -Wall -O3 \
+g++ -c -Wall -O3 -fPIC \
 	-std=c++14 \
 	-I./include \
 	-I./include/linux \
@@ -17,7 +17,7 @@ g++ -c -Wall -O3 \
 	-o "obin/callbacks.o"
 
 echo "Compile com_artifex_gsjava_GSAPI.cpp"
-g++ -c -Wall -O3 \
+g++ -c -Wall -O3 -fPIC \
 	-std=c++14 \
 	-I./include \
 	-I./include/linux \
@@ -27,7 +27,7 @@ g++ -c -Wall -O3 \
 	-o "obin/com_artifex_gsjava_GSAPI.o"
 
 echo "Compile com_artifex_gsjava_util_NativePointer.cpp"
-g++ -c -Wall -O3 \
+g++ -c -Wall -O3 -fPIC \
 	-std=c++14 \
 	-I./include \
 	-I./include/linux \
@@ -37,7 +37,7 @@ g++ -c -Wall -O3 \
 	-o "obin/com_artifex_gsjava_util_NativePointer.o"
 
 echo "Compile jni_util.cpp"
-g++ -c -Wall -O3\
+g++ -c -Wall -O3 -fPIC \
 	-std=c++14 \
 	-I./include \
 	-I./include/linux \
diff --git a/demos/java/mtdemo/build_darwin.sh b/demos/java/mtdemo/build_darwin.sh
index 9b6133f45..6080bed02 100755
--- a/demos/java/mtdemo/build_darwin.sh
+++ b/demos/java/mtdemo/build_darwin.sh
@@ -10,6 +10,19 @@ cd ../mtdemo
 
 cp ../mtdemo/gsjava.jar gsjava.jar
 
-echo "Compiling Java source..."
+echo "Compiling mtdemo Java source..."
 javac -classpath "../gsjava/bin:." "Main.java" "Worker.java"
 echo "Done."
+
+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 target"
+cp $(readlink "libgpdl.dylib") "../demos/java/mtdemo"
+
+cd ../demos/java/mtdemo
\ No newline at end of file
diff --git a/demos/java/mtdemo/build_linux.sh b/demos/java/mtdemo/build_linux.sh
index 2ed4529fa..698b45839 100755
--- a/demos/java/mtdemo/build_linux.sh
+++ b/demos/java/mtdemo/build_linux.sh
@@ -10,6 +10,19 @@ cd ../mtdemo
 
 cp ../gsjava/gsjava.jar gsjava.jar
 
-echo "Compiling Java source..."
+echo "Compiling mtdemo Java source..."
 javac -classpath "../gsjava/bin:." "Main.java" "Worker.java"
 echo "Done."
+
+echo "Copy gs_jni.so"
+cp "../jni/gs_jni/gs_jni.so" "gs_jni.so"
+
+echo "Create libgpdl.so link"
+cp "../../../sobin/libgpdl.so" "libgpdl.so"
+
+cd ../../../sobin
+
+echo "Copy libgpdl.so target"
+cp $(readlink "libgpdl.so") "../demos/java/mtdemo"
+
+cd ../demos/java/mtdemo
\ No newline at end of file
diff --git a/demos/java/mtdemo/build_win32.bat b/demos/java/mtdemo/build_win32.bat
index e77b63019..1074fab87 100755
--- a/demos/java/mtdemo/build_win32.bat
+++ b/demos/java/mtdemo/build_win32.bat
@@ -10,6 +10,6 @@ cd "..\mtdemo"
 
 copy "..\gsjava\gsjava.jar" ".\gsjava.jar"
 
-echo Compiling Java source...
+echo Compiling mtdemo Java source...
 javac -cp ../gsjava/bin;. Main.java Worker.java
 echo Done.
\ No newline at end of file
diff --git a/demos/java/mtdemo/install_darwin.sh b/demos/java/mtdemo/install_darwin.sh
index 0dc21bc4d..5284904a2 100755
--- a/demos/java/mtdemo/install_darwin.sh
+++ b/demos/java/mtdemo/install_darwin.sh
@@ -11,4 +11,4 @@ cd ../../../sobin
 echo "Copy libgpdl.dylib target"
 cp $(readlink "libgpdl.dylib") "../demos/java/mtdemo"
 
-cd ../demos/java/mtdemo
+cd ../demos/java/mtdemo
\ No newline at end of file
diff --git a/demos/java/mtdemo/install_linux.sh b/demos/java/mtdemo/install_linux.sh
index 7d9c00949..5eee89af0 100755
--- a/demos/java/mtdemo/install_linux.sh
+++ b/demos/java/mtdemo/install_linux.sh
@@ -11,4 +11,4 @@ cd ../../../sobin
 echo "Copy libgpdl.so target"
 cp $(readlink "libgpdl.so") "../demos/java/mtdemo"
 
-cd ../demos/java/mtdemo
+cd ../demos/java/mtdemo
\ No newline at end of file