summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Bernhard Frauendienst <git@nospam.obeliks.de>2016-07-09 21:31:01 +0200
committer Bernhard Frauendienst <git@nospam.obeliks.de>2016-07-09 22:49:30 +0200
commitcb5495f738679b3f4b2a035d2e3957f198eecc1c (patch)
treeea0f348ff3df7202edb2a085f8632dca3f9ed40d
parent72a499b54a7dd20fcab34d5b541e0f12ea23c8c5 (diff)
Take pkg-config path from env if defined
-rw-r--r--scripts/src/osd/modules.lua14
-rw-r--r--scripts/src/osd/sdl.lua4
-rw-r--r--scripts/src/osd/sdl_cfg.lua8
3 files changed, 18 insertions, 8 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 7b24531fbf5..ed03ecdf15d 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -35,6 +35,14 @@ function addoptionsfromstring(str)
end
end
+function pkgconfigcmd()
+ local pkgconfig = os.getenv("PKG_CONFIG")
+ if pkgconfig == nil then
+ return "pkg-config"
+ end
+ return pkgconfig
+end
+
function osdmodulesbuild()
removeflags {
@@ -343,7 +351,7 @@ function qtdebuggerbuild()
}
else
buildoptions {
- backtick("pkg-config --cflags Qt5Widgets"),
+ backtick(pkgconfigcmd() .. " --cflags Qt5Widgets"),
}
end
end
@@ -378,7 +386,7 @@ function osdmodulestargetconf()
if _OPTIONS["NO_USE_MIDI"]~="1" then
if _OPTIONS["targetos"]=="linux" then
- local str = backtick("pkg-config --libs alsa")
+ local str = backtick(pkgconfigcmd() .. " --libs alsa")
addlibfromstring(str)
addoptionsfromstring(str)
elseif _OPTIONS["targetos"]=="macosx" then
@@ -419,7 +427,7 @@ function osdmodulestargetconf()
"Qt5Widgets",
}
else
- local str = backtick("pkg-config --libs Qt5Widgets")
+ local str = backtick(pkgconfigcmd() .. " --libs Qt5Widgets")
addlibfromstring(str)
addoptionsfromstring(str)
end
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 4094e48c6be..94c938b1536 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -42,7 +42,7 @@ function maintargetosdoptions(_target,_subtarget)
links {
"SDL2_ttf",
}
- local str = backtick("pkg-config --libs fontconfig")
+ local str = backtick(pkgconfigcmd() .. " --libs fontconfig")
addlibfromstring(str)
addoptionsfromstring(str)
end
@@ -132,7 +132,7 @@ function sdlconfigcmd()
if _OPTIONS["targetos"]=="asmjs" then
return "sdl2-config"
elseif not _OPTIONS["SDL_INSTALL_ROOT"] then
- return _OPTIONS['TOOLCHAIN'] .. "pkg-config sdl2"
+ return pkgconfigcmd() .. " sdl2"
else
return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin","sdl2") .. "-config"
end
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 0fd15e5ca27..b73c9253819 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -1,6 +1,8 @@
-- license:BSD-3-Clause
-- copyright-holders:MAMEdev Team
+dofile('modules.lua')
+
forcedincludes {
MAME_DIR .. "src/osd/sdl/sdlprefix.h"
}
@@ -52,7 +54,7 @@ end
if _OPTIONS["NO_USE_MIDI"]~="1" and _OPTIONS["targetos"]=="linux" then
buildoptions {
- backtick("pkg-config --cflags alsa"),
+ backtick(pkgconfigcmd() .. " --cflags alsa"),
}
end
@@ -94,7 +96,7 @@ if BASE_TARGETOS=="unix" then
}
if _OPTIONS["targetos"]~="asmjs" then
buildoptions {
- backtick("pkg-config --cflags fontconfig"),
+ backtick(pkgconfigcmd() .. " --cflags fontconfig"),
}
end
end
@@ -121,7 +123,7 @@ elseif _OPTIONS["targetos"]=="linux" then
}
else
buildoptions {
- backtick("pkg-config --cflags Qt5Widgets"),
+ backtick(pkgconfigcmd() .. " --cflags Qt5Widgets"),
}
end
elseif _OPTIONS["targetos"]=="macosx" then