Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-07 09:25:34 +03:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix osdmini build on Windows (crashes if you run it though)

Browse Source
This commit is contained in:
Vas Crabb 2015-03-30 03:50:34 +11:00
parent 816518fd49
commit 602e2de3e0
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/genie.lua
View File

@ -715,13 +715,9 @@ configuration { "osx*" }
configuration { "mingw*" } configuration { "mingw*" }
defines {
"main=utf8_main",
}
linkoptions { linkoptions {
"-static-libgcc", "-static-libgcc",
"-static-libstdc++", "-static-libstdc++",
"-municode",
} }
if _OPTIONS["osd"]=="sdl" then if _OPTIONS["osd"]=="sdl" then
links { links {
@ -748,9 +744,6 @@ end
} }
configuration { "vs*" } configuration { "vs*" }
defines {
"main=utf8_main",
}
defines { defines {
"XML_STATIC", "XML_STATIC",
"WIN32", "WIN32",

8
scripts/src/osd/sdl.lua
View File

@ -28,6 +28,14 @@ function maintargetosdoptions(_target)
configuration { } configuration { }
end end
if _OPTIONS["targetos"]=="windows" then
linkoptions {
"-municode",
}
end
configuration { "mingw*" } configuration { "mingw*" }
linkoptions { linkoptions {
"-Wl,--allow-multiple-definition", "-Wl,--allow-multiple-definition",

1
scripts/src/osd/sdl_cfg.lua
View File

@ -13,6 +13,7 @@ if _OPTIONS["targetos"]=="windows" then
"USE_OPENGL=1", "USE_OPENGL=1",
"USE_QTDEBUG=1", "USE_QTDEBUG=1",
"SDLMAME_NET_PCAP", "SDLMAME_NET_PCAP",
"main=utf8_main",
} }
buildoptions { buildoptions {

5
scripts/src/osd/windows.lua
View File

@ -13,6 +13,11 @@ function maintargetosdoptions(_target)
end end
linkoptions {
"-municode",
}
project ("osd_" .. _OPTIONS["osd"]) project ("osd_" .. _OPTIONS["osd"])
uuid (os.uuid("osd_" .. _OPTIONS["osd"])) uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
kind "StaticLib" kind "StaticLib"

1
scripts/src/osd/windows_cfg.lua
View File

@ -12,4 +12,5 @@ defines {
"USE_DISPATCH_GL=1", "USE_DISPATCH_GL=1",
"DIRECTINPUT_VERSION=0x0800", "DIRECTINPUT_VERSION=0x0800",
"SDLMAME_NET_PCAP", "SDLMAME_NET_PCAP",
"main=utf8_main",
} }