Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

extract libs and liboptions from pkg-config, prepare for future work (nw)

Browse source
This commit is contained in:
Miodrag Milanovic 2015-04-16 12:30:13 +02:00
parent 4e22124500
commit a50dec8b3c
2 changed files with 48 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
scripts/src/osd/modules.lua
View file

@ -1,3 +1,29 @@
function string.starts(String,Start)
return string.sub(String,1,string.len(Start))==Start
end
function addlibfromstring(str)
if (str==nil) then return end
for w in str:gmatch("%S+") do
if string.starts(w,"-l")==true then
links {
string.sub(w,3)
}
end
end
end
function addoptionsfromstring(str)
if (str==nil) then return end
for w in str:gmatch("%S+") do
if string.starts(w,"-l")==false then
linkoptions {
w
}
end
end
end
function osdmodulesbuild()
removeflags {
@ -191,9 +217,9 @@ function osdmodulestargetconf()
if _OPTIONS["NO_USE_MIDI"]~="1" then
if _OPTIONS["targetos"]=="linux" then
linkoptions {
backtick("pkg-config --libs alsa"),
}
local str = backtick("pkg-config --libs alsa")
addlibfromstring(str)
addoptionsfromstring(str)
elseif _OPTIONS["targetos"]=="macosx" then
links {
"CoreMIDI.framework",
@ -223,13 +249,15 @@ function osdmodulestargetconf()
if _OPTIONS["QT_HOME"]~=nil then
linkoptions {
"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
"-lQtGui",
"-lQtCore",
}
links {
"QtGui",
"QtCore",
}
else
linkoptions {
backtick("pkg-config --libs QtGui"),
}
local str = backtick("pkg-config --libs QtGui")
addlibfromstring(str)
addoptionsfromstring(str)
end
end
end

24
scripts/src/osd/sdl.lua
View file

@ -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"
}