Removed unnecessary defines

ChangeLog

@@ -7,6 +7,7 @@
 
 	[ 20140202 ]
 	* Fixed more cppcheck warnings
+	* Removed unnecessary defines (USING_xxx)
 
 	[ 20140201 ]
 	* Rewrote Memory Unit Test using greatest

Makefile

@@ -29,9 +29,7 @@ UNAME=$(shell uname -s)
 # -DUNICODE_SUPPORT			Add unicode/internation keyboard support
 # -DUSING_EMITTER_IN_GAME	Run particle test in game
 
-BASE_DEFS=$(shell sdl-config --cflags) -Iinclude -DSDL_INTERFACE \
-	-DUSING_OPENGL -DZLIB_SUPPORT -DUSING_EMITTER \
-	-DUSING_OPENAL -DUSING_TGA -DUSING_PTHREADS \
+BASE_DEFS=$(shell sdl-config --cflags) -Iinclude -DUSING_EMITTER
 
 BASE_LIBS=$(shell sdl-config --libs) -lz -lstdc++ \
 	-lpthread -lSDL_ttf
@@ -49,7 +47,7 @@ GL_LIBS += -framework OpenGL
 GL_LIBS += -L/opt/local/lib
 GL_DEFS += -I/opt/local/include
 else
-AUDIO_LIBS += -lopenal
+AUDIO_LIBS += -lopenal -lalut
 GL_LIBS += -lGL -lGLU
 GL_LIBS += -L/usr/local/lib
 GL_DEFS += -I/usr/local/include
@@ -394,7 +392,7 @@ Network.test:
 Sound.test:
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(TEST_FLAGS) $(WARNINGS) \
-		-DUSING_OPENAL $(AUDIO_LIBS) $(AUDIO_DEFS) \
+		$(AUDIO_LIBS) $(AUDIO_DEFS) \
 		src/Sound.cpp test/Sound.cpp -o $(BUILD_TEST_DIR)/Sound.test
 
 #################################################################

README.md

@@ -29,6 +29,14 @@ A more or less recent [Doxygen documentation](http://xythobuz.github.io/OpenRaid
 
 ## Dependencies
 
+Basically, OpenRaider depends on the following:
+
+* OpenGL
+* SDL & SDL-TTF
+* OpenAL & ALUT
+* Posix Threads
+* zlib
+
 On Mac OS X 10.9 with [XCode](https://developer.apple.com/xcode/) and [MacPorts](http://www.macports.org) installed, the following should be enough to get all dependencies that are available as port:
 
     sudo port install zlib cmake libsdl libsdl_ttf
@@ -47,8 +55,6 @@ Get, compile and install freealut like this:
 
 Linux Distributions will probably provide an ALUT library ready to install with their package manager, so you won't need to compile freealut.
 
-You'll also need the [XQuartz](http://xquartz.macosforge.org/trac) X11 Server if you're on Mac OS X, as Apple is no longer bundling their own X.
-
 ## Building
 
 If you installed the dependencies using MacPorts, you'll need to have `/opt/local/bin` in your `$PATH` before you can execute make.

include/SDLSystem.h

@@ -23,11 +23,7 @@
 #ifndef _SDLSYSTEM_H_
 #define _SDLSYSTEM_H_
 
-#ifdef SDL_INTERFACE
-#   include <SDL/SDL.h>
-#else
-#   error "SDLSystem requires -DSDL_INTERFACE"
-#endif
+#include <SDL/SDL.h>
 
 #include <System.h>
 

src/Network.cpp

@@ -34,10 +34,8 @@ typedef struct client_s {
     unsigned int frameExpected;
 } client_t;
 
-#ifdef USING_PTHREADS
 #include <pthread.h>
 pthread_t gPThreadId[3];
-#endif
 
 unsigned int gUID;
 client_t gClients[MAX_CLIENTS];
@@ -225,12 +223,7 @@ void Network::spawnServerThread()
     // For now don't handle shutting down server to start client and vv
     if (!mSpawnedServer && !mSpawnedClient)
     {
-#ifdef USING_PTHREADS
         pthread_create(gPThreadId + 0, 0, server_thread, NULL);
-#else
-        printf("Network::spawnServerThread> Build doesn't support threads\n");
-#endif
-
         mSpawnedServer = true;
     }
 }
@@ -241,12 +234,7 @@ void Network::spawnClientThread()
     // For now don't handle shutting down server to start client and vv
     if (!mSpawnedServer && !mSpawnedClient)
     {
-#ifdef USING_PTHREADS
         pthread_create(gPThreadId + 1, 0, client_thread, NULL);
-#else
-        printf("Network::spawnClientThread> Build doesn't support threads\n");
-#endif
-
         mSpawnedClient = true;
     }
 }

