From 1c2ea023367ddbd15adeecefa7f425eb1eb5ef4a Mon Sep 17 00:00:00 2001 From: Robbbert Date: Wed, 27 Jul 2016 19:22:36 +1000 Subject: 0.176 Release Files --- docs/release/scripts/src/osd/modules.lua | 33 +++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'docs/release/scripts/src/osd/modules.lua') diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index b8e5bb61b83..25a7aca2c0e 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/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 { @@ -121,11 +129,9 @@ function osdmodulesbuild() MAME_DIR .. "3rdparty/compat/mingw", } - if _OPTIONS["MODERN_WIN_API"]~="1" then - includedirs { - MAME_DIR .. "3rdparty/compat/winsdk-override", - } - end + includedirs { + MAME_DIR .. "3rdparty/compat/winsdk-override", + } end if _OPTIONS["NO_OPENGL"]=="1" then @@ -245,11 +251,12 @@ function qtdebuggerbuild() local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then configuration { "gmake or ninja" } - if (version >= 30600) then - buildoptions { - "-Wno-inconsistent-missing-override", - } - end + if (version >= 30600) then + buildoptions { + "-Wno-inconsistent-missing-override", + } + end + configuration { } end files { @@ -345,7 +352,7 @@ function qtdebuggerbuild() } else buildoptions { - backtick("pkg-config --cflags Qt5Widgets"), + backtick(pkgconfigcmd() .. " --cflags Qt5Widgets"), } end end @@ -380,7 +387,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 @@ -421,7 +428,7 @@ function osdmodulestargetconf() "Qt5Widgets", } else - local str = backtick("pkg-config --libs Qt5Widgets") + local str = backtick(pkgconfigcmd() .. " --libs Qt5Widgets") addlibfromstring(str) addoptionsfromstring(str) end -- cgit v1.2.3-70-g09d2