Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 23:42:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BGFX mandatory requirement (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-02-16 17:35:27 +01:00
parent e1ace73626
commit 9eb2734495
11 changed files with 15 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makefile
View File

@ -23,8 +23,6 @@
# BENCHMARKS = 1
# OSD = sdl
# USE_BGFX = 1
# NO_OPENGL = 1
# USE_DISPATCH_GL = 0
# MODERN_WIN_API = 0
# USE_XAUDIO2 = 0
@ -68,7 +66,6 @@
# MESA_INSTALL_ROOT = /opt/mesa
# SDL_INSTALL_ROOT = /opt/sdl2
# SDL_FRAMEWORK_PATH = $(HOME)/Library/Frameworks
# SDL_LIBVER = sdl
# USE_LIBSDL = 1
# CYGWIN_BUILD = 1
@ -563,10 +560,6 @@ ifdef DONT_USE_NETWORK
PARAMS += --DONT_USE_NETWORK='$(DONT_USE_NETWORK)'
endif
ifdef NO_OPENGL
PARAMS += --NO_OPENGL='$(NO_OPENGL)'
endif
ifdef USE_DISPATCH_GL
PARAMS += --USE_DISPATCH_GL='$(USE_DISPATCH_GL)'
endif
@ -1200,7 +1193,7 @@ endif
ifndef MARVELL_ROOTFS
$(error MARVELL_ROOTFS is not set)
endif
$(SILENT) $(GENIE) $(PARAMS) --gcc=steamlink --gcc_version=$(GCC_VERSION) --NO_OPENGL=1 --NO_USE_MIDI=1 --NO_X11=1 --NOASM=1 --SDL_INSTALL_ROOT=$(MARVELL_ROOTFS)/usr gmake
$(SILENT) $(GENIE) $(PARAMS) --gcc=steamlink --gcc_version=$(GCC_VERSION) --NO_USE_MIDI=1 --NO_X11=1 --NOASM=1 --SDL_INSTALL_ROOT=$(MARVELL_ROOTFS)/usr gmake
.PHONY: steamlink
ifndef MARVELL_SDK_PATH

14
scripts/genie.lua
View File

@ -275,15 +275,6 @@ newoption {
description = "NOWERROR",
}
newoption {
trigger = "USE_BGFX",
description = "Use of BGFX.",
allowed = {
{ "0", "Disabled" },
{ "1", "Enabled" },
}
}
newoption {
trigger = "DEPRECATED",
description = "Generate deprecation warnings during compilation.",
@ -427,11 +418,6 @@ if _OPTIONS["NOASM"]=="1" and not _OPTIONS["FORCE_DRC_C_BACKEND"] then
_OPTIONS["FORCE_DRC_C_BACKEND"] = "1"
end
USE_BGFX = 1
if(_OPTIONS["USE_BGFX"]~=nil) then
USE_BGFX = tonumber(_OPTIONS["USE_BGFX"])
end
if(_OPTIONS["TOOLCHAIN"] == nil) then
_OPTIONS['TOOLCHAIN'] = ""
end

2
scripts/src/3rdparty.lua
View File

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

8
scripts/src/main.lua
View File

@ -169,12 +169,8 @@ end
"portmidi",
}
end
if (USE_BGFX == 1) then
links {
"bgfx"
}
end
links{
links {
"bgfx",
"ocore_" .. _OPTIONS["osd"],
}

27
scripts/src/osd/modules.lua
View File

@ -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 {

8
scripts/src/osd/sdl.lua
View File

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

2
src/osd/sdl/video.cpp
View File

@ -381,12 +381,10 @@ void sdl_osd_interface::extract_video_config()
{
video_config.mode = VIDEO_MODE_SDL2ACCEL;
}
#ifdef USE_BGFX
else if (strcmp(stemp, SDLOPTVAL_BGFX) == 0)
{
video_config.mode = VIDEO_MODE_BGFX;
}
#endif
else
{
osd_printf_warning("Invalid video value %s; reverting to software\n", stemp);

2
src/osd/sdl/window.cpp
View File

@ -233,13 +233,11 @@ bool sdl_osd_interface::window_init()
if (drawsdl2_init(machine(), &draw))
video_config.mode = VIDEO_MODE_SOFT;
}
#ifdef USE_BGFX
if (video_config.mode == VIDEO_MODE_BGFX)
{
if (drawbgfx_init(machine(), &draw))
video_config.mode = VIDEO_MODE_SOFT;
}
#endif
if (video_config.mode == VIDEO_MODE_SOFT)
{
if (drawsdl_init(&draw))

2
src/osd/windows/video.cpp
View File

@ -377,10 +377,8 @@ void windows_osd_interface::extract_video_config()
video_config.mode = VIDEO_MODE_DDRAW;
else if (strcmp(stemp, "gdi") == 0)
video_config.mode = VIDEO_MODE_GDI;
#if defined (USE_BGFX)
else if (strcmp(stemp, "bgfx") == 0)
video_config.mode = VIDEO_MODE_BGFX;
#endif
else if (strcmp(stemp, "none") == 0)
{
video_config.mode = VIDEO_MODE_NONE;

2
src/osd/windows/video.h
View File

@ -22,9 +22,7 @@ enum {
VIDEO_MODE_NONE,
VIDEO_MODE_GDI,
VIDEO_MODE_DDRAW,
#if defined (USE_BGFX)
VIDEO_MODE_BGFX,
#endif
VIDEO_MODE_OPENGL,
VIDEO_MODE_D3D
};

4
src/osd/windows/window.cpp
View File

@ -38,9 +38,7 @@ extern int drawnone_init(running_machine &machine, osd_draw_callbacks *callbacks
extern int drawgdi_init(running_machine &machine, osd_draw_callbacks *callbacks);
extern int drawdd_init(running_machine &machine, osd_draw_callbacks *callbacks);
extern int drawd3d_init(running_machine &machine, osd_draw_callbacks *callbacks);
#if defined(USE_BGFX)
extern int drawbgfx_init(running_machine &machine, osd_draw_callbacks *callbacks);
#endif
extern int drawogl_init(running_machine &machine, osd_draw_callbacks *callbacks);
//============================================================
@ -226,10 +224,8 @@ bool windows_osd_interface::window_init()
}
if (video_config.mode == VIDEO_MODE_GDI)
drawgdi_init(machine(), &draw);
#if defined(USE_BGFX)
if (video_config.mode == VIDEO_MODE_BGFX)
drawbgfx_init(machine(), &draw);
#endif
if (video_config.mode == VIDEO_MODE_NONE)
drawnone_init(machine(), &draw);
if (video_config.mode == VIDEO_MODE_OPENGL)