Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 07:52:35 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #813 from jmallach/qt5-build

Browse Source 
Pass explicit -qt5 to all moc and qmake calls.
This commit is contained in:
Miodrag Milanović 2016-04-16 08:57:01 +02:00
commit 0876691a6f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,14 +288,14 @@ function qtdebuggerbuild()
MOC = "moc"
else
if _OPTIONS["QT_HOME"]~=nil then
QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake --version 2>/dev/null")
QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 --version 2>/dev/null")
if (QMAKETST=='') then
print("Qt's Meta Object Compiler (moc) wasn't found!")
os.exit(1)
end
MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
MOC = _OPTIONS["QT_HOME"] .. "/bin/moc -qt5"
else
MOCTST = backtick("which moc-qt5 2>/dev/null")
MOCTST = backtick("which moc 2>/dev/null")
if (MOCTST=='') then
MOCTST = backtick("which moc 2>/dev/null")
end
@ -303,7 +303,7 @@ function qtdebuggerbuild()
print("Qt's Meta Object Compiler (moc) wasn't found!")
os.exit(1)
end
MOC = MOCTST
MOC = MOCTST .. " -qt5"
end
end
@ -324,17 +324,17 @@ function qtdebuggerbuild()
if _OPTIONS["targetos"]=="windows" then
configuration { "mingw*" }
buildoptions {
"-I$(shell qmake -query QT_INSTALL_HEADERS)",
"-I$(shell qmake -qt5 -query QT_INSTALL_HEADERS)",
}
configuration { }
elseif _OPTIONS["targetos"]=="macosx" then
buildoptions {
"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
"-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"),
}
else
if _OPTIONS["QT_HOME"]~=nil then
buildoptions {
"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
"-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_HEADERS"),
}
else
buildoptions {
@ -386,7 +386,7 @@ function osdmodulestargetconf()
if _OPTIONS["USE_QTDEBUG"]=="1" then
if _OPTIONS["targetos"]=="windows" then
linkoptions {
"-L$(shell qmake -query QT_INSTALL_LIBS)",
"-L$(shell qmake -qt5 -query QT_INSTALL_LIBS)",
}
links {
"qtmain",
@ -396,7 +396,7 @@ function osdmodulestargetconf()
}
elseif _OPTIONS["targetos"]=="macosx" then
linkoptions {
"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
"-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"),
}
links {
"Qt5Core.framework",
@ -406,7 +406,7 @@ function osdmodulestargetconf()
else
if _OPTIONS["QT_HOME"]~=nil then
linkoptions {
"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_LIBS"),
}
links {
"Qt5Core",