summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
authorEthan Vrhel <ethan@Michaels-MacBook-Pro.local>2021-11-18 22:05:56 -0800
committerEthan Vrhel <ethanvrhel@gmail.com>2021-11-20 13:29:51 -0800
commit467cbabb9ab9209452cbd0e15f31f7cf5359484c (patch)
tree032370ae9551ec29264f7ee21dd259b4e9ebc8d8 /demos
parent4307d125a54f823bfc50e0326bb33523a5c28374 (diff)
downloadghostpdl-467cbabb9ab9209452cbd0e15f31f7cf5359484c.tar.gz
Fixed some darwin build scripts and files
Diffstat (limited to 'demos')
-rw-r--r--demos/java/jni/gs_jni/com_artifex_gsjava_GSAPI.cpp4
-rw-r--r--demos/java/mtdemo/build_darwin.sh6
-rw-r--r--demos/java/mtdemo/install_darwin.sh4
-rw-r--r--demos/java/mtdemo/runmtd_darwin.sh2
4 files changed, 10 insertions, 6 deletions
diff --git a/demos/java/jni/gs_jni/com_artifex_gsjava_GSAPI.cpp b/demos/java/jni/gs_jni/com_artifex_gsjava_GSAPI.cpp
index 1a045b948..e6ce9f1d7 100644
--- a/demos/java/jni/gs_jni/com_artifex_gsjava_GSAPI.cpp
+++ b/demos/java/jni/gs_jni/com_artifex_gsjava_GSAPI.cpp
@@ -703,6 +703,10 @@ void storeDispalyHandle(GSInstanceData *idata)
}
char buf[20]; // 16#[16 hex digits][null terminator]
+#if defined(_WIN32)
sprintf_s(buf, "16#%llx", (long long)idata);
+#else
+ snprintf(buf, sizeof(buf), "16#%llx", (long long)idata);
+#endif
gsapi_set_param(idata->instance, PARAM_NAME, buf, gs_spt_string);
}
diff --git a/demos/java/mtdemo/build_darwin.sh b/demos/java/mtdemo/build_darwin.sh
index 985488dcf..3bb7ebccf 100644
--- a/demos/java/mtdemo/build_darwin.sh
+++ b/demos/java/mtdemo/build_darwin.sh
@@ -6,10 +6,10 @@ cd ../gsjava
bash build_darwin.sh
-cs ../mtdemo
+cd ../mtdemo
cp ../gsjava/gsjava.jar gsjava.jar
echo "Compiling Java source..."
-javac -classpath "../gsjava/bin;." "Main.java" "Worker.java"
-echo "Done." \ No newline at end of file
+javac -classpath "../gsjava/bin:." "Main.java" "Worker.java"
+echo "Done."
diff --git a/demos/java/mtdemo/install_darwin.sh b/demos/java/mtdemo/install_darwin.sh
index a1d900266..1a615c8fb 100644
--- a/demos/java/mtdemo/install_darwin.sh
+++ b/demos/java/mtdemo/install_darwin.sh
@@ -6,6 +6,6 @@ cp "../jni/gs_jni/gs_jni.dylib" "gs_jni.dylib"
cd ../../../sobin
echo "Copy libgpdl.dylib"
-cp $(readlinkk "libgpdl.dylib") "../demos/java/gsviewer"
+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/mtdemo/runmtd_darwin.sh b/demos/java/mtdemo/runmtd_darwin.sh
index 96f3f6b85..4e3b21140 100644
--- a/demos/java/mtdemo/runmtd_darwin.sh
+++ b/demos/java/mtdemo/runmtd_darwin.sh
@@ -2,4 +2,4 @@
export LD_PRELOAD=./libgpdl.dylib
-java -cp "gsjava.jar;." Main "$ARG1" \ No newline at end of file
+java -cp "gsjava.jar:." Main "$ARG1"