mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +00:00 
			
		
		
		
	Merge pull request #2303 from freiro/citra-qt_missing_sdl2_dll
Copy SDL2.dll when compiling citra-qt with msvc
This commit is contained in:
		
						commit
						d30d6f81aa
					
				
					 5 changed files with 33 additions and 30 deletions
				
			
		|  | @ -1,5 +1,6 @@ | |||
| set(CMAKE_AUTOMOC ON) | ||||
| set(CMAKE_INCLUDE_CURRENT_DIR ON) | ||||
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) | ||||
| 
 | ||||
| set(SRCS | ||||
|             config.cpp | ||||
|  | @ -107,27 +108,9 @@ if(UNIX AND NOT APPLE) | |||
|     install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") | ||||
| endif() | ||||
| 
 | ||||
| if (Qt5_FOUND AND MSVC) | ||||
|     include(WindowsCopyFiles) | ||||
| 
 | ||||
|     set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") | ||||
|     set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") | ||||
|     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) | ||||
| if (MSVC) | ||||
|     include(CopyCitraQt5Deps) | ||||
|     include(CopyCitraSDLDeps) | ||||
|     copy_citra_Qt5_deps(citra-qt) | ||||
|     copy_citra_SDL_deps(citra-qt) | ||||
| endif() | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue