update for vendored 64-bit Qt on windows

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "external/qt"]
 	path = external/qt
-	url = https://github.com/CypherSignal/bsnes-plus-ext-qt.git
+	url = https://github.com/devinacker/bsnes-plus-ext-qt.git

README.md

@@ -5,7 +5,6 @@ introduce some new features and improvements, mostly aimed at debugging.
 
 ## What's new
 
-- "Step over" and "step out" buttons in debugger
 - Improved debugger UI with register editing
 - Redesigned memory editor and breakpoint editor
 - Improved handling of address mirroring for breakpoints (extends to the entire address space, not just RAM)
@@ -27,42 +26,21 @@ Non-debugging features:
 
 ## Building on Windows
 
-- Get mingw-w64 (http://mingw-w64.yaxm.org/doku.php/download)
+- [Get mingw-w64](http://mingw-w64.yaxm.org/doku.php/download) (make sure toolchain supports 64-bit builds)
 - Initialize the bsnes-plus-ext-qt submodule in git
 - Run `mingw32-make`
 
-Building with the original MinGW used to be the preferred way to do it, but made building "out of the box" annoying for various reasons (including requiring outdated DirectX headers/libs and problems with some native Windows code) and is no longer supported.
-
 ## Building on OS X
 
-- Install a C++ toolchain ([Xcode](https://developer.apple.com) is probably the easiest route)  
-- Install Qt 4.8 (get [Brew](http://brew.sh) and run `brew install qt`)  
-- Make sure the `qtpath` environment variable points to your Qt installation, ie. add `export qtpath=/usr/local/Cellar/qt/4.8.7_2` to .bash_profile.
-- Run `make`from the bsnes directory.
-
-If you're running macOS 10.12 Sierra you will (probably not) be able to install Qt4 using brew. If so, try installing this unofficial branch:
-
-```
-brew install cartr/qt4/qt
-brew linkapps qt
-```
+Currently, OS X is not officially 100% supported. See [this fork](https://github.com/Optiroc/bsnes-plus) for now.
 
 ## Building on Linux / other *nix
 
-As there is no ``configure`` step, make sure necessary Qt4/X11 packages are installed. On a Debian/Ubuntu system, it would require a command like:
-
-```
-apt-get install libqt4-dev libqt4-dev-bin libxv-dev libsdl1.2-dev libao-dev
-libopenal-dev g++
-```
-
-Afterwards, run ``make`` and if everything works out correctly you will find the output binary in the ``out/`` directory.
+TODO
 
 The snesfilter, snesreader, and supergameboy plugins can all be built by running make (or mingw32-make) after you've configured your environment to build bsnes itself.
 After building, just copy the .dll, .so, or .dylib files into the same directory as bsnes itself.
 
-This fork of bsnes doesn't include the alternate UI based on byuu's `phoenix` library. The purpose of this fork is primarily to add additional UI functionality and I have no intention of implementing every new feature twice using completely different libraries just to keep both versions of the UI at parity.
-
 bsnes v073 and its derivatives are licensed under the GPL v2; see *Help > License ...* for more information.
 
 ## Contributors

common/nall/qt/Makefile

@@ -41,7 +41,7 @@ else ifeq ($(platform),osx)
   qtlib += -framework ApplicationServices
 else ifeq ($(platform),win)
   ifeq ($(qtpath),)
-    qtpath := ../external/qt/mingw53_32
+    qtpath := ../external/qt/mingw-w64
     winqtpath := $(subst /,\,$(qtpath))
   endif
 

external/qt

@@ -1 +1 @@
-Subproject commit 38c512b9012f05b4c209c4eda06495c556ba2358
+Subproject commit 24452df09ca9a4931d5e8688b74bbc4b51167ebf