Merge 87d5427e2e into 6f904bb622

CMakeLists.txt

@@ -7,10 +7,10 @@ include(DownloadExternals)
 project(yuzu)
 
 option(ENABLE_SDL2 "Enable the SDL2 frontend" ON)
-option(CITRA_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" OFF)
+option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" OFF)
 
 option(ENABLE_QT "Enable the Qt frontend" ON)
-option(CITRA_USE_BUNDLED_QT "Download bundled Qt binaries" OFF)
+option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" OFF)
 
 option(YUZU_USE_BUNDLED_UNICORN "Download bundled Unicorn binaries" OFF)
 
@@ -174,7 +174,7 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
 if (ENABLE_SDL2)
-    if (CITRA_USE_BUNDLED_SDL2)
+    if (YUZU_USE_BUNDLED_SDL2)
         # Detect toolchain and platform
         if (MSVC14 AND ARCHITECTURE_x86_64)
             set(SDL2_VER "SDL2-2.0.5")
@@ -235,7 +235,7 @@ if (UNICORN_FOUND)
 endif()
 
 if (ENABLE_QT)
-    if (CITRA_USE_BUNDLED_QT)
+    if (YUZU_USE_BUNDLED_QT)
         if (MSVC14 AND ARCHITECTURE_x86_64)
             set(QT_VER qt-5.7-msvc2015_64)
         else()

appveyor.yml

@@ -13,7 +13,7 @@ environment:
   # Tell msys2 to inherit the current directory when starting the shell
   CHERE_INVOKING: 1
   matrix:
-    - BUILD_TYPE: mingw
+    #- BUILD_TYPE: mingw
     - BUILD_TYPE: msvc
 
 platform:
@@ -36,6 +36,12 @@ install:
           C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S $dependencies" 2> $null
         }
 
+        else
+          {
+          $dependecies = "SDL2-2.0.5"
+                         "unicorn-yuzu"
+                         "qt-5.7-msvc2015_64"
+        }
 before_build:
   - mkdir %BUILD_TYPE%_build
   - cd %BUILD_TYPE%_build