From a50dec8b3c8e446d312ba9ebd347209f4b8d0708 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 16 Apr 2015 12:30:13 +0200 Subject: extract libs and liboptions from pkg-config, prepare for future work (nw) --- scripts/src/osd/sdl.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'scripts/src/osd/sdl.lua') diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 8b713bf635a..d5852bcd298 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" } -- cgit v1.2.3-70-g09d2 From 3060bb0637af92deac7660812b29f3a95ae9b7fb Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 16 Apr 2015 15:26:26 +0200 Subject: fix for few more executable files (nw) --- scripts/src/osd/sdl.lua | 8 ++++++++ scripts/src/osd/windows.lua | 4 ++++ 2 files changed, 12 insertions(+) (limited to 'scripts/src/osd/sdl.lua') diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index d5852bcd298..6360e79a89e 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -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 diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 8c6c5dd1cb7..d8636a2e3b1 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -217,6 +217,10 @@ if _OPTIONS["with-tools"] then "ForceCPP", } + flags { + "Symbols", -- always include minimum symbols for executables + } + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end -- cgit v1.2.3-70-g09d2