CEF audio

src/CMakeLists.txt

@@ -12,31 +12,27 @@ option(ENABLE_HTML "Enable HTML module, require CEF" ON)
 # Add custom cmake modules path
 LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules)
 
-if (MSVC)
-	INCLUDE (Bootstrap_Windows)
-else ()
-	INCLUDE (Bootstrap_Linux)
+INCLUDE (Bootstrap_Linux)
 
-	# Output build settings
-	IF (SUPPORTED_PLATFORM)
-		MESSAGE (STATUS "Supported target platform: ${SUPPORTED_PLATFORM}")
-	ELSE ()
-		MESSAGE (STATUS "Unsupported target platform, will still attempt build!")
-	ENDIF ()
-	MESSAGE (STATUS "Target platform: ${CONFIG_PLATFORM}")
-	MESSAGE (STATUS "Target architecture: ${CONFIG_ARCH}")
-	MESSAGE (STATUS "CPU Count: ${CONFIG_CPU_COUNT}")
-	MESSAGE (STATUS "Target build type: ${CMAKE_BUILD_TYPE}")
-	MESSAGE (STATUS "Build Version: ${CONFIG_VERSION_MAJOR}.${CONFIG_VERSION_MINOR}.${CONFIG_VERSION_BUG} ${CONFIG_VERSION_TAG} (Revision: ${CONFIG_VERSION_GIT_HASH})")
+# Output build settings
+IF (SUPPORTED_PLATFORM)
+	MESSAGE (STATUS "Supported target platform: ${SUPPORTED_PLATFORM}")
+ELSE ()
+	MESSAGE (STATUS "Unsupported target platform, will still attempt build!")
+ENDIF ()
+MESSAGE (STATUS "Target platform: ${CONFIG_PLATFORM}")
+MESSAGE (STATUS "Target architecture: ${CONFIG_ARCH}")
+MESSAGE (STATUS "CPU Count: ${CONFIG_CPU_COUNT}")
+MESSAGE (STATUS "Target build type: ${CMAKE_BUILD_TYPE}")
+MESSAGE (STATUS "Build Version: ${CONFIG_VERSION_MAJOR}.${CONFIG_VERSION_MINOR}.${CONFIG_VERSION_BUG} ${CONFIG_VERSION_TAG} (Revision: ${CONFIG_VERSION_GIT_HASH})")
 
-	CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/version.tmpl" "${CMAKE_BINARY_DIR}/generated/version.h")
-	INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/generated")
+CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/version.tmpl" "${CMAKE_BINARY_DIR}/generated/version.h")
+INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/generated")
 
-	ADD_SUBDIRECTORY (tools)
-	ADD_SUBDIRECTORY (accelerator)
-	ADD_SUBDIRECTORY (common)
-	ADD_SUBDIRECTORY (core)
-	ADD_SUBDIRECTORY (modules)
-	ADD_SUBDIRECTORY (protocol)
-	ADD_SUBDIRECTORY (shell)
-endif ()
+ADD_SUBDIRECTORY (tools)
+ADD_SUBDIRECTORY (accelerator)
+ADD_SUBDIRECTORY (common)
+ADD_SUBDIRECTORY (core)
+ADD_SUBDIRECTORY (modules)
+ADD_SUBDIRECTORY (protocol)
+ADD_SUBDIRECTORY (shell)

src/CMakeModules/Bootstrap_Linux.cmake

@@ -23,18 +23,17 @@ ENDIF ()
 
 SET (BOOST_ROOT_PATH "/opt/boost" CACHE STRING "Path to Boost")
 SET (ENV{BOOST_ROOT} "${BOOST_ROOT_PATH}")
-SET (Boost_USE_DEBUG_LIBS ON)
-SET (Boost_USE_RELEASE_LIBS OFF)
+# SET (Boost_USE_DEBUG_LIBS ON)
+# SET (Boost_USE_RELEASE_LIBS OFF)
 SET (Boost_USE_STATIC_LIBS ON)
-FIND_PACKAGE (Boost 1.66.0 COMPONENTS system thread chrono filesystem log locale regex date_time coroutine REQUIRED)
+FIND_PACKAGE (Boost 1.78.0 COMPONENTS system thread chrono filesystem log locale regex date_time coroutine REQUIRED)
 
 SET (FFMPEG_ROOT_PATH "/opt/ffmpeg/lib/pkgconfig" CACHE STRING "Path to FFMPEG")
 SET (ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${FFMPEG_ROOT_PATH}")
 FIND_PACKAGE (FFmpeg REQUIRED)
 LINK_DIRECTORIES( ${FFMPEG_LIBRARY_DIRS} )
 
-FIND_PACKAGE (OpenGL REQUIRED)
-FIND_PACKAGE (FreeImage REQUIRED)
+FIND_PACKAGE (OpenGL REQUIRED COMPONENTS OpenGL EGL)
 FIND_PACKAGE (GLEW REQUIRED)
 FIND_PACKAGE (TBB REQUIRED)
 FIND_PACKAGE (OpenAL REQUIRED)
@@ -52,7 +51,6 @@ SET (GLEW_INCLUDE_PATH "${GLEW_INCLUDE_DIRS}")
 SET (SFML_INCLUDE_PATH "${SFML_INCLUDE_DIR}")
 SET (FFMPEG_INCLUDE_PATH "${FFMPEG_INCLUDE_DIRS}")
 SET (ASMLIB_INCLUDE_PATH "${EXTERNAL_INCLUDE_PATH}")
-SET (FREEIMAGE_INCLUDE_PATH "${FreeImage_INCLUDE_DIRS}")
 
 set(CEF_INCLUDE_PATH "${CEF_ROOT_DIR}")
 set(CEF_BIN_PATH "${CEF_ROOT_DIR}/Release")
@@ -64,13 +62,14 @@ ADD_DEFINITIONS (-DSFML_STATIC)
 ADD_DEFINITIONS (-DUNICODE)
 ADD_DEFINITIONS (-D_UNICODE)
 ADD_DEFINITIONS (-DGLEW_NO_GLU)
-ADD_DEFINITIONS (-D__NO_INLINE__) # Needed for precompiled headers to work
+ADD_DEFINITIONS (-DGLEW_EGL)
+# ADD_DEFINITIONS (-D__NO_INLINE__) # Needed for precompiled headers to work
 ADD_DEFINITIONS (-DBOOST_NO_SWPRINTF) # swprintf on Linux seems to always use , as decimal point regardless of C-locale or C++-locale
 ADD_DEFINITIONS (-DTBB_USE_CAPTURED_EXCEPTION=1)
-ADD_DEFINITIONS (-DNDEBUG) # Needed for precompiled headers to work
+# ADD_DEFINITIONS (-DNDEBUG) # Needed for precompiled headers to work
 
-ADD_COMPILE_OPTIONS (-std=c++14) # Needed for precompiled headers to work
-ADD_COMPILE_OPTIONS (-O3) # Needed for precompiled headers to work
+# ADD_COMPILE_OPTIONS (-std=c++14) # Needed for precompiled headers to work
+# ADD_COMPILE_OPTIONS (-O3) # Needed for precompiled headers to work
 ADD_COMPILE_OPTIONS (-msse3)
 ADD_COMPILE_OPTIONS (-mssse3)
 ADD_COMPILE_OPTIONS (-msse4.1)
@@ -98,7 +97,7 @@ SET (CASPARCG_MODULE_COMMAND_LINE_ARG_INTERCEPTORS_STATEMENTS "" CACHE INTERNAL
 SET (CASPARCG_MODULE_PROJECTS "" CACHE INTERNAL "")
 SET (CASPARCG_RUNTIME_DEPENDENCIES "" CACHE INTERNAL "")
 
-INCLUDE (PrecompiledHeader)
+# INCLUDE (PrecompiledHeader)
 
 FUNCTION (casparcg_add_include_statement HEADER_FILE_TO_INCLUDE)
 	SET (CASPARCG_MODULE_INCLUDE_STATEMENTS "${CASPARCG_MODULE_INCLUDE_STATEMENTS}"