all repos — mgba @ 57ad73528089e71f17f48965891b2825226b1c2c

mGBA Game Boy Advance Emulator

Qt: Fix static compilation in MinGW (fixes #1769)
Vicki Pfau vi@endrift.com
Mon, 01 Jun 2020 20:07:28 -0700
commit

57ad73528089e71f17f48965891b2825226b1c2c

parent

5e5627db5474f67fcfca31b9d582747112762e2c

2 files changed, 5 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -39,6 +39,7 @@ - GBA: Reject incorrectly sized BIOSes

- Debugger: Don't skip undefined instructions when debugger attached - Qt: Force OpenGL paint engine creation thread (fixes mgba.io/i/1642) - Qt: Fix OpenGL 2.1 support (fixes mgba.io/i/1678) + - Qt: Fix static compilation in MinGW (fixes mgba.io/i/1769) Misc: - 3DS: Clean up legacy initialization (fixes mgba.io/i/1768) - Debugger: Keep track of global cycle count
M src/platform/qt/CMakeLists.txtsrc/platform/qt/CMakeLists.txt

@@ -289,7 +289,10 @@ endif()

if(QT_STATIC) find_library(QTPCRE NAMES qtpcre2 qtpcre) if(WIN32) - list(APPEND QT_LIBRARIES qwindows dwmapi imm32 uxtheme Qt5EventDispatcherSupport Qt5FontDatabaseSupport Qt5ThemeSupport Qt5WindowsUIAutomationSupport) + if(CMAKE_CROSSCOMPILING) + set(QWINDOWS_DEPS Qt5EventDispatcherSupport Qt5FontDatabaseSupport Qt5ThemeSupport Qt5WindowsUIAutomationSupport) + endif() + list(APPEND QT_LIBRARIES Qt5::QWindowsIntegrationPlugin ${QWINDOWS_DEPS} dwmapi uxtheme imm32 -static-libgcc -static-libstdc++) set_target_properties(Qt5::Core PROPERTIES INTERFACE_LINK_LIBRARIES "${QTPCRE};version;winmm;ssl;crypto;ws2_32;iphlpapi;crypt32;userenv;netapi32;wtsapi32") set_target_properties(Qt5::Gui PROPERTIES INTERFACE_LINK_LIBRARIES ${OPENGL_LIBRARY} ${OPENGLES2_LIBRARY}) elseif(APPLE)