Removed redundant USING/HAVE defines

ChangeLog

@@ -7,6 +7,7 @@
 
 	[ 20140102 ]
 	* Replaced the (unknown) included sample sound file
+	* Removed some redundant build config defines
 
 	[ 20140101 ]
 	* Fixed Wavebuffer loading of Sound subsystem, as well as

Makefile

@@ -33,7 +33,7 @@ UNAME=$(shell uname -s)
 BASE_DEFS=$(shell sdl-config --cflags) -Isrc -I/opt/local/include -DSDL_INTERFACE \
 	-DUSING_OPENGL -DZLIB_SUPPORT -DUSING_EMITTER \
 	-DUSING_OPENAL -DUSING_MTK_TGA -DUSING_PTHREADS \
-	-DUSING_HEL -DHAVE_SDL_TTF -DHAVE_OPENGL
+	-DUSING_HEL -DHAVE_SDL_TTF
 
 BASE_LIBS=$(shell sdl-config --libs) -lz -lstdc++ \
 	-lpthread -lSDL_ttf
@@ -42,10 +42,6 @@ BASE_LIBS=$(shell sdl-config --libs) -lz -lstdc++ \
 DEBUG_DEFS=-DDEBUG -DEXPERIMENTAL
 DEBUG_OBJ=
 
-###############################################################
-# OpenAL, Sound support
-BASE_DEFS += -DHAVE_OPENAL
-
 ifeq ($(UNAME),Darwin)
 AUDIO_LIBS += -lalut
 AUDIO_LIBS += -L/opt/local/lib
@@ -516,7 +512,7 @@ Network.test:
 Sound.test:
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(TEST_FLAGS) -DUNIT_TEST_SOUND \
-		-DUSING_OPENAL -DHAVE_OPENAL $(AUDIO_LIBS) \
+		-DUSING_OPENAL $(AUDIO_LIBS) \
 		src/Sound.cpp -o $(BUILD_TEST_DIR)/Sound.test
 ifeq ($(UNAME),Darwin)
 	install_name_tool -change libalut.0.1.0.dylib /opt/local/lib/libalut.0.1.0.dylib $(BUILD_TEST_DIR)/Sound.test

src/SDLSystem.cpp

@@ -33,17 +33,17 @@
 #include <cmath>
 
 #ifdef MEMEORY_TEST
-#   include "memeory_test.h"
+#include "memeory_test.h"
 #endif
 
-#ifdef HAVE_OPENGL
+#ifdef USING_OPENGL
 #include <SDL/SDL_opengl.h>
 #else
-#   error "SDLSystem requires -DHAVE_OPENGL"
+#error "SDLSystem requires -DUSING_OPENGL"
 #endif
 
 #ifdef PS2_LINUX
-#   include "ps2.h"
+#include "ps2.h"
 #endif
 
 #include "SDLSystem.h"

src/Sound.cpp

@@ -8,7 +8,7 @@
  * \author xythobuz
  */
 
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
 #ifdef __APPLE__
 #include <OpenAL/al.h>
 #include <OpenAL/alc.h>
@@ -50,7 +50,7 @@ Sound::~Sound()
 {
 	if (mInit)
 	{
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
 		alutExit();
 #endif
 	}
@@ -73,7 +73,7 @@ int Sound::init()
 	close(fd);
 #endif
 
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
 	alutInit(NULL, 0);
 
 	mInit = true;
@@ -91,7 +91,7 @@ void Sound::listenAt(float pos[3], float angle[3])
 	if (!mInit)
 		return;
 
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
 	alListenerfv(AL_POSITION, pos);
 	alListenerfv(AL_ORIENTATION, angle);
 #endif
@@ -103,7 +103,7 @@ void Sound::sourceAt(int source, float pos[3])
 	if (!mInit || source < 0)
 		return;
 
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
 	alSourcefv(mSource[source-1], AL_POSITION, pos);
 #endif
 }
@@ -112,7 +112,7 @@ void Sound::sourceAt(int source, float pos[3])
 //! \fixme Seperate sourcing and buffering, Mongoose 2002.01.04
 int Sound::addFile(char *filename, int *source, unsigned int flags)
 {
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
    ALsizei size;
    ALfloat freq;
    ALenum format;
@@ -128,7 +128,7 @@ int Sound::addFile(char *filename, int *source, unsigned int flags)
 
 	*source = -1;
 
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
    alGetError();
 
 	alGenBuffers(1, &mBuffer[mNextBuffer]);
@@ -181,7 +181,7 @@ int Sound::addFile(char *filename, int *source, unsigned int flags)
 
 int Sound::addWave(unsigned char *wav, unsigned int length, int *source, unsigned int flags)
 {
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
    ALsizei size;
    ALfloat freq;
    ALenum format;
@@ -196,7 +196,7 @@ int Sound::addWave(unsigned char *wav, unsigned int length, int *source, unsigne
 
 	*source = -1;
 
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
 	data = wav;
 
    alGetError();
@@ -268,7 +268,7 @@ void Sound::play(int source)
 		return;
 	}
 
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
 	alSourcePlay(mSource[source-1]);
 #endif
 }
@@ -282,7 +282,7 @@ void Sound::stop(int source)
 		return;
 	}
 
-#ifdef HAVE_OPENAL
+#ifdef USING_OPENAL
 	alSourceStop(mSource[source-1]);
 #endif
 }