Added config.h header

src/.gitignore

@@ -1,2 +1,3 @@
 *.o
 Makefile
+config.h

src/Logger.h

@@ -1,4 +1,9 @@
-#pragma once
+#ifndef __Logger_h__
+#define __Logger_h__
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 namespace OpenArena
 {
@@ -87,3 +92,5 @@ namespace OpenArena
 		virtual void Log(const char* message, const char* classification, MessageType type=MESSAGETYPE_INFORMATION) = 0;
 	};
 };
+
+#endif

src/Makefile.linux

@@ -1,14 +1,13 @@
 #Dependencies soooo need to be fixed/finished
 CPP = g++ -g
-INCLUDES = 
+INCLUDES = -I/usr/X11R6/include
 LD = g++
-INCLUDEPATH = ../include
 OBJECTS = screen.o bmp.o camera.o ctrls.o level.o mygl.o myglFont.o myglTexture.o physics.o player.o strmanip.o tga.o vector.o window.o keys.o main.o
 LIBS = -L/usr/X11R6/lib -lGL -lGLU -lXxf86vm
 LIBRARIES = 
 SO_LIBS = 
 SO_LIBRARIES = oa_game.so oa_audio.so oa_net.so oa_video.so oa_input.so
-CPPFLAGS = 
+CPPFLAGS = -DHAVE_CONFIG_H
 LDFLAGS = $(LIBS)
 
 .Phony: all clean install
@@ -37,53 +36,50 @@ oa_video.so:
 oa_input.so:
 
 #Object Files
-screen.o: screen.cpp $(INCLUDEPATH)/screen.h
-	$(CPP) -c -o screen.o screen.cpp
+screen.o: screen.cpp screen.h config.h
+	$(CPP) $(CPPFLAGS)-c -o screen.o screen.cpp
 
-bmp.o: bmp.cpp $(INCLUDEPATH)/bmp.h $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/datatypes.h $(INCLUDEPATH)/texture.h
-	$(CPP) -c -o bmp.o bmp.cpp
+bmp.o: bmp.cpp bmp.h mygl.h datatypes.h texture.h config.h
+	$(CPP) $(CPPFLAGS)-c -o bmp.o bmp.cpp
 	
-camera.o: camera.cpp $(INCLUDEPATH)/camera.h $(INCLUDEPATH)/vector.h $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/screen.h
-	$(CPP) -c -o camera.o camera.cpp
+camera.o: camera.cpp camera.h vector.h mygl.h screen.h config.h
+	$(CPP) $(CPPFLAGS)-c -o camera.o camera.cpp
 
-ctrls.o: ctrls.cpp $(INCLUDEPATH)/ctrls.h $(INCLUDEPATH)/keys.h $(INCLUDEPATH)/physics.h $(INCLUDEPATH)/datatypes.h $(INCLUDEPATH)/list.h
-	$(CPP) -c -o ctrls.o ctrls.cpp
+ctrls.o: ctrls.cpp ctrls.h keys.h physics.h datatypes.h list.h config.h
+	$(CPP) $(CPPFLAGS)-c -o ctrls.o ctrls.cpp
 
-level.o: level.cpp $(INCLUDEPATH)/level.h $(INCLUDEPATH)/version.h
-	$(CPP) -c -o level.o level.cpp
+level.o: level.cpp level.h version.h config.h
+	$(CPP) $(CPPFLAGS)-c -o level.o level.cpp
 
-$(INCLUDEPATH)/level.h: $(INCLUDEPATH)/myglFont.h
-	touch $(INCLUDEPATH)/level.h
+mygl.o: mygl.cpp mygl.h config.h
+	$(CPP) $(CPPFLAGS)-c -o mygl.o mygl.cpp
 
-mygl.o: mygl.cpp $(INCLUDEPATH)/mygl.h
-	$(CPP) -c -o mygl.o mygl.cpp
+myglFont.o: myglFont.cpp myglFont.h config.h
+	$(CPP) $(CPPFLAGS)-c -o myglFont.o myglFont.cpp
 
