diff --git a/build/premake/extern_libs5.lua b/build/premake/extern_libs5.lua index e183fb1168..cd7292f746 100644 --- a/build/premake/extern_libs5.lua +++ b/build/premake/extern_libs5.lua @@ -585,7 +585,7 @@ extern_lib_defs = { compile_settings = function() if _OPTIONS["with-system-mozjs"] then if not _OPTIONS["android"] then - pkgconfig.add_includes("mozjs-60") + pkgconfig.add_includes("mozjs-68") end else if os.istarget("windows") then @@ -605,15 +605,15 @@ extern_lib_defs = { link_settings = function() if _OPTIONS["with-system-mozjs"] then if _OPTIONS["android"] then - links { "mozjs-60" } + links { "mozjs-68" } else - pkgconfig.add_links("mozjs-60") + pkgconfig.add_links("mozjs-68") end else filter { "Debug" } - links { "mozjs60-ps-debug" } + links { "mozjs68-ps-debug" } filter { "Release" } - links { "mozjs60-ps-release" } + links { "mozjs68-ps-release" } filter { } add_source_lib_paths("spidermonkey") end diff --git a/build/workspaces/clean-workspaces.sh b/build/workspaces/clean-workspaces.sh index 44e4e9e0ef..9795dcb616 100755 --- a/build/workspaces/clean-workspaces.sh +++ b/build/workspaces/clean-workspaces.sh @@ -33,14 +33,15 @@ if [ "$preserve_libs" != "true" ]; then (cd ../../libraries/source/fcollada/src && rm -rf ./output) (cd ../../libraries/source/nvtt/src && rm -rf ./build) (cd ../../libraries/source/spidermonkey && rm -f .already-built) - (cd ../../libraries/source/spidermonkey && rm -rf ./lib) + (cd ../../libraries/source/spidermonkey && rm -rf ./lib/*.a && rm -rf ./lib/*.so) (cd ../../libraries/source/spidermonkey && rm -rf ./include-unix-debug) (cd ../../libraries/source/spidermonkey && rm -rf ./include-unix-release) - (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-62.9.1) + (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-68.12.1) fi # Still delete the directory of previous SpiderMonkey versions to # avoid wasting disk space if people clean workspaces after updating. +(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-62.9.1) (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-52.9.1pre1) (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-45.0.2) (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-38.0.0) diff --git a/source/scriptinterface/ScriptTypes.h b/source/scriptinterface/ScriptTypes.h index ac2dd0d58b..f0033fab86 100644 --- a/source/scriptinterface/ScriptTypes.h +++ b/source/scriptinterface/ScriptTypes.h @@ -73,7 +73,7 @@ # pragma GCC diagnostic pop #endif -#if MOZJS_MAJOR_VERSION != 60 +#if MOZJS_MAJOR_VERSION != 68 #error Your compiler is trying to use an incorrect major version of the \ SpiderMonkey library. The only version that works is the one in the \ libraries/spidermonkey/ directory, and it will not work with a typical \ @@ -81,7 +81,7 @@ system-installed version. Make sure you have got all the right files and \ include paths. #endif -#if MOZJS_MINOR_VERSION != 9 +#if MOZJS_MINOR_VERSION != 12 #error Your compiler is trying to use an untested minor version of the \ SpiderMonkey library. If you are a package maintainer, please make sure \ to check very carefully that this version does not change the behaviour \