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: https://code.wildfiregames.com/D3127. Fix option --with-system-spidermonkey info oversight when updating ind8332a2938
andd92a2118b0
andd5db03c303
Reported by @sera, @linkmauve This was SVN commit r27440.
This commit is contained in:
parent
28707d61dd
commit
9347192591
@ -600,7 +600,7 @@ extern_lib_defs = {
|
|||||||
compile_settings = function()
|
compile_settings = function()
|
||||||
if _OPTIONS["with-system-mozjs"] then
|
if _OPTIONS["with-system-mozjs"] then
|
||||||
if not _OPTIONS["android"] then
|
if not _OPTIONS["android"] then
|
||||||
pkgconfig.add_includes("mozjs-78")
|
pkgconfig.add_includes("mozjs-91")
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if os.istarget("windows") then
|
if os.istarget("windows") then
|
||||||
@ -619,9 +619,9 @@ extern_lib_defs = {
|
|||||||
link_settings = function()
|
link_settings = function()
|
||||||
if _OPTIONS["with-system-mozjs"] then
|
if _OPTIONS["with-system-mozjs"] then
|
||||||
if _OPTIONS["android"] then
|
if _OPTIONS["android"] then
|
||||||
links { "mozjs-78" }
|
links { "mozjs-91" }
|
||||||
else
|
else
|
||||||
pkgconfig.add_links("mozjs-78")
|
pkgconfig.add_links("mozjs-91")
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
filter { "Debug", "action:vs*" }
|
filter { "Debug", "action:vs*" }
|
||||||
|
@ -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 = "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 = "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 = "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-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 = "with-valgrind", description = "Enable Valgrind support (non-Windows only)" }
|
||||||
newoption { trigger = "without-audio", description = "Disable use of OpenAL/Ogg/Vorbis APIs" }
|
newoption { trigger = "without-audio", description = "Disable use of OpenAL/Ogg/Vorbis APIs" }
|
||||||
|
Loading…
Reference in New Issue
Block a user