From e86bdb16019be278974fcab75255ae37cc600747 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sat, 13 Jan 2018 22:14:04 +0000 Subject: Fix build on macOS and linux --- CMakeModules/CopyCitraQt5Deps.cmake | 17 ----------------- CMakeModules/CopyCitraSDLDeps.cmake | 5 ----- CMakeModules/CopyYuzuQt5Deps.cmake | 17 +++++++++++++++++ CMakeModules/CopyYuzuSDLDeps.cmake | 5 +++++ 4 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 CMakeModules/CopyCitraQt5Deps.cmake delete mode 100644 CMakeModules/CopyCitraSDLDeps.cmake create mode 100644 CMakeModules/CopyYuzuQt5Deps.cmake create mode 100644 CMakeModules/CopyYuzuSDLDeps.cmake (limited to 'CMakeModules') diff --git a/CMakeModules/CopyCitraQt5Deps.cmake b/CMakeModules/CopyCitraQt5Deps.cmake deleted file mode 100644 index 342d0b915..000000000 --- a/CMakeModules/CopyCitraQt5Deps.cmake +++ /dev/null @@ -1,17 +0,0 @@ -function(copy_citra_Qt5_deps target_dir) - include(WindowsCopyFiles) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$/") - set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") - set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") - set(PLATFORMS ${DLL_DEST}platforms/) - windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} - icudt*.dll - icuin*.dll - icuuc*.dll - Qt5Core$<$:d>.* - Qt5Gui$<$:d>.* - Qt5OpenGL$<$:d>.* - Qt5Widgets$<$:d>.* - ) - windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$:d>.*) -endfunction(copy_citra_Qt5_deps) diff --git a/CMakeModules/CopyCitraSDLDeps.cmake b/CMakeModules/CopyCitraSDLDeps.cmake deleted file mode 100644 index 4f9e4aeb9..000000000 --- a/CMakeModules/CopyCitraSDLDeps.cmake +++ /dev/null @@ -1,5 +0,0 @@ -function(copy_citra_SDL_deps target_dir) - include(WindowsCopyFiles) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$/") - windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) -endfunction(copy_citra_SDL_deps) diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake new file mode 100644 index 000000000..ed24c742c --- /dev/null +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -0,0 +1,17 @@ +function(copy_yuzu_Qt5_deps target_dir) + include(WindowsCopyFiles) + set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$/") + set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") + set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") + set(PLATFORMS ${DLL_DEST}platforms/) + windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} + icudt*.dll + icuin*.dll + icuuc*.dll + Qt5Core$<$:d>.* + Qt5Gui$<$:d>.* + Qt5OpenGL$<$:d>.* + Qt5Widgets$<$:d>.* + ) + windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$:d>.*) +endfunction(copy_yuzu_Qt5_deps) diff --git a/CMakeModules/CopyYuzuSDLDeps.cmake b/CMakeModules/CopyYuzuSDLDeps.cmake new file mode 100644 index 000000000..5963684f4 --- /dev/null +++ b/CMakeModules/CopyYuzuSDLDeps.cmake @@ -0,0 +1,5 @@ +function(copy_yuzu_SDL_deps target_dir) + include(WindowsCopyFiles) + set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$/") + windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) +endfunction(copy_yuzu_SDL_deps) -- cgit v1.2.3