src/SDLSystem.cpp

@@ -36,11 +36,7 @@
 #include <memory_test.h>
 #endif
 
-#ifdef USING_OPENGL
 #include <SDL/SDL_opengl.h>
-#else
-#error "SDLSystem requires -DUSING_OPENGL"
-#endif
 
 #include <SDLSystem.h>
 

src/Sound.cpp

@@ -6,7 +6,6 @@
  * \author xythobuz
  */
 
-#ifdef USING_OPENAL
 #ifdef __APPLE__
 #include <OpenAL/al.h>
 #include <OpenAL/alc.h>
@@ -16,9 +15,6 @@
 #include <AL/alc.h>
 #include <AL/alut.h>
 #endif
-#else
-#warning "No OpenAL support. Won't play sound!"
-#endif
 
 #include <time.h>
 #include <stdio.h>
@@ -51,9 +47,7 @@ Sound::~Sound()
 {
     if (mInit)
     {
-#ifdef USING_OPENAL
         alutExit();
-#endif
     }
 }
 
@@ -74,14 +68,10 @@ int Sound::init()
     close(fd);
 #endif
 
-#ifdef USING_OPENAL
     alutInit(NULL, 0);
 
     mInit = true;
     printf("Created OpenAL Context\n");
-#else
-    printf("Couldn't create sound Context!\n");
-#endif
 
     return 0;
 }
@@ -92,10 +82,8 @@ void Sound::listenAt(float pos[3], float angle[3])
     if (!mInit)
         return;
 
-#ifdef USING_OPENAL
     alListenerfv(AL_POSITION, pos);
     alListenerfv(AL_ORIENTATION, angle);
-#endif
 }
 
 
@@ -104,21 +92,17 @@ void Sound::sourceAt(int source, float pos[3])
     if (!mInit || source < 0)
         return;
 
-#ifdef USING_OPENAL
     alSourcefv(mSource[source-1], AL_POSITION, pos);
-#endif
 }
 
 
 //! \fixme Seperate sourcing and buffering, Mongoose 2002.01.04
 int Sound::addFile(const char *filename, int *source, unsigned int flags)
 {
-#ifdef USING_OPENAL
     ALsizei size;
     ALfloat freq;
     ALenum format;
     ALvoid *data;
-#endif
 
 
     if (!mInit || !filename || !source)
@@ -129,7 +113,6 @@ int Sound::addFile(const char *filename, int *source, unsigned int flags)
 
     *source = -1;
 
-#ifdef USING_OPENAL
     alGetError();
 
     alGenBuffers(1, &mBuffer[mNextBuffer]);
@@ -175,19 +158,14 @@ int Sound::addFile(const char *filename, int *source, unsigned int flags)
     *source = mNextBuffer;
 
     return 0;
-#else
-    return -1;
-#endif
 }
 
 int Sound::addWave(unsigned char *wav, unsigned int length, int *source, unsigned int flags)
 {
-#ifdef USING_OPENAL
     ALsizei size;
     ALfloat freq;
     ALenum format;
     ALvoid *data;
-#endif
 
     if (!mInit || !wav || !source)
     {
@@ -197,7 +175,6 @@ int Sound::addWave(unsigned char *wav, unsigned int length, int *source, unsigne
 
     *source = -1;
 
-#ifdef USING_OPENAL
     data = wav;
 
     alGetError();
@@ -249,9 +226,6 @@ int Sound::addWave(unsigned char *wav, unsigned int length, int *source, unsigne
     *source = mNextBuffer;
 
     return 0;
-#else
-    return -1;
-#endif
 }
 
 
@@ -269,9 +243,7 @@ void Sound::play(int source)
         return;
     }
 
-#ifdef USING_OPENAL
     alSourcePlay(mSource[source-1]);
-#endif
 }
 
 
@@ -283,8 +255,6 @@ void Sound::stop(int source)
         return;
     }
 
-#ifdef USING_OPENAL
     alSourceStop(mSource[source-1]);
