diff options
| author | 2026-04-04 07:00:33 +1100 | |
|---|---|---|
| committer | 2026-04-04 07:00:33 +1100 | |
| commit | 21defbea953c36bba6eeec5ea6f7cf6d3cd310d8 (patch) | |
| tree | 985b9d68054a7cbd32ce30b2c76931119a857bb9 /scripts/src | |
| parent | c48a110ac09bd62637d98d5906b74ea00ceb58ab (diff) | |
Fix up more stuff for upgraded tools, etc.
docs: It's no longer possible to get a working Qt 5 setup with MSYS2,
and there's no 32-bit Qt 6 package. Updated docs to reflect this.
Use Qt 6 on Windows, use qmake to find moc.
Fixed linking on Windows with static SDL3.
input/input_dinput.cpp: Support SDL3.
Diffstat (limited to 'scripts/src')
| -rw-r--r-- | scripts/src/osd/modules.lua | 20 | ||||
| -rw-r--r-- | scripts/src/osd/sdl3.lua | 6 | ||||
| -rw-r--r-- | scripts/src/tools.lua | 7 |
3 files changed, 29 insertions, 4 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 04892b50959..9e656b95206 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -401,7 +401,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("qmake -query QT_HOST_LIBEXECS") + end + 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") @@ -515,9 +527,9 @@ function osdmodulestargetconf() "-L$(shell qmake -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")) diff --git a/scripts/src/osd/sdl3.lua b/scripts/src/osd/sdl3.lua index b68ee0c2771..7446f6e475e 100644 --- a/scripts/src/osd/sdl3.lua +++ b/scripts/src/osd/sdl3.lua @@ -83,7 +83,13 @@ function maintargetosdoptions(_target,_subtarget) links { "dinput8", + "gdi32", + "imm32", + "ole32", "psapi", + "setupapi", + "uuid", + "version", } elseif _OPTIONS["targetos"]=="haiku" then links { diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index d4d31e3cb94..1c79e7da848 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -816,6 +816,13 @@ if (_OPTIONS["osd"] == "sdl") or (_OPTIONS["osd"] == "sdl3") then end links { libsdl, + "gdi32", + "imm32", + "ole32", + "oleaut32", + "setupapi", + "uuid", + "version", } configuration { "vs*" } links { |
