diff options
| author |  Michał Janiszewski | 2018-06-05 22:46:54 +0200 |
|---|---|---|
| committer | Michał Janiszewski | 2018-06-05 22:46:54 +0200 |
| commit | 5c3d5d08495073178bedccbc688ac3f3eb73abe3 (patch) | |
| tree | 2e1f3835af353bb65210d469ffa069dfdbb9364c /CMakeModules | |
| parent | Drop /std:c++latest from MSVC command line (diff) | |
| download | yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar.gz yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar.xz yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.zip | |
Use Ninja for MSVC AppVeyor builds
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 2 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuSDLDeps.cmake | 2 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuUnicornDeps.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index ed24c742c..bfad52c4a 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | function(copy_yuzu_Qt5_deps target_dir) | 1 | function(copy_yuzu_Qt5_deps target_dir) |
| 2 | include(WindowsCopyFiles) | 2 | include(WindowsCopyFiles) |
| 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") |
| 4 | set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") | 4 | set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") |
| 5 | set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") | 5 | set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") |
| 6 | set(PLATFORMS ${DLL_DEST}platforms/) | 6 | set(PLATFORMS ${DLL_DEST}platforms/) |
diff --git a/CMakeModules/CopyYuzuSDLDeps.cmake b/CMakeModules/CopyYuzuSDLDeps.cmake index 5963684f4..e6f455960 100644 --- a/CMakeModules/CopyYuzuSDLDeps.cmake +++ b/CMakeModules/CopyYuzuSDLDeps.cmake | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | function(copy_yuzu_SDL_deps target_dir) | 1 | function(copy_yuzu_SDL_deps target_dir) |
| 2 | include(WindowsCopyFiles) | 2 | include(WindowsCopyFiles) |
| 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") |
| 4 | windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) | 4 | windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) |
| 5 | endfunction(copy_yuzu_SDL_deps) | 5 | endfunction(copy_yuzu_SDL_deps) |
diff --git a/CMakeModules/CopyYuzuUnicornDeps.cmake b/CMakeModules/CopyYuzuUnicornDeps.cmake index 7af0ef023..c32f717c8 100644 --- a/CMakeModules/CopyYuzuUnicornDeps.cmake +++ b/CMakeModules/CopyYuzuUnicornDeps.cmake | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | function(copy_yuzu_unicorn_deps target_dir) | 1 | function(copy_yuzu_unicorn_deps target_dir) |
| 2 | include(WindowsCopyFiles) | 2 | include(WindowsCopyFiles) |
| 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") |
| 4 | windows_copy_files(${target_dir} ${UNICORN_DLL_DIR} ${DLL_DEST} | 4 | windows_copy_files(${target_dir} ${UNICORN_DLL_DIR} ${DLL_DEST} |
| 5 | libgcc_s_seh-1.dll | 5 | libgcc_s_seh-1.dll |
| 6 | libwinpthread-1.dll | 6 | libwinpthread-1.dll |