MAME SVN History

199869 Revisions

r36775 Sunday 29th March, 2015 at 17:10:46 UTC by Miodrag Milanović
Merge branch 'master' of https://github.com/mamedev/mame

[scripts]	genie.lua
[scripts/src/osd]	sdl.lua sdl_cfg.lua windows.lua windows_cfg.lua

trunk/scripts/genie.lua
r245286	r245287
718	718
719	719
720	720	configuration { "mingw*" }
721		defines {
722		"main=utf8_main",
723		}
724	721	linkoptions {
725	722	"-static-libgcc",
726	723	"-static-libstdc++",
727		"-municode",
728	724	}
729	725	if _OPTIONS["osd"]=="sdl" then
730	726	links {
r245286	r245287
752	748
753	749	configuration { "vs*" }
754	750	defines {
755		"main=utf8_main",
756		}
757		defines {
758	751	"XML_STATIC",
759	752	"WIN32",
760	753	"_WIN32",

trunk/scripts/src/osd/sdl.lua
r245286	r245287
1	1	function maintargetosdoptions(_target)
2	2	if _OPTIONS["targetos"]=="windows" then
3	3	linkoptions{
	4	"-municode",
4	5	"-L$(shell qmake -query QT_INSTALL_LIBS)",
5	6	}
6	7
r245286	r245287
28	29	configuration { }
29	30	end
30	31
	32
31	33	configuration { "mingw*" }
32	34	linkoptions {
33	35	"-Wl,--allow-multiple-definition",

trunk/scripts/src/osd/sdl_cfg.lua
r245286	r245287
13	13	"USE_OPENGL=1",
14	14	"USE_QTDEBUG=1",
15	15	"SDLMAME_NET_PCAP",
	16	"main=utf8_main",
16	17	}
17	18
18	19	buildoptions {

trunk/scripts/src/osd/windows.lua
r245286	r245287
1	1	function maintargetosdoptions(_target)
	2	linkoptions {
	3	"-municode",
	4	}
	5
2	6	local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc"
3	7
4	8	if os.isfile(rcfile) then

trunk/scripts/src/osd/windows_cfg.lua
r245286	r245287
12	12	"USE_DISPATCH_GL=1",
13	13	"DIRECTINPUT_VERSION=0x0800",
14	14	"SDLMAME_NET_PCAP",
	15	"main=utf8_main",
15	16	}

https://github.com/mamedev/mame/commit/befcf8a176c649f91a760419c64ab821f7380c36

199869 Revisions

© 1997-2024 The MAME Team