-myglFont.o: myglFont.cpp $(INCLUDEPATH)/myglFont.h
-	$(CPP) -c -o myglFont.o myglFont.cpp
+myglTexture.o: myglTexture.cpp myglTexture.h config.h
+	$(CPP) $(CPPFLAGS)-c -o myglTexture.o myglTexture.cpp
 
-myglTexture.o: myglTexture.cpp $(INCLUDEPATH)/myglTexture.h
-	$(CPP) -c -o myglTexture.o myglTexture.cpp
+physics.o: physics.cpp physics.h config.h
+	$(CPP) $(CPPFLAGS)-c -o physics.o physics.cpp
 
-physics.o: physics.cpp $(INCLUDEPATH)/physics.h
-	$(CPP) -c -o physics.o physics.cpp
+player.o: player.cpp player.h config.h
+	$(CPP) $(CPPFLAGS)-c -o player.o player.cpp
 
-player.o: player.cpp $(INCLUDEPATH)/player.h
-	$(CPP) -c -o player.o player.cpp
+strmanip.o: strmanip.cpp strmanip.h config.h
+	$(CPP) $(CPPFLAGS)-c -o strmanip.o strmanip.cpp
 
-strmanip.o: strmanip.cpp $(INCLUDEPATH)/strmanip.h
-	$(CPP) -c -o strmanip.o strmanip.cpp
+tga.o: tga.cpp tga.h config.h
+	$(CPP) $(CPPFLAGS)-c -o tga.o tga.cpp
 
-tga.o: tga.cpp $(INCLUDEPATH)/tga.h
-	$(CPP) -c -o tga.o tga.cpp
+vector.o: vector.cpp vector.h config.h
+	$(CPP) $(CPPFLAGS)-c -o vector.o vector.cpp
 
-vector.o: vector.cpp $(INCLUDEPATH)/vector.h
-	$(CPP) -c -o vector.o vector.cpp
+window.o: window.cpp window.h config.h
+	$(CPP) $(CPPFLAGS)-c -o window.o window.cpp
 	
-window.o: window.cpp $(INCLUDEPATH)/window.h
-	$(CPP) -c -o window.o window.cpp
+keys.o: keys.cpp keys.h config.h
+	$(CPP) $(CPPFLAGS)-c -o keys.o keys.cpp
 
-keys.o: keys.cpp $(INCLUDEPATH)/keys.h
-	$(CPP) -c -o keys.o keys.cpp
-
-main.o: linux.cpp $(INCLUDEPATH)/main.h
-	$(CPP) -c -o main.o linux.cpp
+main.o: linux.cpp main.h config.h
+	$(CPP) $(CPPFLAGS)-c -o main.o linux.cpp

src/Makefile.macosx

@@ -4,7 +4,7 @@ INCLUDES =
 LD = g++
 X11INCLUDEDIR = /usr/X11R6/include
 X11LIBDIR = /usr/X11R6/lib
-INCLUDE_DIRS = -I$(X11INCLUDEDIR)
+INCLUDE_DIRS = -I$(X11INCLUDEDIR) -DHAVE_CONFIG_H
 LIBRARY_DIRS = -L$(X11LIBDIR)
 OBJECTS = screen.o bmp.o camera.o ctrls.o level.o mygl.o myglFont.o myglTexture.o player.o strmanip.o tga.o vector.o window.o keys.o main.o
 LIBS = $(LIBRARY_DIRS) -lGL -lGLU -lXxf86vm -lX11
@@ -19,7 +19,7 @@ all: ../OpenArena
 
 clean: 
 	rm -f *.o
-	if [ -f ../OpenArena/OpenArena ]; then rm ../OpenArena/OpenArena; fi
+	if [ -f ../OpenArena ]; then rm ../OpenArena; fi
 	
 install:
 
@@ -39,47 +39,47 @@ oa_video.so:
 oa_input.so:
 
 #Object Files
-screen.o: screen.cpp screen.h
+screen.o: screen.cpp screen.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o screen.o screen.cpp
 
-bmp.o: bmp.cpp bmp.h mygl.h datatypes.h texture.h
+bmp.o: bmp.cpp bmp.h mygl.h datatypes.h texture.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o bmp.o bmp.cpp
 	
