Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 09:57:47 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-03-29 19:10:46 +02:00
commit befcf8a176
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/genie.lua
View File

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

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

@ -1,6 +1,7 @@
function maintargetosdoptions(_target)
if _OPTIONS["targetos"]=="windows" then
linkoptions{
"-municode",
"-L$(shell qmake -query QT_INSTALL_LIBS)",
}
@ -28,6 +29,7 @@ function maintargetosdoptions(_target)
configuration { }
end
configuration { "mingw*" }
linkoptions {
"-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_QTDEBUG=1",
"SDLMAME_NET_PCAP",
"main=utf8_main",
}
buildoptions {

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

@ -1,4 +1,8 @@
function maintargetosdoptions(_target)
linkoptions {
"-municode",
}
local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc"
if os.isfile(rcfile) then

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

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