From fb2a06d1367d84252c809dee4285ab91cca7ad9b Mon Sep 17 00:00:00 2001 From: Stan Date: Sat, 14 Jan 2023 12:14:56 +0000 Subject: [PATCH] Fix bundled spidermonkey code in Premake. It still won't link if the user has a more recent issue than whatever was vendored with Spidermonkey. Refs: Phab:D3127. Fix option --with-system-spidermonkey info oversight when updating in Phab:rP24296 and Phab:rP24333 and Phab:rP27409 Reported by @sera, @linkmauve git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27440 3db68df2-c116-0410-a063-a993310a9797 --- build/premake/extern_libs5.lua | 6 +++--- build/premake/premake5.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/premake/extern_libs5.lua b/build/premake/extern_libs5.lua index 8271e2ef9f..08835c22be 100644 --- a/build/premake/extern_libs5.lua +++ b/build/premake/extern_libs5.lua @@ -600,7 +600,7 @@ extern_lib_defs = { compile_settings = function() if _OPTIONS["with-system-mozjs"] then if not _OPTIONS["android"] then - pkgconfig.add_includes("mozjs-78") + pkgconfig.add_includes("mozjs-91") end else if os.istarget("windows") then @@ -619,9 +619,9 @@ extern_lib_defs = { link_settings = function() if _OPTIONS["with-system-mozjs"] then if _OPTIONS["android"] then - links { "mozjs-78" } + links { "mozjs-91" } else - pkgconfig.add_links("mozjs-78") + pkgconfig.add_links("mozjs-91") end else filter { "Debug", "action:vs*" } diff --git a/build/premake/premake5.lua b/build/premake/premake5.lua index 9a140c7828..75d386e2c4 100644 --- a/build/premake/premake5.lua +++ b/build/premake/premake5.lua @@ -6,7 +6,7 @@ newoption { trigger = "icc", description = "Use Intel C++ Compiler (Linux only; newoption { trigger = "jenkins-tests", description = "Configure CxxTest to use the XmlPrinter runner which produces Jenkins-compatible output" } newoption { trigger = "minimal-flags", description = "Only set compiler/linker flags that are really needed. Has no effect on Windows builds" } newoption { trigger = "outpath", description = "Location for generated project files" } -newoption { trigger = "with-system-mozjs", description = "Search standard paths for libmozjs60, instead of using bundled copy" } +newoption { trigger = "with-system-mozjs", description = "Search standard paths for libmozjs91, instead of using bundled copy" } newoption { trigger = "with-system-nvtt", description = "Search standard paths for nvidia-texture-tools library, instead of using bundled copy" } newoption { trigger = "with-valgrind", description = "Enable Valgrind support (non-Windows only)" } newoption { trigger = "without-audio", description = "Disable use of OpenAL/Ogg/Vorbis APIs" } -- 2.11.4.GIT