Changeset View
Standalone View
build/premake/extern_libs5.lua
Show First 20 Lines • Show All 529 Lines • ▼ Show 20 Lines | link_settings = function() | ||||
pkgconfig.add_links("sdl2", os.getenv("SDL2_CONFIG")) | pkgconfig.add_links("sdl2", os.getenv("SDL2_CONFIG")) | ||||
end | end | ||||
end, | end, | ||||
}, | }, | ||||
spidermonkey = { | spidermonkey = { | ||||
compile_settings = function() | compile_settings = function() | ||||
if _OPTIONS["with-system-mozjs52"] then | if _OPTIONS["with-system-mozjs52"] then | ||||
if not _OPTIONS["android"] then | if not _OPTIONS["android"] then | ||||
pkgconfig.add_includes("mozjs-52") | -- Many linux distros package icu headers in with spidermonkey headers, but | ||||
-- do not provide compatible icu library files to go along with them. | |||||
-- | |||||
-- Attempting to use the spidermonkey-icu headers with a distro's | |||||
-- standard-icu lib files causes linking errors. | |||||
-- | |||||
-- Therefore, we set the spidermonkey includes directory to be searched | |||||
-- *after* the standard system includes so gcc/clang finds and includes | |||||
-- compatible icu headers. | |||||
pkgconfig.add_includes("mozjs-52", nil, nil, true) | |||||
s0600204: I'm not a fan of the `nil, nil,` part myself... | |||||
wraitiiUnsubmitted Done Inline ActionsIt seems to me the add_includes function could be refactored in a "call pkg_config" part, and then several frontend functions "add_includes", "add_system_includes", "add_after_system_includes" or something similar. wraitii: It seems to me the add_includes function could be refactored in a "call pkg_config" part, and… | |||||
StanUnsubmitted Not Done Inline ActionsStan: Maybe https://riptutorial.com/lua/example/4081/default-parameters ? | |||||
end | end | ||||
else | else | ||||
if os.istarget("windows") then | if os.istarget("windows") then | ||||
include_dir = "include-win32" | include_dir = "include-win32" | ||||
buildoptions { "/FI\"js/RequiredDefines.h\"" } | buildoptions { "/FI\"js/RequiredDefines.h\"" } | ||||
else | else | ||||
include_dir = "include-unix" | include_dir = "include-unix" | ||||
end | end | ||||
Not Done Inline ActionsThe option is called --with-system-premake5 unfortunately Well, --with-system-premake5 seems broken since day one it seems, so renaming while fixing update-workspaces.sh may be an option sera: The option is called --with-system-premake5 unfortunately
Well, --with-system-premake5 seems… | |||||
Not Done Inline ActionsNoted. Is there a ticket for --with-system-premake5 not working? s0600204: Noted.
Is there a ticket for `--with-system-premake5` not working? | |||||
Not Done Inline ActionsThere isn't as far as I am aware. Most distributions do not provide it. Stan: There isn't as far as I am aware. Most distributions do not provide it. | |||||
Not Done Inline ActionsDistributions will likely invoke premake directly, so this bug did go unnoticed it seems and no bug report was filed. --- a/build/workspaces/update-workspaces.sh +++ b/build/workspaces/update-workspaces.sh @@ -104,10 +104,11 @@ fi # Now run premake to create the makefiles +cd ../premake/premake5 + premake_command="premake5" if [ "$with_system_premake5" = "false" ]; then # Build bundled premake - cd ../premake/premake5 PREMAKE_BUILD_DIR=build/gmake2.unix # BSD and OS X need different Makefiles case "`uname -s`" in Maybe phrasing it as "system premake" instead of "--with-system-premake" would be better anyway as this is an option for a wrapper instead. sera: Distributions will likely invoke premake directly, so this bug did go unnoticed it seems and no… | |||||
Not Done Inline ActionsCreated #6710 Stan: Created #6710 | |||||
filter "Debug" | filter "Debug" | ||||
sysincludedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-debug" } | sysincludedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-debug" } | ||||
defines { "DEBUG" } | defines { "DEBUG" } | ||||
filter "Release" | filter "Release" | ||||
sysincludedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-release" } | sysincludedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-release" } | ||||
filter { } | filter { } | ||||
end | end | ||||
end, | end, | ||||
▲ Show 20 Lines • Show All 147 Lines • Show Last 20 Lines |
I'm not a fan of the nil, nil, part myself...