Update conan integration support

Removed -g option from compiler (it should'nt even defined by hand). Use -DCMAKE_BUILD_TYPE=Debug to enable it.

Author: winterheart

CMakeLists.txt

@@ -4,11 +4,6 @@ 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})
 
@@ -18,9 +13,6 @@ set(CMAKE_C_STANDARD 99)
 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)
@@ -41,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)
@@ -81,8 +73,7 @@ endif(ENABLE_SOUND MATCHES "ON")
 if(ENABLE_SOUND MATCHES "BUNDLED")
 	find_package(sdl2_mixer REQUIRED)
 	set(SDL2_MIXER_INCLUDE_DIRS ${sdl2_mixer_INCLUDE_DIRS})
-	# FIXME additional dependencies ogg and opus
-	set(SDL2_MIXER_LIBRARIES sdl2_mixer::sdl2_mixer ogg::ogg opus::opus)
+	set(SDL2_MIXER_LIBRARIES sdl2_mixer::sdl2_mixer)
 	add_definitions(-DUSE_SDL_MIXER=1)
 endif(ENABLE_SOUND MATCHES "BUNDLED")
 

conanfile.txt

@@ -4,6 +4,19 @@ 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