MAME SVN History

199869 Revisions

r36831 Tuesday 31st March, 2015 at 14:21:59 UTC by Vasantha Crabb
Restore NO_USE_MIDI and some more OS support from the old SDL makefile

[/trunk]	makefile
[scripts]	genie.lua
[scripts/src/osd]	sdl.lua sdl_cfg.lua
[src/mame/drivers]	zn.c

trunk/makefile
r245342	r245343
336	336	PARAMS += --NO_USE_XINPUT='$(NO_USE_XINPUT)'
337	337	endif
338	338
	339	ifdef NO_USE_MIDI
	340	PARAMS += --NO_USE_MIDI='$(NO_USE_MIDI)'
	341	endif
	342
339	343	ifdef SDL_LIBVER
340	344	PARAMS += --SDL_LIBVER='$(SDL_LIBVER)'
341	345	endif

trunk/scripts/genie.lua
r245342	r245343
696	696
697	697	configuration { "linux-*" }
698	698	links {
699		"asound",
700	699	"dl",
701	700	"GL",
702	701	}
r245342	r245343
714	713
715	714	configuration { "osx*" }
716	715	links {
717		"CoreAudio.framework",
718		"CoreMIDI.framework",
719	716	"pthread",
720	717	}
721	718	flags {
r245342	r245343
896	893	error("Unsupported value '" .. _OPTIONS["osd"] .. "' for OSD")
897	894	end
898	895	dofile(path.join("src", "osd", _OPTIONS["osd"] .. ".lua"))
899		dofile(path.join("src", "lib.lua"))
900	896
901		group "3rdparty"
902	897	dofile(path.join("src", "3rdparty.lua"))
	898	dofile(path.join("src", "lib.lua"))
903	899
904
905	900	group "core"
906	901
907	902	dofile(path.join("src", "emu.lua"))

trunk/scripts/src/osd/sdl.lua
r245342	r245343
59	59	}
60	60	end
61	61	elseif _OPTIONS["targetos"]=="linux" then
62		if (USE_QT == 1) then
	62	if USE_QT == 1 then
	63	linkoptions {
	64	"$(shell pkg-config --libs QtGui)",
	65	}
63	66	links {
64	67	"QtGui",
65	68	"QtCore",
66	69	}
67
	70	end
	71	if _OPTIONS["NO_USE_MIDI"]~="1" then
68	72	linkoptions {
69		"$(s~~hell~~ pkg-config --libs ~~QtGui)~~",
	73	string.gsub(os.outputof("pkg-config --libs alsa"), '[\r\n]+', ' '),
70	74	}
71	75	end
	76	elseif _OPTIONS["targetos"]=="macosx" then
	77	if _OPTIONS["NO_USE_MIDI"]~="1" then
	78	links {
	79	"CoreAudio.framework",
	80	"CoreMIDI.framework",
	81	}
	82	end
	83	elseif _OPTIONS["targetos"]=="haiku" then
	84	links {
	85	"network",
	86	"bsd",
	87	}
72	88	end
73	89
74	90	configuration { "mingw" or "vs" }
r245342	r245343
82	98	if not _OPTIONS["SDL_INSTALL_ROOT"] then
83	99	return _OPTIONS["SDL_LIBVER"] .. "-config"
84	100	else
85		return _OPTIONS["SDL_INSTALL_ROOT"] .. "/bin/" .. _OPTIONS["SDL_LIBVER"] .. "-config"
	101	return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin",_OPTIONS["SDL_LIBVER"]) .. "-config"
