examples/build.lua: rename example_settings to just settings as it's a locale variable anyway.
This commit is contained in:
parent
b913c2024d
commit
0ce1d25594
1 changed files with 6 additions and 6 deletions
|
|
@ -4,22 +4,22 @@
|
||||||
-- --
|
-- --
|
||||||
--------------------------------
|
--------------------------------
|
||||||
|
|
||||||
local example_settings = CopySettings(global_settings, "Example")
|
local settings = CopySettings(global_settings, "Example")
|
||||||
|
|
||||||
-- Include spectre headers.
|
-- Include spectre headers.
|
||||||
example_settings.cc.includes:Add("include/")
|
settings.cc.includes:Add("include/")
|
||||||
|
|
||||||
-- Link with spectre.
|
-- Link with spectre.
|
||||||
example_settings.link.extrafiles:Add(libspectre)
|
settings.link.extrafiles:Add(libspectre)
|
||||||
|
|
||||||
if TARGET_OS == "Win32" then
|
if TARGET_OS == "Win32" then
|
||||||
|
|
||||||
-- Windows needs to link against these.
|
-- Windows needs to link against these.
|
||||||
example_settings.link.libs:Add("opengl32", "gdi32", "user32")
|
settings.link.libs:Add("opengl32", "gdi32", "user32")
|
||||||
elseif TARGET_OS == "Unix" then
|
elseif TARGET_OS == "Unix" then
|
||||||
|
|
||||||
-- Unix nees dl and X11 libs.
|
-- Unix nees dl and X11 libs.
|
||||||
example_settings.link.libs:Add("dl", 'X11', 'Xrandr', 'freetype')
|
settings.link.libs:Add("dl", 'X11', 'Xrandr', 'freetype')
|
||||||
end
|
end
|
||||||
|
|
||||||
-- For now, to get examples working
|
-- For now, to get examples working
|
||||||
|
|
@ -29,7 +29,7 @@ assets = CopyDir(PathJoin(paths.build, paths.examples), "assets")
|
||||||
examples = {}
|
examples = {}
|
||||||
for k, name in pairs(CollectDirs("examples/*")) do
|
for k, name in pairs(CollectDirs("examples/*")) do
|
||||||
Import(PathJoin(name, "bam.lua"))
|
Import(PathJoin(name, "bam.lua"))
|
||||||
exe = Link(example_settings, PathJoin(paths.examples, name), Compile(example_settings, src))
|
exe = Link(settings, PathJoin(paths.examples, name), Compile(settings, src))
|
||||||
AddDependency(exe, assets)
|
AddDependency(exe, assets)
|
||||||
table.insert(examples, exe)
|
table.insert(examples, exe)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue