From: Rémi Verschelde <rverschelde@gmail.com>
Date: Sun, 20 Nov 2016 22:02:58 +0000 (+0100)
Subject: Drop unnecessary USE_OPENAL and USE_SDL defines
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=e08a65d1b8613dfbe0f48a7d868c5b0459b411a6;p=lugaru.git

Drop unnecessary USE_OPENAL and USE_SDL defines
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29f70eb..a9e16b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,13 +179,13 @@ endif(WIN32)
 target_link_libraries(lugaru ${LUGARU_LIBS})
 
 if(WIN32)
-    add_definitions(-DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=<stdint.h>)
+    add_definitions(-DBinIO_STDINT_HEADER=<stdint.h>)
     if(MINGW)
         # An alternative would be to use _WIN32 consistently instead of WIN32
         add_definitions(-DWIN32)
     endif(MINGW)
 else(WIN32)
-    add_definitions(-DPLATFORM_LINUX=1 -DPLATFORM_UNIX=1 -DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=<stdint.h>)
+    add_definitions(-DPLATFORM_LINUX=1 -DPLATFORM_UNIX=1 -DBinIO_STDINT_HEADER=<stdint.h>)
 endif(WIN32)
 
 
diff --git a/Source/openal_wrapper.cpp b/Source/openal_wrapper.cpp
index cc7ffc5..79be832 100644
--- a/Source/openal_wrapper.cpp
+++ b/Source/openal_wrapper.cpp
@@ -19,8 +19,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#if USE_OPENAL
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -692,6 +690,3 @@ extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp,
         channels[chan] = OPENAL_Stream_PlayEx(OPENAL_FREE, sptr, dsp, startpaused);
     }
 }
-
-#endif
-