summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-16 17:35:27 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-16 17:35:27 +0100
commit9eb2734495cda6ff0391f317ca2565b421476738 (patch)
tree45819d6c0d38cf5cc890c31378e82e394b9d06e8 /scripts/src
parente1ace736267d354caa3c9e1ff844bdc88d645864 (diff)
BGFX mandatory requirement (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua2
-rw-r--r--scripts/src/main.lua8
-rw-r--r--scripts/src/osd/modules.lua27
-rw-r--r--scripts/src/osd/sdl.lua8
4 files changed, 14 insertions, 31 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 9f44143da1d..04038127dfb 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -705,7 +705,6 @@ end
-- BGFX library objects
--------------------------------------------------
-if (USE_BGFX == 1) then
project "bgfx"
uuid "d3e7e119-35cf-4f4f-aba0-d3bdcd1b879a"
kind "StaticLib"
@@ -833,7 +832,6 @@ end
MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm",
}
end
-end
--------------------------------------------------
-- PortAudio library objects
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 9d0d9a9d9e1..9873ba269c9 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -169,12 +169,8 @@ end
"portmidi",
}
end
- if (USE_BGFX == 1) then
- links {
- "bgfx"
- }
- end
- links{
+ links {
+ "bgfx",
"ocore_" .. _OPTIONS["osd"],
}
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 6e0bf611844..c3d4d3a117d 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -91,19 +91,14 @@ function osdmodulesbuild()
}
end
- if USE_BGFX == 1 then
- files {
- MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
- MAME_DIR .. "src/osd/modules/render/binpacker.cpp",
- }
- defines {
- "USE_BGFX"
- }
- includedirs {
- MAME_DIR .. "3rdparty/bgfx/include",
- MAME_DIR .. "3rdparty/bx/include",
- }
- end
+ files {
+ MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
+ MAME_DIR .. "src/osd/modules/render/binpacker.cpp",
+ }
+ includedirs {
+ MAME_DIR .. "3rdparty/bgfx/include",
+ MAME_DIR .. "3rdparty/bx/include",
+ }
if _OPTIONS["NO_USE_MIDI"]=="1" then
defines {
@@ -346,11 +341,7 @@ newoption {
}
if not _OPTIONS["USE_DISPATCH_GL"] then
- if USE_BGFX == 1 then
- _OPTIONS["USE_DISPATCH_GL"] = "0"
- else
- _OPTIONS["USE_DISPATCH_GL"] = "1"
- end
+ _OPTIONS["USE_DISPATCH_GL"] = "0"
end
newoption {
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 3d1a3663614..0aad67e89a2 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -87,11 +87,9 @@ function maintargetosdoptions(_target,_subtarget)
configuration { "mingw*" or "vs*" }
targetprefix "sdl"
- if USE_BGFX == 1 then
- links {
- "psapi"
- }
- end
+ links {
+ "psapi"
+ }
configuration { }
end