Skip to content

Instantly share code, notes, and snippets.

@osa1
Last active December 31, 2015 16:39
Show Gist options
  • Save osa1/8015396 to your computer and use it in GitHub Desktop.
Save osa1/8015396 to your computer and use it in GitHub Desktop.
CMakeLists change to make dolphin-emu working under Linux systems with system-wide SDL installed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4dcf97..8878284 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -557,27 +557,10 @@ if(OPENAL_FOUND)
endif()
if(NOT ANDROID)
- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- include(FindSDL2 OPTIONAL)
- endif()
- if(SDL2_FOUND)
- message("Using shared SDL2")
- include_directories(${SDL2_INCLUDE_DIR})
- else(SDL2_FOUND)
- # SDL2 not found, try SDL
- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- include(FindSDL OPTIONAL)
- endif()
- if(SDL_FOUND)
- message("Using shared SDL")
- 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)
- endif(SDL_FOUND)
- endif(SDL2_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)
endif()
include(FindLibUSB OPTIONAL)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment