Previous

199869 Revisions

Next

r36771 Sunday 29th March, 2015 at 16:58:11 UTC by Vasantha Crabb
Fix osdmini build on Windows (crashes if you run it though)

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

trunk/scripts/genie.lua

r245282	r245283
715	715
716	716
717	717	configuration { "mingw*" }
718		defines {
719		"main=utf8_main",
720		}
721	718	linkoptions {
722	719	"-static-libgcc",
723	720	"-static-libstdc++",
724		"-municode",
725	721	}
726	722	if _OPTIONS["osd"]=="sdl" then
727	723	links {
r245282	r245283
749	745
750	746	configuration { "vs*" }
751	747	defines {
752		"main=utf8_main",
753		}
754		defines {
755	748	"XML_STATIC",
756	749	"WIN32",
757	750	"_WIN32",

trunk/scripts/src/osd/sdl.lua

r245282	r245283
28	28	configuration { }
29	29	end
30	30
	31
	32	if _OPTIONS["targetos"]=="windows" then
	33	linkoptions {
	34	"-municode",
	35	}
	36	end
	37
	38
31	39	configuration { "mingw*" }
32	40	linkoptions {
33	41	"-Wl,--allow-multiple-definition",

trunk/scripts/src/osd/sdl_cfg.lua

r245282	r245283
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

r245282	r245283
13	13	end
14	14
15	15
	16	linkoptions {
	17	"-municode",
	18	}
	19
	20
16	21	project ("osd_" .. _OPTIONS["osd"])
17	22	uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
18	23	kind "StaticLib"

trunk/scripts/src/osd/windows_cfg.lua

r245282	r245283
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/602e2de3e016272f29067f7c98b24c5cdfa65834

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team