-#endif
 }
 

src/System.cpp

@@ -15,7 +15,6 @@
 #include <stdarg.h>
 #include <cmath>
 
-#ifdef USING_OPENGL
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
@@ -23,7 +22,6 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #endif
-#endif
 
 #if defined(linux) || defined(__APPLE__)
 #include <time.h>

src/Texture.cpp

@@ -37,10 +37,6 @@
 #include <memory_test.h>
 #endif
 
-#ifdef USING_TGA
-#include <TGA.h>
-#endif
-
 #include <SDL/SDL_ttf.h>
 
 #ifdef __APPLE__
@@ -51,6 +47,7 @@
 #include <GL/glu.h>
 #endif
 
+#include <TGA.h>
 #include <Texture.h>
 
 //Texture *gTextureManager = 0x0;
@@ -946,7 +943,6 @@ void Texture::glScreenShot(char *base, unsigned int width, unsigned int height)
 
 int Texture::loadTGA(const char *filename)
 {
-#ifdef USING_TGA
     FILE *f;
     unsigned char *image = NULL;
     unsigned char *image2 = NULL;
@@ -993,10 +989,6 @@ int Texture::loadTGA(const char *filename)
     }
 
     return id;
-#else
-    printf("ERROR: TGA support not enabled in this build (%s)\n", filename);
-    return -1;
-#endif
 }
 
 

src/TombRaider.cpp

@@ -52,11 +52,7 @@
 
 #include <TombRaider.h>
 
-#ifdef ZLIB_SUPPORT
 #include <zlib.h>
-#else
-#warning "No zlib. Won't support TR4+ files!"
-#endif
 
 #ifdef __TEST_TR5_DUMP_TGA
 #include <TGA.h>
@@ -525,7 +521,6 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
     if (mEngineVersion == TR_VERSION_4)
     {
-#ifdef ZLIB_SUPPORT
         unsigned int sz, usz; // compressed and uncompressed size
         unsigned char *compressed_data = NULL;
         int zerr;
@@ -743,11 +738,6 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
         // Toggle Fread mode to read from decompressed data in memory, not diskfile
         mFreadMode = TR_FREAD_COMPRESSED;
-#else
-        Print("Load> ERROR: TR4 support not compiled in this build.");
-        Print("Load> Try 'make tr4' next build.  Requires zlib.");
-        return -1;
-#endif
     }
 
     if (mEngineVersion == TR_VERSION_2 || mEngineVersion == TR_VERSION_3)
@@ -1974,7 +1964,6 @@ int TombRaider::Load(char *filename, void (*percent)(int))
             break;
     }
 
-#ifdef ZLIB_SUPPORT
     if (mCompressedLevelData)
     {
         printDebug("Load", "Freeing uncompressed TR4 data");
@@ -1983,7 +1972,6 @@ int TombRaider::Load(char *filename, void (*percent)(int))
 
     //! \fixme memory damage?
     mCompressedLevelData = NULL;
-#endif
 
     fclose(f);
 
@@ -4763,10 +4751,8 @@ void TombRaider::extractMeshes(unsigned char *mesh_data,
 
 int TombRaider::Fread(void *buffer, size_t size, size_t count, FILE *f)
 {
-#ifdef ZLIB_SUPPORT
     int num_read;
 
-
     if (mFreadMode == TR_FREAD_COMPRESSED)
     {
         num_read = count;
@@ -4789,7 +4775,8 @@ int TombRaider::Fread(void *buffer, size_t size, size_t count, FILE *f)
             exit(2);
         }
     }
-#endif
+
+
     unsigned int offset = ftell(f);
 
     if (fread(buffer, size, count, f) != count)
@@ -5111,7 +5098,6 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
     if (mEngineVersion != TR_VERSION_5)
         return -1;
 
-#ifdef ZLIB_SUPPORT
     unsigned int sz, usz; // compressed and uncompressed size
     unsigned char *compressed_data = NULL;
     int zerr;
@@ -5276,11 +5262,6 @@ int TombRaider::loadTR5(FILE *f, void (*percent)(int))
         // Free the temporary buffer
         delete [] compressed_data;
     }
-#else
-    Print("LoadTR5> ERROR: TR5 support not compiled in this build.");
-    Print("LoadTR5> Requires zlib-devel.");
-    return -1;
-#endif
 
     if (percent)
         (*percent)(10);