summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts/src/osd
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2016-07-27 19:22:36 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2016-07-27 19:22:36 +1000
commit1c2ea023367ddbd15adeecefa7f425eb1eb5ef4a (patch)
tree546d084fbaf1c21457ba408706a5b74d886f766c /docs/release/scripts/src/osd
parent437eeecc020c81384491dc193bf85a8ed5994b56 (diff)
0.176 Release Fileshbmame176
Diffstat (limited to 'docs/release/scripts/src/osd')
-rw-r--r--docs/release/scripts/src/osd/modules.lua33
-rw-r--r--docs/release/scripts/src/osd/sdl.lua6
-rw-r--r--docs/release/scripts/src/osd/sdl_cfg.lua8
3 files changed, 28 insertions, 19 deletions
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
diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua
index 4094e48c6be..44b957d8dde 100644
--- a/docs/release/scripts/src/osd/sdl.lua
+++ b/docs/release/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
@@ -340,7 +340,7 @@ project ("qtdbg_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/render",
MAME_DIR .. "3rdparty",
}
- configuration { "linux-*" }
+ configuration { "linux-* or freebsd" }
buildoptions {
"-fPIC",
}
diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua
index 0fd15e5ca27..b73c9253819 100644
--- a/docs/release/scripts/src/osd/sdl_cfg.lua
+++ b/docs/release/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