-camera.o: camera.cpp camera.h vector.h mygl.h screen.h
+camera.o: camera.cpp camera.h vector.h mygl.h screen.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o camera.o camera.cpp
 
-ctrls.o: ctrls.cpp ctrls.h keys.h datatypes.h list.h
+ctrls.o: ctrls.cpp ctrls.h keys.h datatypes.h list.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o ctrls.o ctrls.cpp
 
-level.o: level.cpp level.h version.h
+level.o: level.cpp level.h version.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o level.o level.cpp
 	
-mygl.o: mygl.cpp mygl.h
+mygl.o: mygl.cpp mygl.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o mygl.o mygl.cpp
 
-myglFont.o: myglFont.cpp myglFont.h
+myglFont.o: myglFont.cpp myglFont.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o myglFont.o myglFont.cpp
 
-myglTexture.o: myglTexture.cpp myglTexture.h
+myglTexture.o: myglTexture.cpp myglTexture.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o myglTexture.o myglTexture.cpp
 
-player.o: player.cpp player.h
+player.o: player.cpp player.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o player.o player.cpp
 
-strmanip.o: strmanip.cpp strmanip.h
+strmanip.o: strmanip.cpp strmanip.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o strmanip.o strmanip.cpp
 
-tga.o: tga.cpp tga.h
+tga.o: tga.cpp tga.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o tga.o tga.cpp
 
-vector.o: vector.cpp vector.h
+vector.o: vector.cpp vector.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o vector.o vector.cpp
 
-window.o: window.cpp window.h
+window.o: window.cpp window.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o window.o window.cpp
 	
-keys.o: keys.cpp keys.h
+keys.o: keys.cpp keys.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o keys.o keys.cpp
 
-main.o: macosx.cpp main.h
+main.o: macosx.cpp main.h config.h
 	$(CPP) -c $(INCLUDE_DIRS) -o main.o macosx.cpp

src/Model.h

@@ -1,6 +1,10 @@
 #ifndef MODEL_H_
 #define MODEL_H_
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 namespace OpenArena
 {
 

src/NullVideoPlugin.h

@@ -1,4 +1,10 @@
-#pragma once
+#ifndef __NullVideoPlugin_h__
+#define __NullVideoPlugin_h__
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "VideoPlugin.h"
 
 namespace OpenArena
@@ -90,3 +96,5 @@ namespace OpenArena
 	};
 
 };
+
+#endif

src/Plugin.h

@@ -1,4 +1,9 @@
-#pragma once
+#ifndef __Plugin_h__
+#define __Plugin_h__
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 namespace OpenArena
 {
@@ -42,3 +47,5 @@ namespace OpenArena
 
 
 };
+
+#endif

src/PluginManager.h

@@ -1,4 +1,9 @@
-#pragma once
+#ifndef __PluginManager_h__
+#define __PluginManager_h___
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "list.h"
 #include "Plugin.h"
@@ -105,3 +110,5 @@ namespace OpenArena
 		VideoPlugin* GetDefaultVideoPlugin(void);
 	};
 };
+
+#endif

src/VideoPlugin.h

@@ -1,4 +1,10 @@
-#pragma once
+#ifndef __VideoPlugin_h__
+#define __VideoPlugin_h__
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "Plugin.h"
 #include "window.h"
 #include "datatypes.h"
@@ -77,3 +83,5 @@ namespace OpenArena
 			const char* title = NULL) = 0;
 	};
 };
+
+#endif

src/WindowsLogger.h

@@ -1,4 +1,10 @@
-#pragma once
+#ifndef __WindowsLogger_h__
+#define __WindowsLogger_h__
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "logger.h"
 #include "datatypes.h"
 
@@ -144,3 +150,5 @@ namespace OpenArena
 		virtual ~WindowsLogger();
 	};
 };
+
+#endif

src/bmp.h

