Mirror/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2024-11-24 16:34:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2303 from freiro/citra-qt_missing_sdl2_dll

Browse source 
Copy SDL2.dll when compiling citra-qt with msvc
This commit is contained in:
bunnei 2016-12-16 11:35:55 -05:00 committed by GitHub
commit d30d6f81aa
5 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -1,5 +1,6 @@
# CMake 3.2 required for cmake to know the right flags for CXX standard on OSX # CMake 3.2 required for cmake to know the right flags for CXX standard on OSX
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
function(download_bundled_external remote_path lib_name prefix_var) function(download_bundled_external remote_path lib_name prefix_var)
set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}") set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}")

17
CMakeModules/CopyCitraQt5Deps.cmake Normal file
View file

@ -0,0 +1,17 @@
function(copy_citra_Qt5_deps target_dir)
include(WindowsCopyFiles)
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
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$<$<CONFIG:Debug>:d>.*
Qt5Gui$<$<CONFIG:Debug>:d>.*
Qt5OpenGL$<$<CONFIG:Debug>:d>.*
Qt5Widgets$<$<CONFIG:Debug>:d>.*
)
windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
endfunction(copy_citra_Qt5_deps)

5
CMakeModules/CopyCitraSDLDeps.cmake Normal file
View file

@ -0,0 +1,5 @@
function(copy_citra_SDL_deps target_dir)
include(WindowsCopyFiles)
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
endfunction(copy_citra_SDL_deps)

11
src/citra/CMakeLists.txt
View file

@ -1,3 +1,5 @@
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
set(SRCS set(SRCS
emu_window/emu_window_sdl2.cpp emu_window/emu_window_sdl2.cpp
citra.cpp citra.cpp
@ -28,11 +30,6 @@ if(UNIX AND NOT APPLE)
endif() endif()
if (MSVC) if (MSVC)
include(WindowsCopyFiles) include(CopyCitraSDLDeps)
copy_citra_SDL_deps(citra)
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
windows_copy_files(citra ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
unset(DLL_DEST)
endif() endif()

29
src/citra_qt/CMakeLists.txt
View file

@ -1,5 +1,6 @@
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
set(SRCS set(SRCS
config.cpp config.cpp
@ -107,27 +108,9 @@ if(UNIX AND NOT APPLE)
install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
endif() endif()
if (Qt5_FOUND AND MSVC) if (MSVC)
include(WindowsCopyFiles) include(CopyCitraQt5Deps)
include(CopyCitraSDLDeps)
set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") copy_citra_Qt5_deps(citra-qt)
set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") copy_citra_SDL_deps(citra-qt)
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
set(PLATFORMS ${DLL_DEST}platforms/)
windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST}
icudt*.dll
icuin*.dll
icuuc*.dll
Qt5Core$<$<CONFIG:Debug>:d>.*
Qt5Gui$<$<CONFIG:Debug>:d>.*
Qt5OpenGL$<$<CONFIG:Debug>:d>.*
Qt5Widgets$<$<CONFIG:Debug>:d>.*
)
windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
unset(Qt5_DLL_DIR)
unset(Qt5_PLATFORMS_DIR)
unset(DLL_DEST)
unset(PLATFORMS)
endif() endif()