Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Pass explicit -qt5 to all moc and qmake calls.

Browse Source 
Some systems like Debian, Ubuntu and other derivatives, expect qtchooser
will be used to select the appropriate Qt version, as Qt5 and Qt4 can
co-exist.

As MAME's build system does calls to moc and qmake directly, and Qt5 is
now the required version for the debugger, pass -qt5 to all moc and qmake
calls to avoid the build fail.
This commit is contained in:
Sune Vuorela 2016-04-15 11:43:52 +02:00 committed by Jordi Mallach
parent 685824106c
commit 3176347abc
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

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