mirror of https://github.com/mgba-emu/mgba.git
Compare commits
3 Commits
11787df6cd
...
49fa1a30c5
Author | SHA1 | Date |
---|---|---|
Vicki Pfau | 49fa1a30c5 | |
Vicki Pfau | f75f9fd5fd | |
Vicki Pfau | c64dbd6631 |
|
@ -12,7 +12,11 @@ install:
|
||||||
- vcpkg --no-dry-run upgrade
|
- vcpkg --no-dry-run upgrade
|
||||||
- rd /Q /S C:\Tools\vcpkg\buildtrees
|
- rd /Q /S C:\Tools\vcpkg\buildtrees
|
||||||
before_build:
|
before_build:
|
||||||
- cmake . -DCMAKE_PREFIX_PATH=C:\Qt\5.15\msvc2019_64 -DCMAKE_TOOLCHAIN_FILE=C:\Tools\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-release -DCMAKE_CONFIGURATION_TYPES=Release
|
- cmake . -DCMAKE_PREFIX_PATH=C:\Qt\5.15\msvc2019_64 \
|
||||||
|
-DCMAKE_TOOLCHAIN_FILE=C:\Tools\vcpkg\scripts\buildsystems\vcpkg.cmake \
|
||||||
|
-DVCPKG_TARGET_TRIPLET=x64-windows-release \
|
||||||
|
-DCMAKE_CONFIGURATION_TYPES=Release \
|
||||||
|
-DCMAKE_SYSTEM_VERSION=10.0.22000.1
|
||||||
build:
|
build:
|
||||||
parallel: true
|
parallel: true
|
||||||
project: mGBA.sln
|
project: mGBA.sln
|
||||||
|
|
1
CHANGES
1
CHANGES
|
@ -52,6 +52,7 @@ Misc:
|
||||||
- Qt: Remove maligned double-click-to-fullscreen shortcut (closes mgba.io/i/2632)
|
- Qt: Remove maligned double-click-to-fullscreen shortcut (closes mgba.io/i/2632)
|
||||||
- Qt: Pass logging context through to video proxy thread (fixes mgba.io/i/3095)
|
- Qt: Pass logging context through to video proxy thread (fixes mgba.io/i/3095)
|
||||||
- Qt: Show maker code and game version in ROM info
|
- Qt: Show maker code and game version in ROM info
|
||||||
|
- Qt: Make window corners square on Windows 11 (fixes mgba.io/i/3285)
|
||||||
- Res: Port NSO-gba-colors shader (closes mgba.io/i/2834)
|
- Res: Port NSO-gba-colors shader (closes mgba.io/i/2834)
|
||||||
- Scripting: Add `callbacks:oneshot` for single-call callbacks
|
- Scripting: Add `callbacks:oneshot` for single-call callbacks
|
||||||
- Switch: Add bilinear filtering option (closes mgba.io/i/3111)
|
- Switch: Add bilinear filtering option (closes mgba.io/i/3111)
|
||||||
|
|
|
@ -427,6 +427,7 @@ set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PR
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set_target_properties(${BINARY_NAME}-qt PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
|
set_target_properties(${BINARY_NAME}-qt PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
|
||||||
|
target_link_libraries(${BINARY_NAME}-qt dwmapi)
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
target_link_libraries(${BINARY_NAME}-qt -municode)
|
target_link_libraries(${BINARY_NAME}-qt -municode)
|
||||||
endif()
|
endif()
|
||||||
|
@ -445,7 +446,7 @@ if(QT_STATIC)
|
||||||
if(CMAKE_CROSSCOMPILING)
|
if(CMAKE_CROSSCOMPILING)
|
||||||
set(QWINDOWS_DEPS ${QT}EventDispatcherSupport ${QT}FontDatabaseSupport ${QT}ThemeSupport ${QT}WindowsUIAutomationSupport)
|
set(QWINDOWS_DEPS ${QT}EventDispatcherSupport ${QT}FontDatabaseSupport ${QT}ThemeSupport ${QT}WindowsUIAutomationSupport)
|
||||||
endif()
|
endif()
|
||||||
list(APPEND QT_LIBRARIES ${QT}::QWindowsIntegrationPlugin ${QWINDOWS_DEPS} amstrmid dwmapi uxtheme imm32 -static-libgcc -static-libstdc++)
|
list(APPEND QT_LIBRARIES ${QT}::QWindowsIntegrationPlugin ${QWINDOWS_DEPS} amstrmid uxtheme imm32 -static-libgcc -static-libstdc++)
|
||||||
set_target_properties(${QT}::Core PROPERTIES INTERFACE_LINK_LIBRARIES "${QTPCRE};version;winmm;ssl;crypto;ws2_32;iphlpapi;crypt32;userenv;netapi32;wtsapi32")
|
set_target_properties(${QT}::Core PROPERTIES INTERFACE_LINK_LIBRARIES "${QTPCRE};version;winmm;ssl;crypto;ws2_32;iphlpapi;crypt32;userenv;netapi32;wtsapi32")
|
||||||
set_target_properties(${QT}::Gui PROPERTIES INTERFACE_LINK_LIBRARIES ${OPENGL_LIBRARY} ${OPENGLES2_LIBRARY})
|
set_target_properties(${QT}::Gui PROPERTIES INTERFACE_LINK_LIBRARIES ${OPENGL_LIBRARY} ${OPENGLES2_LIBRARY})
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
|
|
|
@ -14,6 +14,10 @@
|
||||||
#include <QScreen>
|
#include <QScreen>
|
||||||
#include <QWindow>
|
#include <QWindow>
|
||||||
|
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
#include <dwmapi.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef USE_SQLITE3
|
#ifdef USE_SQLITE3
|
||||||
#include "ArchiveInspector.h"
|
#include "ArchiveInspector.h"
|
||||||
#include "library/LibraryController.h"
|
#include "library/LibraryController.h"
|
||||||
|
@ -717,6 +721,11 @@ void Window::showEvent(QShowEvent* event) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
m_wasOpened = true;
|
m_wasOpened = true;
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
HWND hwnd = reinterpret_cast<HWND>(winId());
|
||||||
|
DWM_WINDOW_CORNER_PREFERENCE cornerPref = DWMWCP_DONOTROUND;
|
||||||
|
DwmSetWindowAttribute(hwnd, DWMWA_WINDOW_CORNER_PREFERENCE, &cornerPref, sizeof(cornerPref));
|
||||||
|
#endif
|
||||||
if (m_initialSize.isValid()) {
|
if (m_initialSize.isValid()) {
|
||||||
resizeFrame(m_initialSize);
|
resizeFrame(m_initialSize);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue