M CMakeLists.txt → CMakeLists.txt

@@ -7,8 +7,9 @@ set(USE_CLI_DEBUGGER ON CACHE BOOL "Whether or not to enable the CLI-mode ARM debugger")
 set(USE_GDB_STUB ON CACHE BOOL "Whether or not to enable the GDB stub ARM debugger")
 set(USE_FFMPEG ON CACHE BOOL "Whether or not to enable FFmpeg support")
 set(USE_PNG ON CACHE BOOL "Whether or not to enable PNG support")
+set(USE_LIBZIP ON CACHE BOOL "Whether or not to enable ZIP support")
 set(BUILD_SDL ON CACHE BOOL "Build SDL frontend")
-set(BUILD_PERF ON CACHE BOOL "Build performance profiling tool")
+set(BUILD_PERF OFF CACHE BOOL "Build performance profiling tool")
 file(GLOB ARM_SRC ${CMAKE_SOURCE_DIR}/src/arm/*.c)
 file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c)
 file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cS])
@@ -22,12 +23,28 @@ include_directories(${CMAKE_SOURCE_DIR}/src/arm)
 include_directories(${CMAKE_SOURCE_DIR}/src/gba)
 include_directories(${CMAKE_SOURCE_DIR}/src)
 
+# Function definitions
+include(FindPkgConfig)
+function(find_feature FEATURE_NAME FEATURE_REQUIRES)
+	foreach(REQUIRE ${FEATURE_REQUIRES})
+		find_package(${REQUIRE} QUIET)
+		pkg_search_module(${REQUIRE} ${REQUIRE})
+		if (NOT ${REQUIRE}_FOUND)
+			message(WARNING "Requested module ${REQUIRE} mising for feature {$FEATURE_NAME}. Feature disabled.")
+			set(FEATURE_NAME OFF PARENT_SCOPE)
+			return()
+		endif()
+	endforeach()
+endfunction()
+
+# Version information
 set(LIB_VERSION_MAJOR 0)
 set(LIB_VERSION_MINOR 1)
 set(LIB_VERSION_PATCH 0)
 set(LIB_VERSION_ABI 0.1)
 set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH})
 
+# Advanced settings
 set(BUILD_PGO CACHE BOOL "Build with profiling-guided optimization")
 set(PGO_STAGE_2 CACHE BOOL "Rebuild for profiling-guided optimization after profiles have been generated")
 set(PGO_DIR "/tmp/gba-pgo/" CACHE PATH "Profiling-guided optimization profiles path")
@@ -47,16 +64,13 @@ endif()
 
 add_definitions(-DBINARY_NAME="${BINARY_NAME}" -DPROJECT_NAME="${PROJECT_NAME}")
 
-include(FindPkgConfig)
-pkg_search_module(LIBZIP libzip)
-if(LIBZIP_FOUND)
-	include_directories(${LIBZIP_INCLUDE_DIRS})
-	list(APPEND DEPENDENCY_LIB ${LIBZIP_LIBRARIES})
-	add_definitions(-DENABLE_LIBZIP)
-else()
-	message(WARNING "Could not find libzip for archive support")
-endif()
+# Feature dependencies
+find_feature(USE_CLI_DEBUGGER "libedit")
+find_feature(USE_FFMPEG "libavcodec;libavformat;libavutil")
+find_feature(USE_PNG "PNG;ZLIB")
+find_feature(USE_LIBZIP "libzip")
 
+# Platform support
 if(WIN32)
 	add_definitions(-D_WIN32_WINNT=0x0600)
 	list(APPEND OS_LIB Ws2_32)
@@ -76,19 +90,14 @@ add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5)
 	endif()
 endif()
 
+# Features
 set(DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/debugger.c ${CMAKE_SOURCE_DIR}/src/debugger/memory-debugger.c)
 
 if(USE_CLI_DEBUGGER)
-	pkg_search_module(EDIT libedit)
-	if(EDIT_FOUND)
-		add_definitions(-DUSE_CLI_DEBUGGER)
-		list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/cli-debugger.c)
-		list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/parser.c)
-		set(DEBUGGER_LIB ${EDIT_LIBRARIES})
-	else()
-		message(WARNING "Could not find libedit for CLI debugger support")
-		set(USE_CLI_DEBUGGER OFF)
-	endif()
+	add_definitions(-DUSE_CLI_DEBUGGER)
+	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/cli-debugger.c)
+	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/parser.c)
+	set(DEBUGGER_LIB ${EDIT_LIBRARIES})
 else()
 	set(DEBUGGER_LIB "")
 endif()
@@ -100,22 +109,29 @@ endif()
 source_group("ARM debugger" FILES ${DEBUGGER_SRC})
 
 if(USE_FFMPEG)
-	pkg_search_module(LIBAVCODEC libavcodec REQUIRED)
-	pkg_search_module(LIBAVFORMAT libavformat REQUIRED)
-	pkg_search_module(LIBAVUTIL libavutil REQUIRED)
+	pkg_search_module(LIBAVCODEC libavcodec)
+	pkg_search_module(LIBAVFORMAT libavcodec;libavformat;libavutil)
+	pkg_search_module(LIBAVUTIL libavutil)
 	add_definitions(-DUSE_FFMPEG)
 	list(APPEND UTIL_SRC "${CMAKE_SOURCE_DIR}/src/platform/ffmpeg/ffmpeg-encoder.c")
 	list(APPEND DEPENDENCY_LIB ${LIBAVCODEC_LIBRARIES} ${LIBAVFORMAT_LIBRARIES} ${LIBAVUTIL_LIBRARIES})
 endif()
 
 if(USE_PNG)
-	find_package(PNG REQUIRED)
-	find_package(ZLIB REQUIRED)
+	find_package(PNG)
+	find_package(ZLIB)
 	add_definitions(-DUSE_PNG)
 	include_directories(${PNG_PNG_INCLUDE_DIR})
 	list(APPEND DEPENDENCY_LIB ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
 endif()
 
+if(USE_LIBZIP)
+	include_directories(${LIBZIP_INCLUDE_DIRS})
+	list(APPEND DEPENDENCY_LIB ${LIBZIP_LIBRARIES})
+	add_definitions(-DENABLE_LIBZIP)
+endif()
+
+# Binaries
 add_library(${BINARY_NAME} SHARED ${ARM_SRC} ${GBA_SRC} ${DEBUGGER_SRC} ${RENDERER_SRC} ${UTIL_SRC} ${VFS_SRC} ${OS_SRC})
 target_link_libraries(${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB})
 install(TARGETS ${BINARY_NAME} DESTINATION lib)
@@ -135,3 +151,14 @@ add_executable(${BINARY_NAME}-perf ${PERF_SRC})
 	target_link_libraries(${BINARY_NAME}-perf ${BINARY_NAME} ${PERF_LIB})
 	install(TARGETS ${BINARY_NAME}-perf DESTINATION bin)
 endif()
+
+# Summaries
+message(STATUS "Feature summary:")
+message(STATUS "	CLI debugger: ${USE_CLI_DEBUGGER}")
+message(STATUS "	GDB stub: ${USE_GDB_STUB}")
+message(STATUS "	Movie recording: ${USE_FFMPEG}")
+message(STATUS "	Screenshot/advanced savestate support: ${USE_PNG}")
+message(STATUS "	ZIP support: ${USE_LIBZIP}")
+message(STATUS "Frontend summary:")
+message(STATUS "	SDL (${SDL_VERSION}): ${BUILD_SDL}")
+message(STATUS "	Profiling: ${BUILD_PERF}")

M src/platform/sdl/CMakeLists.txt → src/platform/sdl/CMakeLists.txt

@@ -13,7 +13,12 @@ endif()
 endif()
 
 if(SDL_VERSION EQUAL "1.2" OR NOT SDL2_FOUND)
-	find_package(SDL 1.2 REQUIRED)
+	find_package(SDL 1.2)
+endif()
+
+if (NOT SDL2_FOUND AND NOT SDL_FOUND)
+	set(BUILD_SDL OFF)
+	return()
 endif()
 
 file(GLOB PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-*.c)