diff options
| author |  bunnei | 2018-06-23 03:17:32 -0400 |
|---|---|---|
| committer |  GitHub | 2018-06-23 03:17:32 -0400 |
| commit | 0b831dd2ba26e8d13b166efe914e9234ee5d04e1 (patch) | |
| tree | c251581c2b52ec40d15cf8d1078da7bfa42f831a /CMakeModules | |
| parent | Fixed RequestUpdateAudioRenderer deadlocks and calculated section sizes prope... (diff) | |
| download | yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.tar.gz yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.tar.xz yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.zip | |
Revert "Use Ninja for MSVC AppVeyor builds" (#584)
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 bfad52c4a..ed24c742c 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/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") |
| 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 e6f455960..5963684f4 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/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") |
| 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 c32f717c8..7af0ef023 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/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") |
| 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 |