diff options
| author | 2026-04-17 15:21:32 +0200 | |
|---|---|---|
| committer | 2026-04-17 15:21:32 +0200 | |
| commit | d3d82c776740320dc29eca249f8cd5b1ae4d1b40 (patch) | |
| tree | 96d2ab1e717f8fa20f73713a95c3f4ce3fecb4e8 /scripts/src/osd/modules.lua | |
| parent | 0b24b4c2f6052cea7d612408f4baa58ed63ee290 (diff) | |
| parent | 0034dde186fa6f594125ac3dc2b5977f18e7a062 (diff) | |
Merge branch 'master' into floppysound
Diffstat (limited to 'scripts/src/osd/modules.lua')
| -rw-r--r-- | scripts/src/osd/modules.lua | 99 |
1 files changed, 41 insertions, 58 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index fddf73b4046..b7fe831439b 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -154,12 +154,6 @@ function osdmodulesbuild() ext_includedir("asio"), } - if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then - buildoptions { - "-Wno-unused-private-field", - } - end - if _OPTIONS["targetos"]=="windows" then includedirs { MAME_DIR .. "3rdparty/winpcap/Include", @@ -364,6 +358,11 @@ function qtdebuggerbuild() buildoptions { "-Wno-error=inconsistent-missing-override", } + if _OPTIONS["targetos"]=="windows" then + buildoptions { + "-Wno-ignored-attributes", + } + end configuration { } end @@ -407,7 +406,19 @@ function qtdebuggerbuild() local MOC = "" if (os.is("windows")) then - MOC = "moc" + local qt_host_libexecs + if _OPTIONS["QT_HOME"]~=nil then + qt_host_libexecs = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_HOST_LIBEXECS") + else + qt_host_libexecs = backtick("qmake6 -query QT_HOST_LIBEXECS") + end + local MOCTST = backtick(qt_host_libexecs .. "/moc --version") + if MOCTST=='' then + print("Qt's Meta Object Compiler (moc) wasn't found!") + os.exit(1) + else + MOC = qt_host_libexecs .. "/moc" + end else if _OPTIONS["QT_HOME"]~=nil then local MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null") @@ -427,15 +438,14 @@ function qtdebuggerbuild() MOC = _OPTIONS["QT_HOME"] .. "/bin/moc" end else - local MOCTST = backtick("which moc-qt5 2>/dev/null") - if MOCTST=='' then - MOCTST = backtick("which moc 2>/dev/null") - end + local qt_host_libexecs = backtick("qmake6 -query QT_HOST_LIBEXECS") + MOCTST = backtick(qt_host_libexecs .. "/moc --version 2>/dev/null") if MOCTST=='' then print("Qt's Meta Object Compiler (moc) wasn't found!") os.exit(1) + else + MOC = qt_host_libexecs .. "/moc" end - MOC = MOCTST end end @@ -456,7 +466,7 @@ function qtdebuggerbuild() if _OPTIONS["targetos"]=="windows" then configuration { "mingw*" } buildoptions { - "-I$(shell qmake -query QT_INSTALL_HEADERS)", + "-I$(shell qmake6 -query QT_INSTALL_HEADERS)", } configuration { } elseif _OPTIONS["targetos"]=="macosx" then @@ -470,7 +480,7 @@ function qtdebuggerbuild() } else buildoptions { - backtick(pkgconfigcmd() .. " --cflags Qt5Widgets"), + "-I$(shell qmake6 -query QT_INSTALL_HEADERS)", } end end @@ -518,55 +528,37 @@ function osdmodulestargetconf() if _OPTIONS["USE_QTDEBUG"]=="1" then if _OPTIONS["targetos"]=="windows" then linkoptions { - "-L$(shell qmake -query QT_INSTALL_LIBS)", + "-L$(shell qmake6 -query QT_INSTALL_LIBS)", } links { - "Qt5Core.dll", - "Qt5Gui.dll", - "Qt5Widgets.dll", + "Qt6Core.dll", + "Qt6Gui.dll", + "Qt6Widgets.dll", } elseif _OPTIONS["targetos"]=="macosx" then - local qt_version = str_to_version(backtick("qmake -query QT_VERSION")) linkoptions { "-F" .. backtick("qmake -query QT_INSTALL_LIBS"), } - if qt_version < 60000 then - links { - "Qt5Core.framework", - "Qt5Gui.framework", - "Qt5Widgets.framework", - } - else - links { - "QtCore.framework", - "QtGui.framework", - "QtWidgets.framework", - } - end + links { + "QtCore.framework", + "QtGui.framework", + "QtWidgets.framework", + } else if _OPTIONS["QT_HOME"]~=nil then - local qt_version = str_to_version(backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_VERSION")) linkoptions { "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"), } - if qt_version < 60000 then - links { - "Qt5Core", - "Qt5Gui", - "Qt5Widgets", - } - else - links { - "Qt6Core", - "Qt6Gui", - "Qt6Widgets", - } - end else - local str = backtick(pkgconfigcmd() .. " --libs Qt5Widgets") - addlibfromstring(str) - addoptionsfromstring(str) + linkoptions { + "-L$(shell qmake6 -query QT_INSTALL_LIBS)", + } end + links { + "Qt6Core", + "Qt6Gui", + "Qt6Widgets", + } end end @@ -718,15 +710,6 @@ if not _OPTIONS["NO_USE_PIPEWIRE"] then end newoption { - trigger = "MODERN_WIN_API", - description = "Use Modern Windows APIs", - allowed = { - { "0", "Use classic Windows APIs - allows support for XP and later" }, - { "1", "Use Modern Windows APIs - support for Windows 8.1 and later" }, - }, -} - -newoption { trigger = "USE_QTDEBUG", description = "Use QT debugger", allowed = { |