86	102	end
87	103	end
88	104
r245342	r245343
118	134	end
119	135
120	136	newoption {
	137	trigger = "NO_USE_MIDI",
	138	description = "Disable MIDI I/O",
	139	allowed = {
	140	{ "0", "Enable MIDI" },
	141	{ "1", "Disable MIDI" },
	142	},
	143	}
	144
	145	if not _OPTIONS["NO_USE_MIDI"] then
	146	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
	147	_OPTIONS["NO_USE_MIDI"] = "1"
	148	else
	149	_OPTIONS["NO_USE_MIDI"] = "0"
	150	end
	151	end
	152
	153	newoption {
121	154	trigger = "SDL_LIBVER",
122	155	description = "Choose SDL version",
123	156	allowed = {
r245342	r245343
244	277	end
245	278	end
246	279	end
	280	elseif BASE_TARGETOS=="os2" then
	281	linkoptions {
	282	string.gsub(os.outputof(sdlconfigcmd() .. " --libs"), '[\r\n]+', ' '),
	283	}
	284	links {
	285	"pthread"
	286	}
247	287	end
248	288
249	289	configuration { "mingw*" }

trunk/scripts/src/osd/sdl_cfg.lua
r245342	r245343
28	28	}
29	29	end
30	30
	31	if _OPTIONS["NO_USE_MIDI"]=="1" then
	32	defines {
	33	"NO_USE_MIDI",
	34	}
	35	elseif _OPTIONS["targetos"]=="linux" then
	36	buildoptions {
	37	string.gsub(os.outputof("pkg-config --cflags alsa"), '[\r\n]+', ' '),
	38	}
	39	end
	40
31	41	if _OPTIONS["SDL_LIBVER"]=="sdl2" then
32	42	defines {
33	43	"SDLMAME_SDL2=1",
r245342	r245343
108	118	"USE_QTDEBUG=" .. USE_QT,
109	119	"SDLMAME_NET_TAPTUN",
110	120	}
111
112	121	buildoptions {
113	122	'$(shell pkg-config --cflags QtGui)',
114	123	}
r245342	r245343
120	129	"USE_QTDEBUG=0",
121	130	"SDLMAME_NET_PCAP",
122	131	}
	132	elseif _OPTIONS["targetos"]=="freebsd" then
	133	defines {
	134	"NO_AFFINITY_NP",
	135	}
	136	buildoptions {
	137	-- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings
	138	"-isystem /usr/local/include",
	139	}
	140	elseif _OPTIONS["targetos"]=="solaris" then
	141	defines {
	142	"NO_AFFINITY_NP",
	143	}
123	144	elseif _OPTIONS["targetos"]=="os2" then
124	145	defines {
125	146	"SDLMAME_OS2",
126	147	}
	148	buildoptions {
	149	string.gsub(os.outputof(sdlconfigcmd() .. " --cflags"), '[\r\n]+', ' '),
	150	}
127	151	end

trunk/src/mame/drivers/zn.c
r245342	r245343
4841	4841	GAME( 1999, sfex2pa, sfex2p, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Asia 990611)", GAME_IMPERFECT_GRAPHICS \| GAME_IMPERFECT_SOUND )
4842	4842	GAME( 1999, sfex2ph, sfex2p, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Hispanic 990611)", GAME_IMPERFECT_GRAPHICS \| GAME_IMPERFECT_SOUND )
4843	4843	GAME( 1999, sfex2pj, sfex2p, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Japan 990611)", GAME_IMPERFECT_GRAPHICS \| GAME_IMPERFECT_SOUND )
4844		GAME( 1999, strider2, cpzn2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider 2 (USA 991213)", GAME_IMPERFECT_GRAPHICS \| GAME_IMPERFECT_SOUND )
4845		GAME( 1999, strider2a, strider2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider 2 (Asia 991213)", GAME_IMPERFECT_GRAPHICS \| GAME_IMPERFECT_SOUND )
4846		GAME( 1999, shiryu2, strider2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider Hiryu 2 (Japan 991213)", GAME_IMPERFECT_GRAPHICS \| GAME_IMPERFECT_SOUND )
	4844	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
	4845	GAME( 1999, strider2a, strider2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider 2 (Asia 991213)", GAME_IMPERFECT_GRAPHICS \| GAME_IMPERFECT_SOUND \| GAME_NOT_WORKING )
	4846	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 )
4847	4847
4848	4848	/* Atari */
4849	4849

https://github.com/mamedev/mame/commit/9a2c6d95c80b849e70fd3428d5e7c672fe2b607e

199869 Revisions