Fix linux build

FrictionalGames · Aug 22, 2022 · c70b378 · c70b378
1 parent 668ad1f
commit c70b378
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 256 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,15 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.9)
 project (OALWrapper)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    add_compile_options(-fdiagnostics-color=always)
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    add_compile_options(-fcolor-diagnostics)
+endif()
+
 set(OALWrapper_VERSION_MAJOR 1)
 set(OALWrapper_VERSION_MINOR 0)
 
@@ -119,11 +128,7 @@ ELSEIF(APP_PRIVATE_LIB_DIR AND APPLE)
 
     FIND_PACKAGE(OpenAL)
 ELSE()
-    FIND_PACKAGE(OGG)
-    FIND_PACKAGE(Vorbis)
-    IF(NOT(APPLE))
-        FIND_PACKAGE(VorbisFile)
-    ENDIF()
+    FIND_PACKAGE(Ogg)
     FIND_PACKAGE(OpenAL)
     IF(USE_SDL2)
         FIND_PACKAGE(SDL2)

diff --git a/CMakeScripts/FindOGG.cmake b/CMakeScripts/FindOGG.cmake
diff --git a/CMakeScripts/FindVorbis.cmake b/CMakeScripts/FindVorbis.cmake
diff --git a/CMakeScripts/FindVorbisFile.cmake b/CMakeScripts/FindVorbisFile.cmake
diff --git a/sources/OAL_Device.cpp b/sources/OAL_Device.cpp
@@ -92,7 +92,7 @@ bool cOAL_Device::Init( cOAL_Init_Params& acParams )
 
 	LogMsg("",eOAL_LogVerbose_Low, eOAL_LogMsg_Info, "Attempting to open device...\n" );
 	// Open the device, if fails return false
-	if(acParams.msDeviceName.empty())
+	if(acParams.msDeviceName.empty() || acParams.msDeviceName.compare("NULL") == 0)
 		mpDevice = alcOpenDevice(NULL);
 	else
 		mpDevice = alcOpenDevice( acParams.msDeviceName.c_str() );