Fix compile. (nw)

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

View File

@ -726,23 +726,25 @@ configuration { "linux-*" }
configuration { "osx*" }
links {
"SDL2.framework",
"Cocoa.framework",
"OpenGL.framework",
"CoreAudio.framework",
"CoreMIDI.framework",
"SDL2.framework",
"pthread",
}
buildoptions {
"-F/Library/Frameworks/",
}
linkoptions {
"-F/Library/Frameworks/",
}
configuration { "mingw*" }
defines {
"main=utf8_main",
}
linkoptions {
"-static-libgcc",
"-static-libstdc++",
"-municode",
}
if _OPTIONS["osd"]=="sdl" then
links {
@ -769,9 +771,6 @@ end
}
configuration { "vs*" }
defines {
"main=utf8_main",
}
defines {
"XML_STATIC",
"WIN32",

View File

@ -1,25 +1,28 @@
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{
"-L$(shell qmake -query QT_INSTALL_LIBS)",
}
links {
"qtmain",
"QtGui4",
"QtCore4",
}
end
if _OPTIONS["targetos"]=="linux" then
end
if _OPTIONS["targetos"]=="linux" then
if (USE_QT == 1) then
links {
'QtGui',
'QtCore',
"QtGui",
"QtCore",
}
linkoptions {
'$(shell pkg-config --libs QtGui)',
"$(shell pkg-config --libs QtGui)",
}
end
end
@ -30,6 +33,7 @@ function maintargetosdoptions(_target)
configuration { }
end
configuration { "mingw*" }
linkoptions {
"-Wl,--allow-multiple-definition",

View File

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

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

View File

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