MAME SVN History

199869 Revisions

r36872 Wednesday 1st April, 2015 at 09:06:53 UTC by Miodrag Milanović
fix it properly (nw)

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

trunk/scripts/genie.lua
r245383	r245384
239	239
240	240	flags {
241	241	"StaticRuntime",
242		"Unicode",
243	242	"NoPCH",
244	243	}
245	244
r245383	r245384
328	327
329	328
330	329	if _OPTIONS["targetos"]=="windows" then
	330	configuration { "mingw*" }
	331	linkoptions {
	332	"-municode",
	333	}
	334	configuration { "vs*" }
	335	flags {
	336	"Unicode",
	337	}
331	338	configuration { "x64" }
332	339	defines {
333	340	"X64_WINDOWS_ABI",
334	341	}
335	342	configuration { }
	343	defines {
	344	"UNICODE",
	345	"_UNICODE",
	346	"main=utf8_main",
	347	}
336	348	end
337	349
338	350	-- Avoid error when invoking genie --help.

trunk/scripts/src/osd/sdl.lua
r245383	r245384
43	43	end
44	44
45	45	if _OPTIONS["targetos"]=="windows" then
46		configuration { "mingw*" }
47		linkoptions{
48		"-municode",
49		}
50	46	configuration { "x32", "vs*" }
51	47	libdirs {
52	48	path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86")

trunk/scripts/src/osd/sdl_cfg.lua
r245383	r245384
99	99	end
100	100
101	101	if _OPTIONS["targetos"]=="windows" then
102		defines {
103		"UNICODE",
104		"_UNICODE",
105		"main=utf8_main",
106		}
107
108	102	configuration { "vs*" }
109	103	includedirs {
110	104	path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include")

trunk/scripts/src/osd/windows.lua
r245383	r245384
4	4	function maintargetosdoptions(_target)
5	5	osdmodulestargetconf()
6	6
7		configuration { "mingw*" }
8		linkoptions {
9		"-municode",
10		}
11
12		configuration { }
13
14	7	if _OPTIONS["DIRECTINPUT"] == "8" then
15	8	links {
16	9	"dinput8",

199869 Revisions