Compare commits

...

14 Commits

Author SHA1 Message Date
bobthecooldad
87d5427e2e Update appveyor.yml 2018-01-15 21:53:10 +00:00
bobthecooldad
1a14c9faa4 Update appveyor.yml 2018-01-15 21:51:12 +00:00
bobthecooldad
3e8a085055 Update appveyor.yml 2018-01-15 18:12:58 +00:00
bobthecooldad
f28410645d Update appveyor.yml 2018-01-15 18:11:20 +00:00
bobthecooldad
d17c199880 Update appveyor.yml 2018-01-15 18:10:36 +00:00
bobthecooldad
cff69aeb08 Update appveyor.yml 2018-01-15 18:08:59 +00:00
bobthecooldad
2c9b8e6d09 Update appveyor.yml 2018-01-15 17:53:57 +00:00
bobthecooldad
e727360fad Update appveyor.yml 2018-01-15 17:50:51 +00:00
bobthecooldad
bff7f49cea Update CMakeLists.txt 2018-01-15 17:42:24 +00:00
bobthecooldad
c8e4cd456a Update appveyor.yml 2018-01-15 17:18:18 +00:00
bobthecooldad
7517610a1c Update appveyor.yml 2018-01-15 15:37:15 +00:00
bobthecooldad
7d0f573110 Update appveyor.yml 2018-01-15 13:52:11 +00:00
bobthecooldad
c94ac092b5 Update CMakeLists.txt 2018-01-15 13:50:43 +00:00
bobthecooldad
0deeecd33f Update CMakeLists.txt 2018-01-15 13:50:07 +00:00
2 changed files with 11 additions and 5 deletions

View File

@@ -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)
@@ -171,7 +171,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")
@@ -232,7 +232,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()

View File

@@ -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