citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #1964 from Lectem/sdl2_dll_copy_fix 

Fixes SDL2.dll copy to bindir on windows
This commit is contained in:
bunnei 2016-07-21 09:36:28 -04:00 committed by GitHub
parent f95d119dde c7125f37aa
commit 624cd9cd98
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
externals/cmake-modules/FindSDL2.cmake vendored
View File

@ -3,6 +3,7 @@
# SDL2_LIBRARY, the name of the library to link against # SDL2_LIBRARY, the name of the library to link against
# SDL2_FOUND, if false, do not try to link to SDL2 # SDL2_FOUND, if false, do not try to link to SDL2
# SDL2_INCLUDE_DIR, where to find SDL.h # SDL2_INCLUDE_DIR, where to find SDL.h
# SDL2_DLL_DIR, where to find SDL2.dll if it exists
# #
# This module responds to the the flag: # This module responds to the the flag:
# SDL2_BUILDING_LIBRARY # SDL2_BUILDING_LIBRARY
@ -149,6 +150,14 @@ FIND_LIBRARY(SDL2_LIBRARY_TEMP
) )
IF(SDL2_LIBRARY_TEMP) IF(SDL2_LIBRARY_TEMP)
if(MSVC)
get_filename_component(SDL2_DLL_DIR_TEMP ${SDL2_LIBRARY_TEMP} DIRECTORY)
if(EXISTS ${SDL2_DLL_DIR_TEMP}/SDL2.dll)
set(SDL2_DLL_DIR ${SDL2_DLL_DIR_TEMP})
unset(SDL2_DLL_DIR_TEMP)
endif()
endif()
FIND_PATH(SDL2_INCLUDE_DIR SDL.h FIND_PATH(SDL2_INCLUDE_DIR SDL.h
HINTS HINTS
$ENV{SDL2DIR} $ENV{SDL2DIR}