Merge pull request #343 from jordan-woyak/disable-sdl-windows

Disable SDL input on Windows.
dolphin-emu · May 22, 2014 · dd41326 · dd41326
2 parents 36d4874 + 635dbd0
commit dd41326
Show file tree

Hide file tree

Showing 145 changed files with 11 additions and 51,799 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -581,6 +581,7 @@ if(NOT ANDROID)
 	endif()
 	if(SDL2_FOUND)
 		message("Using shared SDL2")
+		add_definitions(-DHAVE_SDL=1)
 		include_directories(${SDL2_INCLUDE_DIR})
 	else(SDL2_FOUND)
 		# SDL2 not found, try SDL
@@ -589,12 +590,11 @@ if(NOT ANDROID)
 		endif()
 		if(SDL_FOUND)
 			message("Using shared SDL")
+			add_definitions(-DHAVE_SDL=1)
 			include_directories(${SDL_INCLUDE_DIR})
 		else(SDL_FOUND)
-			# TODO: Use the prebuilt one on Windows
-			message("Using static SDL from Externals")
-			include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include)
-			add_subdirectory(Externals/SDL)
+			message("SDL NOT found, disabling SDL input")
+			add_definitions(-DHAVE_SDL=0)
 		endif(SDL_FOUND)
 	endif(SDL2_FOUND)
 endif()

diff --git a/Externals/SDL/CMakeLists.txt b/Externals/SDL/CMakeLists.txt
diff --git a/Externals/SDL/SDL/SDL.h b/Externals/SDL/SDL/SDL.h
diff --git a/Externals/SDL/SDL/SDL_config_bsd.h b/Externals/SDL/SDL/SDL_config_bsd.h