SDL TTF always required

ChangeLog

@@ -5,6 +5,9 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140120 ]
+	* Removed HAVE_SDL & HAVE_SDL_TTF flags. SDL & TTF always required!
+
 	[ 20140119 ]
 	* Enabled linear texture filtering for fonts, resulting in nicer
 	  looking down scaling

Makefile

@@ -32,7 +32,6 @@ UNAME=$(shell uname -s)
 BASE_DEFS=$(shell sdl-config --cflags) -Iinclude -DSDL_INTERFACE \
 	-DUSING_OPENGL -DZLIB_SUPPORT -DUSING_EMITTER \
 	-DUSING_OPENAL -DUSING_TGA -DUSING_PTHREADS \
-	-DHAVE_SDL_TTF
 
 BASE_LIBS=$(shell sdl-config --libs) -lz -lstdc++ \
 	-lpthread -lSDL_ttf
@@ -341,7 +340,7 @@ TombRaider.test:
 
 GLString.test:
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude -DHAVE_SDL_TTF -DHAVE_SDL \
+	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude \
 	$(shell sdl-config --cflags) $(shell sdl-config --libs) \
 	$(GL_LIBS) $(GL_DEFS) -lSDL_ttf -lm -lstdc++ \
 	src/Texture.cpp src/GLString.cpp \

include/Texture.h

@@ -90,9 +90,9 @@ class Texture
 
 	enum TextureFlag
 	{
-		fUseMipmaps			= 1,
-		fUseMultiTexture	= 2,
-		fUseSDL_TTF			= 4
+		fUseMipmaps			= (1 << 0),
+		fUseMultiTexture	= (1 << 1),
+        fUseSDL_TTF         = (1 << 2)
 	};
 
 

src/Texture.cpp

@@ -41,9 +41,7 @@
 #include <TGA.h>
 #endif
 
-#ifdef HAVE_SDL_TTF
 #include <SDL/SDL_ttf.h>
-#endif
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
@@ -299,7 +297,6 @@ int Texture::loadFontTTF(const char *filename,
 
 gl_font_t *Texture::generateFont(ttf_texture_t *texture)
 {
-#ifdef HAVE_SDL_TTF
 	const float spacing = 4.0;
 	unsigned int i;
 	float u, v, u2, v2;
@@ -376,9 +373,6 @@ gl_font_t *Texture::generateFont(ttf_texture_t *texture)
 	}
 
 	return font;
-#else
-	return NULL;
-#endif
 }
 
 
@@ -389,7 +383,6 @@ ttf_texture_t *Texture::generateFontTexture(const char *filename, int pointSize,
 														  unsigned int count,
 														  char verbose)
 {
-#ifdef HAVE_SDL_TTF
 	unsigned int i;
 	int xx = 0, yy = 0, hh = 0, k, h, w, offset;
 	unsigned char b;
@@ -521,10 +514,6 @@ ttf_texture_t *Texture::generateFontTexture(const char *filename, int pointSize,
 	TTF_CloseFont(font);
 
 	return texture;
-#else
-	printf("SDL_TTF not enabled in this build.\n");
-	return NULL;
-#endif
 }
 
 
@@ -548,7 +537,6 @@ int Texture::loadColorTexture(unsigned char rgba[4],
 
 void Texture::initSDL_TTF()
 {
-#ifdef HAVE_SDL_TTF
 	// Initialize the TTF library
 	if (TTF_Init() < 0)
 	{
@@ -562,7 +550,6 @@ void Texture::initSDL_TTF()
 		printf("Started SDL_TTF subsystem!\n");
 		atexit(TTF_Quit);
 	}
-#endif
 }
 
 

test/GLString.cpp

@@ -6,23 +6,19 @@
  */
 
 #include <math.h>
-
+#include <SDL/SDL.h>
 #ifdef __APPLE__
 #include <OpenGL/glu.h>
 #else
 #include <GL/glu.h>
 #endif
 
-#ifdef HAVE_SDL_TTF
 #include <Texture.h>
-Texture gTexture;
-#else
-#error "Requires SDL_TTF"
-#endif
-
 #include <GLString.h>
 
 GLString *TEXT;
+SDL_Surface *SDL_WINDOW = NULL;
+Texture gTexture;
 
 void swap_buffers();
 
@@ -86,13 +82,6 @@ void event_display(int width, int height)
 }
 
 
-#ifdef HAVE_SDL
-#include <SDL/SDL.h>
-
-
-SDL_Surface *SDL_WINDOW = NULL;
-
-
 void swap_buffers()
 {
 	SDL_GL_SwapBuffers();
@@ -292,9 +281,6 @@ int main_gl(int argc, char *argv[])
 
   return 0;
 }
-#else
-#error "Requires SDL to create GL Context"
-#endif
 
 int main(int argc, char *argv[])
 {