Index: ps/trunk/build/workspaces/update-workspaces.sh
===================================================================
--- ps/trunk/build/workspaces/update-workspaces.sh
+++ ps/trunk/build/workspaces/update-workspaces.sh
@@ -41,7 +41,7 @@
 with_system_premake5=false
 without_nvtt=false
 with_system_nvtt=false
-with_system_mozjs45=false
+with_system_mozjs52=false
 enable_atlas=true
 
 for i in "$@"
@@ -50,7 +50,7 @@
     --with-system-premake5 ) with_system_premake5=true ;;
     --without-nvtt ) without_nvtt=true; premake_args="${premake_args} --without-nvtt" ;;
     --with-system-nvtt ) with_system_nvtt=true; premake_args="${premake_args} --with-system-nvtt" ;;
-    --with-system-mozjs45 ) with_system_mozjs45=true; premake_args="${premake_args} --with-system-mozjs45" ;;
+    --with-system-mozjs52 ) with_system_mozjs52=true; premake_args="${premake_args} --with-system-mozjs52" ;;
     --enable-atlas ) enable_atlas=true ;;
     --disable-atlas ) enable_atlas=false ;;
     -j* ) JOBS=$i ;;
@@ -87,7 +87,7 @@
   # Build/update bundled external libraries
   (cd ../../libraries/source/fcollada/src && ${MAKE} ${JOBS}) || die "FCollada build failed"
   echo
-  if [ "$with_system_mozjs45" = "false" ]; then
+  if [ "$with_system_mozjs52" = "false" ]; then
     (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed"
   fi
   echo
Index: ps/trunk/libraries/source/spidermonkey/build.sh
===================================================================
--- ps/trunk/libraries/source/spidermonkey/build.sh
+++ ps/trunk/libraries/source/spidermonkey/build.sh
@@ -127,12 +127,19 @@
   INCLUDE_DIR_DEBUG=include-win32-debug
   INCLUDE_DIR_RELEASE=include-win32-release
   LIB_PREFIX=
-  LIB_SUFFIX=.lib
+  LIB_SUFFIX=.dll
 else
   INCLUDE_DIR_DEBUG=include-unix-debug
   INCLUDE_DIR_RELEASE=include-unix-release
   LIB_PREFIX=lib
-  LIB_SUFFIX=.a
+  LIB_SUFFIX=.so
+  if [ "`uname -s`" = "OpenBSD" ];
+  then
+    LIB_SUFFIX=.so.1.0
+  elif [ "`uname -s`" = "Darwin" ];
+  then
+    LIB_SUFFIX=.so
+  fi
 fi
 
 if [ "${OS}" = "Windows_NT" ]
@@ -157,8 +164,8 @@
 cp -R -L "${FOLDER}"/build-debug/dist/include/* "${INCLUDE_DIR_DEBUG}/"
 
 mkdir -p lib/
-cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}js_static${LIB_SUFFIX}" "lib/${LIB_PREFIX}${LIB_NAME}-debug${LIB_SUFFIX}"
-cp -L "${FOLDER}/build-release/js/src/${LIB_PREFIX}js_static${LIB_SUFFIX}" "lib/${LIB_PREFIX}${LIB_NAME}-release${LIB_SUFFIX}"
+cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}${LIB_NAME}-debug${LIB_SUFFIX}" "lib/${LIB_PREFIX}${LIB_NAME}-debug${LIB_SUFFIX}"
+cp -L "${FOLDER}/build-release/js/src/${LIB_PREFIX}${LIB_NAME}-release${LIB_SUFFIX}" "lib/${LIB_PREFIX}${LIB_NAME}-release${LIB_SUFFIX}"  
 
 # On Windows, also copy nspr .DLL and .pdb debug symbols.
 if [ "${OS}" = "Windows_NT" ]
@@ -166,10 +173,15 @@
   cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}nspr4.dll" "../../../binaries/system/${LIB_PREFIX}nspr4.dll"
   cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}plc4.dll" "../../../binaries/system/${LIB_PREFIX}plc4.dll"
   cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}plds4.dll" "../../../binaries/system/${LIB_PREFIX}plds4.dll"
-  cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}mozjs-52-debug.dll" "lib/${LIB_PREFIX}${LIB_NAME}-debug.dll"
-  cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}mozjs-52-debug.pdb" "lib/${LIB_PREFIX}${LIB_NAME}-debug.pdb"
-  cp -L "${FOLDER}/build-release/js/src/${LIB_PREFIX}mozjs-52-release.dll" "lib/${LIB_PREFIX}${LIB_NAME}-release.dll"
-  cp -L "${FOLDER}/build-release/js/src/${LIB_PREFIX}mozjs-52-release.pdb" "lib/${LIB_PREFIX}${LIB_NAME}-release.pdb"
+  cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}mozjs-52-debug.dll" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-debug.dll"
+  cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}mozjs-52-debug.pdb" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-debug.pdb"
+  cp -L "${FOLDER}/build-release/js/src/${LIB_PREFIX}mozjs-52-release.dll" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-release.dll"
+  cp -L "${FOLDER}/build-release/js/src/${LIB_PREFIX}mozjs-52-release.pdb" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-release.pdb"
+# And on Linux, copy the shared library to the binaries too (MacOS uses static linking so does not need this step.)
+elif [ "`uname -s`" != "Darwin" ]
+then
+  cp -L "${FOLDER}/build-debug/js/src/${LIB_PREFIX}${LIB_NAME}-debug${LIB_SUFFIX}" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-debug${LIB_SUFFIX}"
+  cp -L "${FOLDER}/build-release/js/src/${LIB_PREFIX}${LIB_NAME}-release${LIB_SUFFIX}" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-release${LIB_SUFFIX}"
 fi
 
 # Flag that it's already been built successfully so we can skip it next time