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

Fix compile. (nw)

Browse Source
This commit is contained in:
couriersud 2015-03-29 22:50:55 +02:00
parent 4a6023e471
commit a67f2cb095
5 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/genie.lua
View File

@ -726,23 +726,25 @@ configuration { "linux-*" }
configuration { "osx*" } configuration { "osx*" }
links { links {
"SDL2.framework",
"Cocoa.framework", "Cocoa.framework",
"OpenGL.framework", "OpenGL.framework",
"CoreAudio.framework", "CoreAudio.framework",
"CoreMIDI.framework", "CoreMIDI.framework",
"SDL2.framework",
"pthread", "pthread",
} }
buildoptions {
"-F/Library/Frameworks/",
}
linkoptions {
"-F/Library/Frameworks/",
}
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 {
@ -769,9 +771,6 @@ end
} }
configuration { "vs*" } configuration { "vs*" }
defines {
"main=utf8_main",
}
defines { defines {
"XML_STATIC", "XML_STATIC",
"WIN32", "WIN32",

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

@ -1,25 +1,28 @@
function maintargetosdoptions(_target) function maintargetosdoptions(_target)
if (USE_QT == 1) then if _OPTIONS["targetos"]=="windows" then
if _OPTIONS["targetos"]=="windows" then linkoptions{
"-municode",
}
if (USE_QT == 1) then
linkoptions{ linkoptions{
"-L$(shell qmake -query QT_INSTALL_LIBS)", "-L$(shell qmake -query QT_INSTALL_LIBS)",
} }
links { links {
"qtmain", "qtmain",
"QtGui4", "QtGui4",
"QtCore4", "QtCore4",
} }
end end
end
if _OPTIONS["targetos"]=="linux" then if _OPTIONS["targetos"]=="linux" then
if (USE_QT == 1) then
links { links {
'QtGui', "QtGui",
'QtCore', "QtCore",
} }
linkoptions { linkoptions {
'$(shell pkg-config --libs QtGui)', "$(shell pkg-config --libs QtGui)",
} }
end end
end end
@ -30,6 +33,7 @@ function maintargetosdoptions(_target)
configuration { } configuration { }
end 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=" .. USE_QT, "USE_QTDEBUG=" .. USE_QT,
"SDLMAME_NET_PCAP", "SDLMAME_NET_PCAP",
"main=utf8_main",
} }
buildoptions { buildoptions {

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

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

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",
} }