Add experimental conan support

Try to use conan package manager to handle build dependencies.
Additional updates to CMake

Author: winterheart

CMakeLists.txt

@@ -4,20 +4,15 @@ project(shockolate VERSION 0.7.8)
 
 include(FeatureSummary)
 
-#set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
-#set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS ON)
-set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS OFF)
-set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
+# Added for conan generator
+set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH})
 
 # Required for stdbool.h
 set(CMAKE_C_STANDARD 99)
 # For nullptr in C++
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g ")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -D__STDC_LIMIT_MACROS")
-
 option(ENABLE_EXAMPLES "Enable example applications" OFF)
 add_feature_info(ENABLE_EXAMPLES ENABLE_EXAMPLES "Enable example application (can be broken!)")
 option(ENABLE_DEBUG_BLIT "Enable debugging blitter" OFF)
@@ -38,7 +33,7 @@ set_property(CACHE ENABLE_FLUIDSYNTH PROPERTY STRINGS "ON" "BUNDLED" "OFF")
 add_feature_info(ENABLE_FLUIDSYNTH ENABLE_FLUIDSYNTH "Enable FluidSynth MIDI support")
 
 # HAAAAX!!
-add_definitions(-DSVGA_SUPPORT)
+add_definitions(-DSVGA_SUPPORT -D__STDC_LIMIT_MACROS)
 
 if(ENABLE_DEBUG_BLIT)
 	add_definitions(-DDEBUGGING_BLIT)
@@ -51,8 +46,9 @@ if(ENABLE_OPENGL)
 	find_package(OpenGL REQUIRED)
 	add_definitions(-DUSE_OPENGL)
 	if(WIN32)
-		list(APPEND OPENGL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/build_ext/built_glew/include)
-		list(APPEND OPENGL_LIBRARIES ${CMAKE_SOURCE_DIR}/build_ext/built_glew/lib/libglew32.dll.a winmm)
+		find_package(glew REQUIRED)
+		list(APPEND OPENGL_INCLUDE_DIRS ${glew_INCLUDE_DIRS})
+		list(APPEND OPENGL_LIBRARIES glew:glew winmm)
 	endif(WIN32)
 endif(ENABLE_OPENGL)
 
@@ -63,11 +59,9 @@ if(ENABLE_SDL2 MATCHES "ON")
 	endif(SDL2_FOUND)
 endif(ENABLE_SDL2 MATCHES "ON")
 if(ENABLE_SDL2 MATCHES "BUNDLED")
-	set(SDL2_DIR ${CMAKE_SOURCE_DIR}/build_ext/built_sdl)
-	find_library(SDL2_LIBRARY SDL2 PATHS ${SDL2_DIR}/lib NO_DEFAULT_PATH)
-	find_library(SDL2MAIN_LIBRARY SDL2main PATHS ${SDL2_DIR}/lib NO_DEFAULT_PATH)
-	set(SDL2_INCLUDE_DIRS ${SDL2_DIR}/include/SDL2)
-	set(SDL2_LIBRARIES "${SDL2MAIN_LIBRARY};${SDL2_LIBRARY}")
+	find_package(sdl2 REQUIRED)
+	set(SDL2_INCLUDE_DIRS ${sdl2_INCLUDE_DIRS})
+	set(SDL2_LIBRARIES sdl2::sdl2)
 endif(ENABLE_SDL2 MATCHES "BUNDLED")
 
 if(ENABLE_SOUND MATCHES "ON")
@@ -77,10 +71,9 @@ if(ENABLE_SOUND MATCHES "ON")
 	add_definitions(-DUSE_SDL_MIXER=1)
 endif(ENABLE_SOUND MATCHES "ON")
 if(ENABLE_SOUND MATCHES "BUNDLED")
-	set(SDL2_MIXER_DIR ${CMAKE_SOURCE_DIR}/build_ext/built_sdl_mixer)
-	set(SDL2_MIXER_INCLUDE_DIRS ${SDL2_MIXER_DIR}/include/SDL2)
-	find_library(SDL2_MIXER_LIBRARY SDL2_mixer PATHS ${SDL2_MIXER_DIR}/lib)
-	set(SDL2_MIXER_LIBRARIES ${SDL2_MIXER_LIBRARY})
+	find_package(sdl2_mixer REQUIRED)
+	set(SDL2_MIXER_INCLUDE_DIRS ${sdl2_mixer_INCLUDE_DIRS})
+	set(SDL2_MIXER_LIBRARIES sdl2_mixer::sdl2_mixer)
 	add_definitions(-DUSE_SDL_MIXER=1)
 endif(ENABLE_SOUND MATCHES "BUNDLED")
 
@@ -90,9 +83,9 @@ if(ENABLE_FLUIDSYNTH MATCHES "ON")
 	add_definitions("-DUSE_FLUIDSYNTH=1")
 endif(ENABLE_FLUIDSYNTH MATCHES "ON")
 if(ENABLE_FLUIDSYNTH MATCHES "BUNDLED")
-        find_library(FLUIDSYNTH_LIBRARY fluidsynth PATHS ${CMAKE_SOURCE_DIR}/build_ext/fluidsynth-lite/src)
-	set(FLUIDSYNTH_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/build_ext/fluidsynth-lite/include)
-	set(FLUIDSYNTH_LIBRARIES ${FLUIDSYNTH_LIBRARY})
+	find_package(fluidsynth REQUIRED)
+	set(FLUIDSYNTH_INCLUDE_DIRS ${fluidsynth_INCLUDE_DIRS})
+	set(FLUIDSYNTH_LIBRARIES fluidsynth::fluidsynth)
 	add_definitions("-DUSE_FLUIDSYNTH=1")
 endif(ENABLE_FLUIDSYNTH MATCHES "BUNDLED")
 

conanfile.txt

@@ -0,0 +1,22 @@
+[build_requires]
+fluidsynth/2.0.5@bincrafters/stable
+glew/2.1.0@bincrafters/stable
+sdl2/2.0.9@bincrafters/stable
+sdl2_mixer/2.0.4@bincrafters/stable
+
+[options]
+# Disable unused dependencies
+
+sdl2:jack=False
+sdl2:nas=False
+
+sdl2_mixer:mad=False
+sdl2_mixer:modplug=False
+sdl2_mixer:mpg123=False
+sdl2_mixer:ogg=False
+sdl2_mixer:opus=False
+sdl2_mixer:tinymidi=False
+
+[generators]
+cmake_find_package
+