diff options
| author | bunnei <bunneidev@gmail.com> | 2016-12-16 11:35:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 11:35:55 -0500 |
| commit | d30d6f81aa2ef14a690d483c5b7e7487c71d1971 (patch) | |
| tree | 4626053321537e40007b8bcd8170bd91caadb99b /src/citra | |
| parent | ca5a8966acd2780576bf2f7b03ed7b12b8f95c0b (diff) | |
| parent | b7b2627b3746e28fe64c9af74583c8b24edee909 (diff) | |
Merge pull request #2303 from freiro/citra-qt_missing_sdl2_dll
Copy SDL2.dll when compiling citra-qt with msvc
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/CMakeLists.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index f9c488a1a..ecb5d2dfe 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -1,3 +1,5 @@ +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) + set(SRCS emu_window/emu_window_sdl2.cpp citra.cpp @@ -28,11 +30,6 @@ if(UNIX AND NOT APPLE) endif() if (MSVC) - include(WindowsCopyFiles) - - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") - - windows_copy_files(citra ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) - - unset(DLL_DEST) + include(CopyCitraSDLDeps) + copy_citra_SDL_deps(citra) endif() |