From eafd265ab6b0b025279dea5d6a485ecaa6b724a9 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Mon, 29 Jan 2018 17:29:19 +0000 Subject: [PATCH 01/10] SDL: Fix changing screen size when using OpenGL ES 2 --- src/platform/sdl/gl-common.c | 7 +++++++ src/platform/sdl/gl-common.h | 1 + src/platform/sdl/gl-sdl.c | 11 ++--------- src/platform/sdl/gles2-sdl.c | 10 ++++++++++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/platform/sdl/gl-common.c b/src/platform/sdl/gl-common.c index 13c20811b..0b73cc519 100644 --- a/src/platform/sdl/gl-common.c +++ b/src/platform/sdl/gl-common.c @@ -7,6 +7,13 @@ #include +void mSDLGLDoViewport(int w, int h, struct VideoBackend* v) { + v->resized(v, w, h); + v->clear(v); + v->swap(v); + v->clear(v); +} + void mSDLGLCommonSwap(struct VideoBackend* context) { struct mSDLRenderer* renderer = (struct mSDLRenderer*) context->user; #if SDL_VERSION_ATLEAST(2, 0, 0) diff --git a/src/platform/sdl/gl-common.h b/src/platform/sdl/gl-common.h index b517dd436..307da756f 100644 --- a/src/platform/sdl/gl-common.h +++ b/src/platform/sdl/gl-common.h @@ -12,6 +12,7 @@ CXX_GUARD_START #include "main.h" +void mSDLGLDoViewport(int w, int h, struct VideoBackend* v); void mSDLGLCommonSwap(struct VideoBackend* context); void mSDLGLCommonInit(struct mSDLRenderer* renderer); diff --git a/src/platform/sdl/gl-sdl.c b/src/platform/sdl/gl-sdl.c index 5ee7beccb..bc4531a68 100644 --- a/src/platform/sdl/gl-sdl.c +++ b/src/platform/sdl/gl-sdl.c @@ -13,13 +13,6 @@ #include "platform/opengl/gl.h" -static void _doViewport(int w, int h, struct VideoBackend* v) { - v->resized(v, w, h); - v->clear(v); - v->swap(v); - v->clear(v); -} - static bool mSDLGLInit(struct mSDLRenderer* renderer); static void mSDLGLRunloop(struct mSDLRenderer* renderer, void* user); static void mSDLGLDeinit(struct mSDLRenderer* renderer); @@ -47,7 +40,7 @@ bool mSDLGLInit(struct mSDLRenderer* renderer) { renderer->gl.d.init(&renderer->gl.d, 0); renderer->gl.d.setDimensions(&renderer->gl.d, renderer->width, renderer->height); - _doViewport(renderer->viewportWidth, renderer->viewportHeight, &renderer->gl.d); + mSDLGLDoViewport(renderer->viewportWidth, renderer->viewportHeight, &renderer->gl.d); return true; } @@ -63,7 +56,7 @@ void mSDLGLRunloop(struct mSDLRenderer* renderer, void* user) { // Event handling can change the size of the screen if (renderer->player.windowUpdated) { SDL_GetWindowSize(renderer->window, &renderer->viewportWidth, &renderer->viewportHeight); - _doViewport(renderer->viewportWidth, renderer->viewportHeight, v); + mSDLGLDoViewport(renderer->viewportWidth, renderer->viewportHeight, v); renderer->player.windowUpdated = 0; } #endif diff --git a/src/platform/sdl/gles2-sdl.c b/src/platform/sdl/gles2-sdl.c index c03486fb1..409e94183 100644 --- a/src/platform/sdl/gles2-sdl.c +++ b/src/platform/sdl/gles2-sdl.c @@ -115,6 +115,8 @@ bool mSDLGLES2Init(struct mSDLRenderer* renderer) { renderer->gl2.d.swap = mSDLGLCommonSwap; renderer->gl2.d.init(&renderer->gl2.d, 0); renderer->gl2.d.setDimensions(&renderer->gl2.d, renderer->width, renderer->height); + + mSDLGLDoViewport(renderer->viewportWidth, renderer->viewportHeight, &renderer->gl2.d); return true; } @@ -126,6 +128,14 @@ void mSDLGLES2Runloop(struct mSDLRenderer* renderer, void* user) { while (mCoreThreadIsActive(context)) { while (SDL_PollEvent(&event)) { mSDLHandleEvent(context, &renderer->player, &event); +#if SDL_VERSION_ATLEAST(2, 0, 0) + // Event handling can change the size of the screen + if (renderer->player.windowUpdated) { + SDL_GetWindowSize(renderer->window, &renderer->viewportWidth, &renderer->viewportHeight); + mSDLGLDoViewport(renderer->viewportWidth, renderer->viewportHeight, v); + renderer->player.windowUpdated = 0; + } +#endif } if (mCoreSyncWaitFrameStart(&context->impl->sync)) { From c8dacbb6456682351c90b8424966ab466a4fb6e9 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Wed, 7 Feb 2018 23:37:50 +0000 Subject: [PATCH 02/10] VFS: Fix crash when built with minizip --- src/util/vfs/vfs-zip.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/vfs/vfs-zip.c b/src/util/vfs/vfs-zip.c index 13220a303..c3849d8e7 100644 --- a/src/util/vfs/vfs-zip.c +++ b/src/util/vfs/vfs-zip.c @@ -61,6 +61,7 @@ struct VFileZip { struct VFile d; unzFile z; void* buffer; + size_t bufferSize; size_t fileSize; }; #endif @@ -451,7 +452,9 @@ static enum VFSType _vdezType(struct VDirEntry* vde) { bool _vfzClose(struct VFile* vf) { struct VFileZip* vfz = (struct VFileZip*) vf; unzCloseCurrentFile(vfz->z); - free(vfz->buffer); + if (vfz->buffer) { + mappedMemoryFree(vfz->buffer, vfz->bufferSize); + } free(vfz); return true; } @@ -536,6 +539,8 @@ void* _vfzMap(struct VFile* vf, size_t size, int flags) { unzOpenCurrentFile(vfz->z); vf->seek(vf, pos, SEEK_SET); + vfz->bufferSize = size; + return vfz->buffer; } @@ -619,6 +624,7 @@ struct VFile* _vdzOpenFile(struct VDir* vd, const char* path, int mode) { struct VFileZip* vfz = malloc(sizeof(struct VFileZip)); vfz->z = vdz->z; vfz->buffer = 0; + vfz->bufferSize = 0; vfz->fileSize = info.uncompressed_size; vfz->d.close = _vfzClose; From 0e738e8cc53ccc11e5392154db8fbdb2d5beaf4b Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 10 Feb 2018 23:12:00 -0800 Subject: [PATCH 03/10] Wii: Fix build on modern dkPPC --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57dee4b56..e17dbf0a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,7 +317,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Generic") check_function_exists(uselocale HAVE_USELOCALE) check_function_exists(setlocale HAVE_SETLOCALE) else() - if(DEFINED 3DS) + if(DEFINED 3DS OR DEFINED WII) check_function_exists(snprintf_l HAVE_SNPRINTF_L) check_function_exists(strtof_l HAVE_STRTOF_L) check_function_exists(newlocale HAVE_NEWLOCALE) From 1b601d005e3e1b5454f33c3022c76d055d188828 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sun, 11 Feb 2018 23:46:24 -0800 Subject: [PATCH 04/10] GBA Cheats: Totally ignore ROM patch limits for GameShark too (closes #990) --- src/gba/cheats/gameshark.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gba/cheats/gameshark.c b/src/gba/cheats/gameshark.c index d61ffbe6a..b7981699e 100644 --- a/src/gba/cheats/gameshark.c +++ b/src/gba/cheats/gameshark.c @@ -93,6 +93,7 @@ void GBACheatSetGameSharkVersion(struct GBACheatSet* cheats, enum GBACheatGameSh bool GBACheatAddGameSharkRaw(struct GBACheatSet* cheats, uint32_t op1, uint32_t op2) { enum GBAGameSharkType type = op1 >> 28; struct mCheat* cheat = 0; + int romPatch = 0; if (cheats->incompleteCheat != COMPLETE) { struct mCheat* incompleteCheat = mCheatListGetPointer(&cheats->d.list, cheats->incompleteCheat); @@ -148,10 +149,16 @@ bool GBACheatAddGameSharkRaw(struct GBACheatSet* cheats, uint32_t op1, uint32_t cheats->incompleteCheat = mCheatListIndex(&cheats->d.list, cheat); break; case GSA_PATCH: - cheats->romPatches[0].address = BASE_CART0 | ((op1 & 0xFFFFFF) << 1); - cheats->romPatches[0].newValue = op2; - cheats->romPatches[0].applied = false; - cheats->romPatches[0].exists = true; + while (cheats->romPatches[romPatch].exists) { + ++romPatch; + if (romPatch >= MAX_ROM_PATCHES) { + break; + } + } + cheats->romPatches[romPatch].address = BASE_CART0 | ((op1 & 0xFFFFFF) << 1); + cheats->romPatches[romPatch].newValue = op2; + cheats->romPatches[romPatch].applied = false; + cheats->romPatches[romPatch].exists = true; return true; case GSA_BUTTON: switch (op1 & 0x00F00000) { From 22c53ee40ed9cb55178fa6b7ce9c4ef0548d63cd Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Mon, 12 Feb 2018 07:03:21 -0800 Subject: [PATCH 05/10] Wii: Work around linker issues with CheckFunctionExists --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e17dbf0a0..e9f2291e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -318,12 +318,19 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Generic") check_function_exists(setlocale HAVE_SETLOCALE) else() if(DEFINED 3DS OR DEFINED WII) + set(CMAKE_REQUIRED_FLAGS -Wl,--require-defined,snprintf_l) check_function_exists(snprintf_l HAVE_SNPRINTF_L) + set(CMAKE_REQUIRED_FLAGS -Wl,--require-defined,strtof_l) check_function_exists(strtof_l HAVE_STRTOF_L) + set(CMAKE_REQUIRED_FLAGS -Wl,--require-defined,newlocale) check_function_exists(newlocale HAVE_NEWLOCALE) + set(CMAKE_REQUIRED_FLAGS -Wl,--require-defined,freelocale) check_function_exists(freelocale HAVE_FREELOCALE) + set(CMAKE_REQUIRED_FLAGS -Wl,--require-defined,uselocale) check_function_exists(uselocale HAVE_USELOCALE) + set(CMAKE_REQUIRED_FLAGS -Wl,--require-defined,setlocale) check_function_exists(setlocale HAVE_SETLOCALE) + unset(CMAKE_REQUIRED_FLAGS) endif() if(NOT DEFINED 3DS AND NOT DEFINED PSP2 AND NOT DEFINED WII) set(DISABLE_DEPS ON CACHE BOOL "This platform cannot build with dependencies" FORCE) @@ -350,7 +357,7 @@ if(HAVE_LOCALTIME_R) list(APPEND FUNCTION_DEFINES HAVE_LOCALTIME_R) endif() -if(HAVE_NEWLOCALE AND HAVE_FREELOCALE AND HAVE_USELOCALE OR APPLE OR DEFINED 3DS) +if(HAVE_NEWLOCALE AND HAVE_FREELOCALE AND HAVE_USELOCALE OR APPLE) list(APPEND FUNCTION_DEFINES HAVE_LOCALE) if (HAVE_STRTOF_L) list(APPEND FUNCTION_DEFINES HAVE_STRTOF_L) From dc753d8117161f819f392ad6a667e8800a1e9003 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Mon, 12 Feb 2018 22:31:48 -0800 Subject: [PATCH 06/10] Windows: Buildfixes --- CMakeLists.txt | 6 ++++-- src/platform/qt/CMakeLists.txt | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9f2291e4..62ea0e10f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -381,6 +381,7 @@ endif() # Feature dependencies set(FEATURE_DEFINES) +set(FEATURE_FLAGS) set(FEATURES) set(ENABLES) if(CMAKE_SYSTEM_NAME MATCHES .*BSD) @@ -506,6 +507,7 @@ if(USE_MAGICK) set(MAGICKWAND_DEB_VERSION "-6.q16-2") endif() list(APPEND FEATURE_DEFINES MAGICKWAND_VERSION_MAJOR=${MAGICKWAND_VERSION_MAJOR}) + list(APPEND FEATURE_FLAGS ${MAGICKWAND_CFLAGS_OTHER}) set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libmagickwand${MAGICKWAND_DEB_VERSION}") endif() @@ -783,7 +785,7 @@ if(NOT SKIP_LIBRARY) add_library(${BINARY_NAME} SHARED ${SRC} ${VFS_SRC}) if(BUILD_STATIC) add_library(${BINARY_NAME}-static STATIC ${SRC}) - set_target_properties(${BINARY_NAME}-static PROPERTIES COMPILE_DEFINITIONS "${OS_DEFINES};${FEATURE_DEFINES};${FUNCTION_DEFINES}") + set_target_properties(${BINARY_NAME}-static PROPERTIES COMPILE_DEFINITIONS "${OS_DEFINES};${FEATURE_DEFINES};${FUNCTION_DEFINES}" COMPILE_OPTIONS "${FEATURE_FLAGS}") install(TARGETS ${BINARY_NAME}-static DESTINATION ${LIBDIR} COMPONENT lib${BINARY_NAME}) add_dependencies(${BINARY_NAME}-static version-info) endif() @@ -792,7 +794,7 @@ if(NOT SKIP_LIBRARY) endif() add_dependencies(${BINARY_NAME} version-info) - set_target_properties(${BINARY_NAME} PROPERTIES VERSION ${LIB_VERSION_STRING} SOVERSION ${LIB_VERSION_ABI} COMPILE_DEFINITIONS "${OS_DEFINES};${FEATURE_DEFINES};${FUNCTION_DEFINES}") + set_target_properties(${BINARY_NAME} PROPERTIES VERSION ${LIB_VERSION_STRING} SOVERSION ${LIB_VERSION_ABI} COMPILE_DEFINITIONS "${OS_DEFINES};${FEATURE_DEFINES};${FUNCTION_DEFINES}" COMPILE_OPTIONS "${FEATURE_FLAGS}") target_link_libraries(${BINARY_NAME} ${DEBUGGER_LIB} ${DEPENDENCY_LIB} ${OS_LIB}) install(TARGETS ${BINARY_NAME} LIBRARY DESTINATION ${LIBDIR} COMPONENT lib${BINARY_NAME} NAMELINK_SKIP ARCHIVE DESTINATION ${LIBDIR} RUNTIME DESTINATION ${LIBDIR} COMPONENT lib${BINARY_NAME}) diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 8ddf92ab1..9f5c78ca4 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -215,9 +215,6 @@ if(WIN32) configure_file(${CMAKE_SOURCE_DIR}/res/mgba.rc.in ${CMAKE_BINARY_DIR}/res/mgba.rc) list(APPEND RESOURCES ${CMAKE_BINARY_DIR}/res/mgba.rc) set_source_files_properties(${CMAKE_BINARY_DIR}/res/mgba.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/res/mgba.ico) - if(QT_STATIC) - list(APPEND QT_LIBRARIES qwindows Qt5PlatformSupport imm32) - endif() endif() if(NOT DEFINED DATADIR) if(APPLE) @@ -274,6 +271,10 @@ list(APPEND QT_LIBRARIES Qt5::Widgets) if(BUILD_GL OR BUILD_GLES2) list(APPEND QT_LIBRARIES Qt5::OpenGL ${OPENGL_LIBRARY} ${OPENGLES2_LIBRARY}) endif() +if(WIN32 AND QT_STATIC) + list(APPEND QT_LIBRARIES qwindows dwmapi imm32 uxtheme Qt5EventDispatcherSupport Qt5FontDatabaseSupport Qt5ThemeSupport) + set_target_properties(Qt5::Core PROPERTIES INTERFACE_LINK_LIBRARIES "qtpcre2;version;ws2_32") +endif() target_link_libraries(${BINARY_NAME}-qt ${PLATFORM_LIBRARY} ${BINARY_NAME} ${QT_LIBRARIES}) set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}" PARENT_SCOPE) From 45b8832275cf29ccb92e07e7bfac77e9fbe40739 Mon Sep 17 00:00:00 2001 From: Lothar Serra Mari Date: Sat, 17 Feb 2018 11:39:04 +0100 Subject: [PATCH 07/10] Doc: Fix the total download size of the msys toolchain Since the README file was initially written, the total download size for the msys toolchain including all libraries increased from 500MiB to a whopping 1100MiB, resulting in an install size of over 6000MiB for each architecture. --- README.md | 2 +- README_DE.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 81fb5d93a..e9b92c0c7 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ Note that you should not do a `make install` on macOS, as it will not work prope #### Windows developer building -To build on Windows for development, using MSYS2 is recommended. Follow the installation steps found on their [website](https://msys2.github.io). Make sure you're running the 32-bit version ("MSYS2 MinGW 32-bit") (or the 64-bit version "MSYS2 MinGW 64-bit" if you want to build for x86_64) and run this additional command (including the braces) to install the needed dependencies (please note that this involves downloading over 500MiB of packages, so it will take a long time): +To build on Windows for development, using MSYS2 is recommended. Follow the installation steps found on their [website](https://msys2.github.io). Make sure you're running the 32-bit version ("MSYS2 MinGW 32-bit") (or the 64-bit version "MSYS2 MinGW 64-bit" if you want to build for x86_64) and run this additional command (including the braces) to install the needed dependencies (please note that this involves downloading over 1100MiB of packages, so it will take a long time): For x86 (32 bit) builds: diff --git a/README_DE.md b/README_DE.md index dd02c90a3..3db749421 100644 --- a/README_DE.md +++ b/README_DE.md @@ -106,7 +106,7 @@ Bitte beachte, dass Du unter macOS nicht 'make install' verwenden solltest, da d ### Für Entwickler: Kompilieren unter Windows -Um mGBA auf Windows zu kompilieren, wird MSYS2 empfohlen. Befolge die Installationsschritte auf der [MSYS2-Website](https://msys2.github.io). Stelle sicher, dass Du die 32-Bit-Version ("MSYS2 MinGW 32-bit") (oder die 64-Bit-Version "MSYS2 MinGW 64-bit", wenn Du mGBA für x86_64 kompilieren willst) verwendest und führe folgendes Kommando (einschließlich der Klammern) aus, um alle benötigten Abhängigkeiten zu installieren. Bitte beachte, dass dafür über 500MiB an Paketen heruntergeladen werden, was eine Weile dauern kann): +Um mGBA auf Windows zu kompilieren, wird MSYS2 empfohlen. Befolge die Installationsschritte auf der [MSYS2-Website](https://msys2.github.io). Stelle sicher, dass Du die 32-Bit-Version ("MSYS2 MinGW 32-bit") (oder die 64-Bit-Version "MSYS2 MinGW 64-bit", wenn Du mGBA für x86_64 kompilieren willst) verwendest und führe folgendes Kommando (einschließlich der Klammern) aus, um alle benötigten Abhängigkeiten zu installieren. Bitte beachte, dass dafür über 1100MiB an Paketen heruntergeladen werden, was eine Weile dauern kann: Für x86 (32 Bit): From 523fb63c309950dd85bf79d914dc96f12eccfab3 Mon Sep 17 00:00:00 2001 From: Lothar Serra Mari Date: Sat, 17 Feb 2018 11:46:53 +0100 Subject: [PATCH 08/10] All: Update copyright year to 2018 --- README.md | 2 +- README_DE.md | 2 +- src/platform/qt/AboutScreen.ui | 2 +- src/platform/qt/ts/mgba-de.ts | 4 ++-- src/platform/qt/ts/mgba-es.ts | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e9b92c0c7..4355e5207 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ Footnotes Copyright --------- -mGBA is Copyright © 2013 – 2017 Jeffrey Pfau. It is distributed under the [Mozilla Public License version 2.0](https://www.mozilla.org/MPL/2.0/). A copy of the license is available in the distributed LICENSE file. +mGBA is Copyright © 2013 – 2018 Jeffrey Pfau. It is distributed under the [Mozilla Public License version 2.0](https://www.mozilla.org/MPL/2.0/). A copy of the license is available in the distributed LICENSE file. mGBA contains the following third-party libraries: diff --git a/README_DE.md b/README_DE.md index 3db749421..ddf87480f 100644 --- a/README_DE.md +++ b/README_DE.md @@ -164,7 +164,7 @@ Fußnoten Copyright --------- -Copyright für mGBA © 2013 – 2017 Jeffrey Pfau. mGBA wird unter der [Mozilla Public License version 2.0](https://www.mozilla.org/MPL/2.0/) veröffentlicht. Eine Kopie der Lizenz ist in der mitgelieferten Datei LICENSE verfügbar. +Copyright für mGBA © 2013 – 2018 Jeffrey Pfau. mGBA wird unter der [Mozilla Public License version 2.0](https://www.mozilla.org/MPL/2.0/) veröffentlicht. Eine Kopie der Lizenz ist in der mitgelieferten Datei LICENSE verfügbar. mGBA beinhaltet die folgenden Bibliotheken von Drittanbietern: diff --git a/src/platform/qt/AboutScreen.ui b/src/platform/qt/AboutScreen.ui index 357760470..d01aacdbb 100644 --- a/src/platform/qt/AboutScreen.ui +++ b/src/platform/qt/AboutScreen.ui @@ -83,7 +83,7 @@ - © 2013 – 2017 Jeffrey Pfau, licensed under the Mozilla Public License, version 2.0 + © 2013 – 2018 Jeffrey Pfau, licensed under the Mozilla Public License, version 2.0 Game Boy Advance is a registered trademark of Nintendo Co., Ltd. diff --git a/src/platform/qt/ts/mgba-de.ts b/src/platform/qt/ts/mgba-de.ts index e8a8cdf3c..347ee120c 100644 --- a/src/platform/qt/ts/mgba-de.ts +++ b/src/platform/qt/ts/mgba-de.ts @@ -35,9 +35,9 @@ - © 2013 – 2017 Jeffrey Pfau, licensed under the Mozilla Public License, version 2.0 + © 2013 – 2018 Jeffrey Pfau, licensed under the Mozilla Public License, version 2.0 Game Boy Advance is a registered trademark of Nintendo Co., Ltd. - © 2013 – 2017 Jeffrey Pfau, lizenziert unter der Mozilla Public License, Version 2.0 + © 2013 – 2018 Jeffrey Pfau, lizenziert unter der Mozilla Public License, Version 2.0 Game Boy Advance ist ein eingetragenes Warenzeichen von Nintendo Co., Ltd. diff --git a/src/platform/qt/ts/mgba-es.ts b/src/platform/qt/ts/mgba-es.ts index 6628e18a0..177bb3d1f 100644 --- a/src/platform/qt/ts/mgba-es.ts +++ b/src/platform/qt/ts/mgba-es.ts @@ -30,9 +30,9 @@ - © 2013 – 2017 Jeffrey Pfau, licensed under the Mozilla Public License, version 2.0 + © 2013 – 2018 Jeffrey Pfau, licensed under the Mozilla Public License, version 2.0 Game Boy Advance is a registered trademark of Nintendo Co., Ltd. - © 2013 – 2017 Jeffrey Pfau, licenciado bajo la Mozilla Public License, versión 2.0 + © 2013 – 2018 Jeffrey Pfau, licenciado bajo la Mozilla Public License, versión 2.0 Game Boy Advance es una marca registrada de Nintendo Co., Ltd. From 0a8986dcb2082ae42811ffd32bb56a568ab94a52 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 24 Feb 2018 15:01:28 -0500 Subject: [PATCH 09/10] Qt: Fix opening in fullscreen (fixes #993) --- CHANGES | 1 + src/platform/qt/Window.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 1df07b350..23e1101e5 100644 --- a/CHANGES +++ b/CHANGES @@ -51,6 +51,7 @@ Bugfixes: - GB Timer: Minor accuracy improvements - GB Audio: Clock frame events on DIV - GBA: Fix SharkPort saves for EEPROM games + - Qt: Fix opening in fullscreen (fixes mgba.io/i/993) Misc: - GBA Timer: Use global cycles for timers - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index ba363a73c..094140f43 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -186,7 +186,9 @@ void Window::resizeFrame(const QSize& size) { m_screenWidget->setSizeHint(newSize); newSize -= m_screenWidget->size(); newSize += this->size(); - resize(newSize); + if (!isFullScreen()) { + resize(newSize); + } } void Window::setConfig(ConfigController* config) { From 5df0edb2e1bfc14ef3f7fb8e059292b0658c0a5f Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 24 Feb 2018 15:05:43 -0500 Subject: [PATCH 10/10] Python: Fix package directory --- CHANGES | 1 + src/platform/python/setup.py.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 23e1101e5..6313f9097 100644 --- a/CHANGES +++ b/CHANGES @@ -52,6 +52,7 @@ Bugfixes: - GB Audio: Clock frame events on DIV - GBA: Fix SharkPort saves for EEPROM games - Qt: Fix opening in fullscreen (fixes mgba.io/i/993) + - Python: Fix package directory Misc: - GBA Timer: Use global cycles for timers - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722) diff --git a/src/platform/python/setup.py.in b/src/platform/python/setup.py.in index 0a6fa8b52..a66e70e3c 100644 --- a/src/platform/python/setup.py.in +++ b/src/platform/python/setup.py.in @@ -22,7 +22,7 @@ setup(name="${BINARY_NAME}", url="http://github.com/mgba-emu/mgba/", packages=["mgba"], package_dir={ - "mgba": "${CMAKE_CURRENT_SOURCE_DIR}" + "mgba": "${CMAKE_CURRENT_SOURCE_DIR}/mgba" }, setup_requires=['cffi>=1.6', 'pytest-runner'], install_requires=['cffi>=1.6', 'cached-property'],