@@ -1,6 +1,10 @@
 #ifndef __bmp_h__
 #define __bmp_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "texture.h"
 
 namespace OpenArena{

src/camera.h

@@ -6,6 +6,10 @@
 #ifndef __camera_h__
 #define __camera_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <cmath>
 #ifdef WIN32
 #include <windows.h>	//Currently used for mouse stuff this should be replaced by oa_input

src/ctrls.h

@@ -1,3 +1,10 @@
+#ifndef __ctrls_h__
+#define __ctrls_h__
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "keys.h"
 #include "datatypes.h"
 #include "list.h"
@@ -98,3 +105,5 @@ namespace OpenArena{
 		list<uint8> rollRight;	
 	};
 };
+
+#endif

src/datatypes.h

@@ -1,6 +1,10 @@
 #ifndef __datatypes_h__
 #define __datatypes_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef WIN32 //Make this MSVC something
 typedef unsigned __int8		uint8;
 typedef unsigned __int16	uint16;

src/geometry.h

@@ -1,3 +1,10 @@
+#ifndef __geometry_h__
+#define __geometry_h__
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "vector.h"
 #include "myglTexture.h"
 
@@ -34,3 +41,5 @@ namespace OpenArena
 	};
 	
 };
+
+#endif

src/image.h

@@ -1,4 +1,9 @@
-#pragma once
+#ifndef __image_h__
+#define __image_h__
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "datatypes.h"
 
@@ -154,3 +159,4 @@ namespace OpenArena
 	};
 };
 
+#endif

src/keys.h

@@ -1,6 +1,10 @@
 #ifndef __keys_h__
 #define __keys_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 namespace OpenArena
 {
 	/*!

src/level.h

@@ -1,6 +1,10 @@
 #ifndef __LEVEL_H__
 #define __LEVEL_H__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #include <windows.h> //prolly used for alot but should be removed
 #endif

src/list.h

@@ -1,6 +1,10 @@
 #ifndef __list_h__
 #define __list_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <cstdlib>
 
 #pragma warning(disable:4715)

src/main.h

@@ -1,6 +1,10 @@
 #ifndef __main_h__
 #define __main_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #include <windows.h>			// Header file for windows
 #endif

src/mydefs.h

@@ -1,7 +1,13 @@
 #ifndef __mydefs_h__
 #define __mydefs_h__
+
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef WIN32	//This whole file is windows specific right now
 #include <windows.h>
 static HWND g_hWnd = NULL;
 #endif
+
 #endif

src/mygl.h

@@ -1,6 +1,10 @@
 #ifndef __MYGL_H__
 #define __MYGL_H__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef WIN32
 #include <windows.h>	//Remove if possible
 #include <GL/gl.h>

src/myglFont.h

@@ -1,6 +1,10 @@
 #ifndef __glPrint_h__
 #define __glPrint_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "mygl.h"
 
 namespace OpenArena

src/myglTexture.h

@@ -1,6 +1,10 @@
 #ifndef __myglTexture_h__
 #define __myglTexture_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string>
 #include "datatypes.h"
 #include "mygl.h"

src/player.h

@@ -1,6 +1,10 @@
 #ifndef __PLAYER_H__
 #define __PLAYER_H__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "camera.h"
 #include "ctrls.h"
 

src/screen.h

@@ -2,6 +2,10 @@
 #define __screen_h__
 #include <string>
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 using namespace std;
 namespace OpenArena
 {

src/strmanip.h

@@ -1,6 +1,10 @@
 #ifndef __strmanip_h__
 #define __strmanip_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string>
 #include <cmath>
 #include "keys.h"

src/texture.h

@@ -1,6 +1,10 @@
 #ifndef __texture_h__
 #define __texture_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 namespace OpenArena
 {
 	/*!

src/tga.h

@@ -1,6 +1,10 @@
 #ifndef __TGA_H__
 #define __TGA_H__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #pragma comment(lib, "OpenGL32.lib")
 #ifdef WIN32
 #include <windows.h> //I think this was only needed because gl.h uses it

src/vector.h

@@ -1,6 +1,10 @@
 #ifndef __vector_h__
 #define __vector_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <cmath>
 namespace OpenArena{
 	/*!

src/worlddefs.h

@@ -1,6 +1,10 @@
 #ifndef __WorldDefs_h__
 #define __WorldDefs_h__
 
+#if defined HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "level.h"
 
 static OpenArena::Level level;