From e08a65d1b8613dfbe0f48a7d868c5b0459b411a6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 20 Nov 2016 23:02:58 +0100 Subject: [PATCH] Drop unnecessary USE_OPENAL and USE_SDL defines --- CMakeLists.txt | 4 ++-- Source/openal_wrapper.cpp | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) 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=) + add_definitions(-DBinIO_STDINT_HEADER=) 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=) + add_definitions(-DPLATFORM_LINUX=1 -DPLATFORM_UNIX=1 -DBinIO_STDINT_HEADER=) 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 #include #include @@ -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 - -- 2.39.5