summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd/sdl.lua
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
committer ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
commitcc3b682e52bf097d31db78032aad01d6a0b12e94 (patch)
tree860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /scripts/src/osd/sdl.lua
parent7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff)
parenta649a95488e1fc85813dda747dc74c596496bd1c (diff)
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'scripts/src/osd/sdl.lua')
-rw-r--r--scripts/src/osd/sdl.lua32
1 files changed, 20 insertions, 12 deletions
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 8b713bf635a..6360e79a89e 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -37,9 +37,9 @@ function maintargetosdoptions(_target)
"SDL_ttf",
}
end
- linkoptions {
- backtick("pkg-config --libs fontconfig"),
- }
+ local str = backtick("pkg-config --libs fontconfig")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
if _OPTIONS["targetos"]=="windows" then
@@ -239,9 +239,9 @@ if BASE_TARGETOS=="unix" then
}
end
else
- linkoptions {
- backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'"),
- }
+ local str = backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
else
if _OPTIONS["NO_X11"]=="1" then
@@ -259,9 +259,9 @@ if BASE_TARGETOS=="unix" then
}
end
end
- linkoptions {
- backtick(sdlconfigcmd() .. " --libs"),
- }
+ local str = backtick(sdlconfigcmd() .. " --libs")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
if _OPTIONS["targetos"]~="haiku" then
links {
"m",
@@ -280,9 +280,9 @@ if BASE_TARGETOS=="unix" then
end
end
elseif BASE_TARGETOS=="os2" then
- linkoptions {
- backtick(sdlconfigcmd() .. " --libs"),
- }
+ local str = backtick(sdlconfigcmd() .. " --libs")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
links {
"pthread"
}
@@ -422,6 +422,10 @@ if _OPTIONS["with-tools"] then
"ForceCPP",
}
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
dofile("sdl_cfg.lua")
includedirs {
@@ -480,6 +484,10 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
"ForceCPP",
}
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
dofile("sdl_cfg.lua")
if _OPTIONS["SEPARATE_BIN"]~="1" then