diff options
| author |  Levi | 2021-01-10 22:09:56 -0700 |
|---|---|---|
| committer | Levi | 2021-01-10 22:09:56 -0700 |
| commit | 7a3c884e39fccfbb498b855080bffabc9ce2e7f1 (patch) | |
| tree | 5056f9406dec188439cb0deb87603498243a9412 /CMakeModules | |
| parent | More forgetting... duh (diff) | |
| parent | Merge pull request #5229 from Morph1984/fullscreen-opt (diff) | |
| download | yuzu-7a3c884e39fccfbb498b855080bffabc9ce2e7f1.tar.gz yuzu-7a3c884e39fccfbb498b855080bffabc9ce2e7f1.tar.xz yuzu-7a3c884e39fccfbb498b855080bffabc9ce2e7f1.zip | |
Merge remote-tracking branch 'upstream/master' into int-flags
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 10 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuUnicornDeps.cmake | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake new file mode 100644 index 000000000..cca1eeeab --- /dev/null +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | function(copy_yuzu_FFmpeg_deps target_dir) | ||
| 2 | include(WindowsCopyFiles) | ||
| 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | ||
| 4 | windows_copy_files(${target_dir} ${FFMPEG_DLL_DIR} ${DLL_DEST} | ||
| 5 | avcodec-58.dll | ||
| 6 | avutil-56.dll | ||
| 7 | swresample-3.dll | ||
| 8 | swscale-5.dll | ||
| 9 | ) | ||
| 10 | endfunction(copy_yuzu_FFmpeg_deps) | ||
diff --git a/CMakeModules/CopyYuzuUnicornDeps.cmake b/CMakeModules/CopyYuzuUnicornDeps.cmake deleted file mode 100644 index 7af0ef023..000000000 --- a/CMakeModules/CopyYuzuUnicornDeps.cmake +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | function(copy_yuzu_unicorn_deps target_dir) | ||
| 2 | include(WindowsCopyFiles) | ||
| 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | ||
| 4 | windows_copy_files(${target_dir} ${UNICORN_DLL_DIR} ${DLL_DEST} | ||
| 5 | libgcc_s_seh-1.dll | ||
| 6 | libwinpthread-1.dll | ||
| 7 | unicorn.dll | ||
| 8 | ) | ||
| 9 | endfunction(copy_yuzu_unicorn_deps) | ||