summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-03-31 16:24:43 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-03-31 16:24:43 +0200
commit5c0388525233d7d802dfd087139899b4e7b6eb64 (patch)
treea8f3800269d3971eee28b307efc0e0466d83d477
parent5221cab621f7b9e7665ffc6cfada10e49938afbb (diff)
parent6116f8c4fa22bde7d5d2425dda9eb656b30c889f (diff)
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r--makefile16
-rw-r--r--scripts/genie.lua5
-rw-r--r--scripts/src/osd/sdl.lua125
-rw-r--r--scripts/src/osd/sdl_cfg.lua49
-rw-r--r--src/mame/drivers/zn.c6
5 files changed, 177 insertions, 24 deletions
diff --git a/makefile b/makefile
index 710e4469baa..f4d21d146ed 100644
--- a/makefile
+++ b/makefile
@@ -328,6 +328,18 @@ endif
endif
PARAMS += --USE_QT=$(USE_QT)
+ifdef NO_OPENGL
+PARAMS += --NO_OPENGL='$(NO_OPENGL)'
+endif
+
+ifdef USE_DISPATCH_GL
+PARAMS += --USE_DISPATCH_GL='$(USE_DISPATCH_GL)'
+endif
+
+ifdef MESA_INSTALL_ROOT
+PARAMS += --MESA_INSTALL_ROOT='$(MESA_INSTALL_ROOT)'
+endif
+
ifdef NO_X11
PARAMS += --NO_X11='$(NO_X11)'
endif
@@ -336,6 +348,10 @@ ifdef NO_USE_XINPUT
PARAMS += --NO_USE_XINPUT='$(NO_USE_XINPUT)'
endif
+ifdef NO_USE_MIDI
+PARAMS += --NO_USE_MIDI='$(NO_USE_MIDI)'
+endif
+
ifdef SDL_LIBVER
PARAMS += --SDL_LIBVER='$(SDL_LIBVER)'
endif
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 65f6da8b5dc..906eeeb13d3 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -696,9 +696,7 @@ configuration { "nacl*" }
configuration { "linux-*" }
links {
- "asound",
"dl",
- "GL",
}
defines
{
@@ -714,8 +712,6 @@ configuration { "linux-*" }
configuration { "osx*" }
links {
- "CoreAudio.framework",
- "CoreMIDI.framework",
"pthread",
}
flags {
@@ -730,7 +726,6 @@ configuration { "mingw*" }
}
if _OPTIONS["osd"]=="sdl" then
links {
- "opengl32",
"SDL2",
"imm32",
"version",
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 8aa7f387937..f905b9bb8a0 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -1,4 +1,13 @@
function maintargetosdoptions(_target)
+ if _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
+ libdirs {
+ path.join(_OPTIONS["MESA_INSTALL_ROOT"],"lib"),
+ }
+ linkoptions {
+ "-Wl,-rpath=" .. path.join(_OPTIONS["MESA_INSTALL_ROOT"],"lib"),
+ }
+ end
+
if _OPTIONS["NO_X11"]~="1" then
links {
"X11",
@@ -23,12 +32,22 @@ function maintargetosdoptions(_target)
"SDL_ttf",
}
end
+ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" then
+ links {
+ "GL"
+ }
+ end
linkoptions {
string.gsub(os.outputof("pkg-config --libs fontconfig"), '[\r\n]+', ' '),
}
end
if _OPTIONS["targetos"]=="windows" then
+ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" then
+ links {
+ "opengl32"
+ }
+ end
configuration { "mingw*" }
linkoptions{
"-municode",
@@ -44,7 +63,6 @@ function maintargetosdoptions(_target)
configuration { "vs*" }
links {
"SDL2",
- "opengl32",
}
configuration {}
@@ -59,16 +77,32 @@ function maintargetosdoptions(_target)
}
end
elseif _OPTIONS["targetos"]=="linux" then
- if (USE_QT == 1) then
+ if USE_QT == 1 then
+ linkoptions {
+ "$(shell pkg-config --libs QtGui)",
+ }
links {
"QtGui",
"QtCore",
}
-
+ end
+ if _OPTIONS["NO_USE_MIDI"]~="1" then
linkoptions {
- "$(shell pkg-config --libs QtGui)",
+ string.gsub(os.outputof("pkg-config --libs alsa"), '[\r\n]+', ' '),
+ }
+ end
+ elseif _OPTIONS["targetos"]=="macosx" then
+ if _OPTIONS["NO_USE_MIDI"]~="1" then
+ links {
+ "CoreAudio.framework",
+ "CoreMIDI.framework",
}
end
+ elseif _OPTIONS["targetos"]=="haiku" then
+ links {
+ "network",
+ "bsd",
+ }
end
configuration { "mingw*" or "vs*" }
@@ -82,10 +116,49 @@ function sdlconfigcmd()
if not _OPTIONS["SDL_INSTALL_ROOT"] then
return _OPTIONS["SDL_LIBVER"] .. "-config"
else
- return _OPTIONS["SDL_INSTALL_ROOT"] .. "/bin/" .. _OPTIONS["SDL_LIBVER"] .. "-config"
+ return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin",_OPTIONS["SDL_LIBVER"]) .. "-config"
+ end
+end
+
+
+newoption {
+ trigger = "NO_OPENGL",
+ description = "Disable use of OpenGL",
+ allowed = {
+ { "0", "Enable OpenGL" },
+ { "1", "Disable OpenGL" },
+ },
+}
+
+if not _OPTIONS["NO_OPENGL"] then
+ if _OPTIONS["targetos"]=="os2" then
+ _OPTIONS["NO_OPENGL"] = "1"
+ else
+ _OPTIONS["NO_OPENGL"] = "0"
+ end
+end
+
+newoption {
+ trigger = "USE_DISPATCH_GL",
+ description = "Use GL-dispatching (takes precedence over MESA_INSTALL_ROOT)",
+ allowed = {
+ { "0", "Link to OpenGL library" },
+ { "1", "Use GL-dispatching" },
+ },
+}
+
+if not _OPTIONS["USE_DISPATCH_GL"] then
+ if USE_BGFX == 1 then
+ _OPTIONS["USE_DISPATCH_GL"] = "0"
+ else
+ _OPTIONS["USE_DISPATCH_GL"] = "1"
end
end
+newoption {
+ trigger = "MESA_INSTALL_ROOT",
+ description = "link against specific GL-Library - also adds rpath to executable",
+}
newoption {
trigger = "NO_X11",
@@ -118,6 +191,23 @@ if not _OPTIONS["NO_USE_XINPUT"] then
end
newoption {
+ trigger = "NO_USE_MIDI",
+ description = "Disable MIDI I/O",
+ allowed = {
+ { "0", "Enable MIDI" },
+ { "1", "Disable MIDI" },
+ },
+}
+
+if not _OPTIONS["NO_USE_MIDI"] then
+ if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
+ _OPTIONS["NO_USE_MIDI"] = "1"
+ else
+ _OPTIONS["NO_USE_MIDI"] = "0"
+ end
+end
+
+newoption {
trigger = "SDL_LIBVER",
description = "Choose SDL version",
allowed = {
@@ -187,10 +277,10 @@ elseif _OPTIONS["targetos"]=="os2" then
end
if _OPTIONS["NO_X11"]~="1" then
- linkoptions {
- "-L/usr/X11/lib",
- "-L/usr/X11R6/lib",
- "-L/usr/openwin/lib",
+ libdirs {
+ "/usr/X11/lib",
+ "/usr/X11R6/lib",
+ "/usr/openwin/lib",
}
if _OPTIONS["SDL_LIBVER"]=="sdl" then
links {
@@ -244,6 +334,13 @@ if BASE_TARGETOS=="unix" then
end
end
end
+elseif BASE_TARGETOS=="os2" then
+ linkoptions {
+ string.gsub(os.outputof(sdlconfigcmd() .. " --libs"), '[\r\n]+', ' '),
+ }
+ links {
+ "pthread"
+ }
end
configuration { "mingw*" }
@@ -325,13 +422,10 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/sdl/watchdog.c",
MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
MAME_DIR .. "src/osd/modules/render/drawsdl.c",
- MAME_DIR .. "src/osd/modules/render/drawogl.c",
MAME_DIR .. "src/osd/modules/debugger/none.c",
MAME_DIR .. "src/osd/modules/debugger/debugint.c",
MAME_DIR .. "src/osd/modules/debugger/debugwin.c",
MAME_DIR .. "src/osd/modules/debugger/debugqt.c",
- MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.c",
- MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c",
MAME_DIR .. "src/osd/modules/font/font_sdl.c",
MAME_DIR .. "src/osd/modules/font/font_windows.c",
MAME_DIR .. "src/osd/modules/font/font_osx.c",
@@ -346,6 +440,13 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/sound/sdl_sound.c",
MAME_DIR .. "src/osd/modules/sound/none.c",
}
+ if _OPTIONS["NO_OPENGL"]~="1" then
+ files {
+ MAME_DIR .. "src/osd/modules/render/drawogl.c",
+ MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.c",
+ MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c",
+ }
+ end
if _OPTIONS["SDL_LIBVER"]=="sdl2" then
files {
MAME_DIR .. "src/osd/modules/render/draw13.c",
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index af4df5de87f..8cdc526a6c1 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -2,6 +2,26 @@ forcedincludes {
MAME_DIR .. "src/osd/sdl/sdlprefix.h"
}
+if _OPTIONS["NO_OPENGL"]=="1" then
+ defines {
+ "USE_OPENGL=0",
+ }
+else
+ defines {
+ "USE_OPENGL=1",
+ }
+ if _OPTIONS["USE_DISPATCH_GL"]=="1" then
+ defines {
+ "USE_DISPATCH_GL=1",
+ }
+ elseif _OPTIONS["MESA_INSTALL_ROOT"] then
+ includedirs {
+ path.join(_OPTIONS["MESA_INSTALL_ROOT"],"include"),
+ }
+ end
+end
+
+
if _OPTIONS["NO_X11"]=="1" then
defines {
"SDLMAME_NO_X11",
@@ -28,6 +48,16 @@ else
}
end
+if _OPTIONS["NO_USE_MIDI"]=="1" then
+ defines {
+ "NO_USE_MIDI",
+ }
+elseif _OPTIONS["targetos"]=="linux" then
+ buildoptions {
+ string.gsub(os.outputof("pkg-config --cflags alsa"), '[\r\n]+', ' '),
+ }
+end
+
if _OPTIONS["SDL_LIBVER"]=="sdl2" then
defines {
"SDLMAME_SDL2=1",
@@ -84,7 +114,6 @@ if _OPTIONS["targetos"]=="windows" then
"SDLMAME_WIN32",
"UNICODE",
"_UNICODE",
- "USE_OPENGL=1",
"USE_QTDEBUG=" .. USE_QT,
"SDLMAME_NET_PCAP",
"main=utf8_main",
@@ -104,11 +133,9 @@ if _OPTIONS["targetos"]=="windows" then
elseif _OPTIONS["targetos"]=="linux" then
defines {
- "USE_OPENGL=1",
"USE_QTDEBUG=" .. USE_QT,
"SDLMAME_NET_TAPTUN",
}
-
buildoptions {
'$(shell pkg-config --cflags QtGui)',
}
@@ -116,12 +143,26 @@ elseif _OPTIONS["targetos"]=="macosx" then
defines {
"SDLMAME_MACOSX",
"SDLMAME_DARWIN",
- "USE_OPENGL=1",
"USE_QTDEBUG=0",
"SDLMAME_NET_PCAP",
}
+elseif _OPTIONS["targetos"]=="freebsd" then
+ defines {
+ "NO_AFFINITY_NP",
+ }
+ buildoptions {
+ -- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings
+ "-isystem /usr/local/include",
+ }
+elseif _OPTIONS["targetos"]=="solaris" then
+ defines {
+ "NO_AFFINITY_NP",
+ }
elseif _OPTIONS["targetos"]=="os2" then
defines {
"SDLMAME_OS2",
}
+ buildoptions {
+ string.gsub(os.outputof(sdlconfigcmd() .. " --cflags"), '[\r\n]+', ' '),
+ }
end
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index f47ccbdb383..26ff27e3248 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -4841,9 +4841,9 @@ GAME( 1999, sfex2p, cpzn2, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom
GAME( 1999, sfex2pa, sfex2p, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Asia 990611)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1999, sfex2ph, sfex2p, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Hispanic 990611)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1999, sfex2pj, sfex2p, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Japan 990611)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
-GAME( 1999, strider2, cpzn2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider 2 (USA 991213)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
-GAME( 1999, strider2a, strider2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider 2 (Asia 991213)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
-GAME( 1999, shiryu2, strider2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider Hiryu 2 (Japan 991213)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
+GAME( 1999, strider2, cpzn2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider 2 (USA 991213)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_NOT_WORKING ) // random hangs / crashes
+GAME( 1999, strider2a, strider2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider 2 (Asia 991213)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
+GAME( 1999, shiryu2, strider2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider Hiryu 2 (Japan 991213)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
/* Atari */