using sdl2-config for include path

Makefile

@@ -28,7 +28,7 @@ UNAME=$(shell uname -s)
 # -DMULTITEXTURE			Add OpenGL multitexturing
 # -DUSING_EMITTER_IN_GAME	Run particle test in game
 
-BASE_DEFS=-Iinclude -DUSING_EMITTER
+BASE_DEFS=-Iinclude $(shell sdl2-config --cflags | sed "s/-I/-isystem /g") -DUSING_EMITTER
 
 BASE_LIBS=$(shell sdl2-config --libs) -lz -lstdc++ \
 	-lpthread -lSDL2_ttf
@@ -43,8 +43,6 @@ AUDIO_LIBS += -framework OpenAL
 AUDIO_LIBS += -L/usr/local/lib
 AUDIO_DEFS += -isystem /usr/local/include
 GL_LIBS += -framework OpenGL
-GL_LIBS += -L/opt/local/lib
-GL_DEFS += -isystem /opt/local/include
 else
 AUDIO_LIBS += -lopenal -lalut
 GL_LIBS += -lGL -lGLU

README.md

@@ -39,7 +39,7 @@ Basically, OpenRaider depends on the following:
 
 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 libsdl2 libsdl2_ttf
+    sudo port install zlib libsdl2 libsdl2_ttf cmake
 
 A similar command for the package manager of your favorite Linux Distribution should do the trick.
 

include/BoundingVolume.h

@@ -8,7 +8,7 @@
 #ifndef _BOUNDINGVOLUME_H_
 #define _BOUNDINGVOLUME_H_
 
-#include <MatMath.h>
+#include "MatMath.h"
 
 /*!
  * \brief Defines a 3D sphere.

include/Camera.h

@@ -7,9 +7,9 @@
 #ifndef _CAMERA_H_
 #define _CAMERA_H_
 
-#include <MatMath.h>
-#include <Matrix.h>
-#include <Quaternion.h>
+#include "MatMath.h"
+#include "Matrix.h"
+#include "Quaternion.h"
 
 /*!
  * \brief Commands for interactive camera control

include/Emitter.h

@@ -8,7 +8,7 @@
 #ifndef _EMITTER_H_
 #define _EMITTER_H_
 
-#include <Particle.h>
+#include "Particle.h"
 
 /*!
  * \brief Particle emitter class.

include/Light.h

@@ -7,7 +7,7 @@
 #ifndef _LIGHT_H_
 #define _LIGHT_H_
 
-#include <MatMath.h>
+#include "MatMath.h"
 
 /*!
  * \brief The GL light class

include/Matrix.h

@@ -8,9 +8,9 @@
 #ifndef _MATRIX_H_
 #define _MATRIX_H_
 
-#include <MatMath.h>
-#include <Quaternion.h>
-#include <Vector3d.h>
+#include "MatMath.h"
+#include "Quaternion.h"
+#include "Vector3d.h"
 
 
 /*!

include/Mesh.h

@@ -10,7 +10,7 @@
 #ifndef _OPENGLMESH_H_
 #define _OPENGLMESH_H_
 
-#include <MatMath.h>
+#include "MatMath.h"
 
 /*!
  * \brief OpenGL Mesh

include/OpenRaider.h

@@ -8,16 +8,17 @@
 #ifndef _OPENRAIDER_H_
 #define _OPENRAIDER_H_
 
-#include <List.h>
 #include <map>
-#include <Vector.h>
-#include <TombRaider.h>
-#include <Camera.h>
-#include <Render.h>
-#include <Sound.h>
-#include <SDLSystem.h>
-#include <Network.h>
-#include <World.h>
+
+#include "List.h"
+#include "Vector.h"
+#include "TombRaider.h"
+#include "Camera.h"
+#include "Render.h"
+#include "Sound.h"
+#include "SDLSystem.h"
+#include "Network.h"
+#include "World.h"
 
 /*!
  * \brief OpenRaider key events.

include/Particle.h

@@ -8,7 +8,7 @@
 #ifndef _PARTICLE_H_
 #define _PARTICLE_H_
 
-#include <MatMath.h>
+#include "MatMath.h"
 
 /*!
  * \brief Partcle systems atomic base

include/Quaternion.h

@@ -8,7 +8,7 @@
 #ifndef _QUATERNION_H_
 #define _QUATERNION_H_
 
-#include <MatMath.h>
+#include "MatMath.h"
 
 /*!
  * \brief Quaternion

include/Render.h

@@ -8,20 +8,20 @@
 #ifndef _RENDER_H_
 #define _RENDER_H_
 
-#include <List.h>
-#include <Vector.h>
-#include <Matrix.h>
-#include <ViewVolume.h>
-#include <Light.h>
-#include <World.h>
-#include <SkeletalModel.h>
-#include <Mesh.h>
-#include <Texture.h>
-#include <Camera.h>
-#include <GLString.h>
+#include "List.h"
+#include "Vector.h"
+#include "Matrix.h"
+#include "ViewVolume.h"
+#include "Light.h"
+#include "World.h"
+#include "SkeletalModel.h"
+#include "Mesh.h"
+#include "Texture.h"
+#include "Camera.h"
+#include "GLString.h"
 
 #ifdef USING_EMITTER
-#include <Emitter.h>
+#include "Emitter.h"
 #endif
 
 /*!

include/SDLSystem.h

@@ -8,8 +8,9 @@
 #ifndef _SDLSYSTEM_H_
 #define _SDLSYSTEM_H_
 
-#include <SDL2/SDL.h>
-#include <System.h>
+#include "SDL.h"
+
+#include "System.h"
 
 /*!
  * \brief SDL System interface implementation

include/SkeletalModel.h

@@ -12,8 +12,8 @@
 #ifndef _SKELETALMODEL_H_
 #define _SKELETALMODEL_H_
 
-#include <Vector.h>
-#include <MatMath.h>
+#include "Vector.h"
+#include "MatMath.h"
 
 typedef struct {
     int mesh;

include/System.h

@@ -12,7 +12,8 @@
 #define _SYSTEM_H_
 
 #include <map>
-#include <Vector.h>
+
+#include "Vector.h"
 
 //! \todo Replace with unicode compatible key codes
 #define SYS_MOUSE_LEFT    6000

include/Vector3d.h

@@ -8,7 +8,7 @@
 #ifndef _VECTOR3D_H_
 #define _VECTOR3D_H_
 
-#include <MatMath.h>
+#include "MatMath.h"
 
 /*!
  * \brief 3D Math Vector

include/ViewVolume.h

@@ -8,8 +8,8 @@
 #ifndef _VIEWVOLUME_H_
 #define _VIEWVOLUME_H_
 
-#include <Matrix.h>
-#include <BoundingVolume.h>
+#include "Matrix.h"
+#include "BoundingVolume.h"
 
 /*!
  * \brief Viewing Volume for culling use

include/World.h

@@ -11,12 +11,12 @@
 #define BAD_BLOOD  //!< \todo For temp rendering use
 
 #ifdef BAD_BLOOD
-#include <SkeletalModel.h>
+#include "SkeletalModel.h"
 #endif
 
-#include <List.h>
-#include <Vector.h>
-#include <MatMath.h>
+#include "List.h"
+#include "Vector.h"
+#include "MatMath.h"
 
 // Mirrors TombRaider class' room flags really
 typedef enum {

src/Camera.cpp

@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <MatMath.h>
-#include <Camera.h>
+#include "MatMath.h"
+#include "Camera.h"
 
 unsigned int Camera::mCounter = 0;
 

src/Emitter.cpp

@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
@@ -16,7 +17,7 @@
 #include <GL/glu.h>
 #endif
 
-#include <Emitter.h>
+#include "Emitter.h"
 
 vec_t Emitter::mFrustum[6][4];
 

src/GLString.cpp

@@ -10,14 +10,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #else
 #include <GL/gl.h>
 #endif
 
-#include <Texture.h>
-#include <GLString.h>
+#include "Texture.h"
+#include "GLString.h"
 
 GLString::GLString() {
     _num_string_max = 0;

src/MatMath.cpp

@@ -10,9 +10,9 @@
 #include <math.h>
 #include <float.h>
 
-#include <MatMath.h>
-#include <Vector3d.h>
-#include <Matrix.h>
+#include "MatMath.h"
+#include "Vector3d.h"
+#include "Matrix.h"
 
 bool equalEpsilon(vec_t a, vec_t b) {
     vec_t epsilon = FLT_EPSILON;

src/Matrix.cpp

@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <Matrix.h>
+#include "Matrix.h"
 
 Matrix::Matrix() {
     setIdentity();

src/Mesh.cpp

@@ -11,7 +11,7 @@
 #include <GL/gl.h>
 #endif
 
-#include <Mesh.h>
+#include "Mesh.h"
 
 
 ////////////////////////////////////////////////////////////

src/Network.cpp

@@ -5,8 +5,6 @@
  * \author Mongoose
  */
 
-#include <Network.h>
-
 #include <unistd.h>
 #include <signal.h>
 #include <string.h>
@@ -22,7 +20,8 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 
-#include <MatMath.h> // Random Number
+#include "MatMath.h" // Random Number
+#include "Network.h"
 
 //#define LOCAL_BCAST
 #define MAX_CLIENTS 32

src/OpenRaider.cpp

@@ -14,10 +14,10 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#include <World.h>
-#include <SkeletalModel.h>
-#include <TombRaider1.h> // tmp stop-gap
-#include <OpenRaider.h>
+#include "World.h"
+#include "SkeletalModel.h"
+#include "TombRaider1.h" // tmp stop-gap
+#include "OpenRaider.h"
 
 enum OpenRaiderText { textConsole = 2, textMenu = 3, textOutput = 4 };
 

src/Particle.cpp

@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <Particle.h>
+#include "Particle.h"
 
 Particle::Particle()
 {

src/Quaternion.cpp

@@ -7,7 +7,7 @@
 
 #include <math.h>
 
-#include <Quaternion.h>
+#include "Quaternion.h"
 
 Quaternion::Quaternion() {
     mW = 0;

src/Render.cpp

@@ -12,15 +12,16 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #endif
+
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
 #ifdef USING_EMITTER
-#include <Emitter.h>
+#include "Emitter.h"
 #endif
 
-#include <Render.h>
+#include "Render.h"
 
 extern entity_t *LARA;
 extern World gWorld;

src/SDLSystem.cpp

@@ -10,10 +10,10 @@
 #include <string.h>
 #include <cmath>
 
-#include <SDL2/SDL_opengl.h>
+#include "SDL_opengl.h"
 
-#include <MatMath.h>
-#include <SDLSystem.h>
+#include "MatMath.h"
+#include "SDLSystem.h"
 
 unsigned int *gWidth = 0x0;
 unsigned int *gHeight = 0x0;

src/SkeletalModel.cpp

@@ -5,7 +5,7 @@
  * \author Mongoose
  */
 
-#include <SkeletalModel.h>
+#include "SkeletalModel.h"
 
 ////////////////////////////////////////////////////////////
 // Constructors

src/Sound.cpp

@@ -9,13 +9,13 @@
 #ifdef __APPLE__
 #include <OpenAL/al.h>
 #include <OpenAL/alc.h>
-#include <AL/alut.h>
 #else
 #include <AL/al.h>
 #include <AL/alc.h>
-#include <AL/alut.h>
 #endif
 
+#include <AL/alut.h>
+
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <Sound.h>
+#include "Sound.h"
 
 Sound::Sound()
 {

src/System.cpp

@@ -28,8 +28,8 @@
 #include <sys/time.h>
 #endif
 
-#include <MatMath.h>
-#include <System.h>
+#include "MatMath.h"
+#include "System.h"
 
 ////////////////////////////////////////////////////////////
 // Constructors

src/Texture.cpp

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include <SDL2/SDL_ttf.h>
+#include "SDL_ttf.h"
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
@@ -20,8 +20,8 @@
 #include <GL/glu.h>
 #endif
 
-#include <TGA.h>
-#include <Texture.h>
+#include "TGA.h"
+#include "Texture.h"
 
 //Texture *gTextureManager = 0x0;
 gl_font_t *gFontTest = 0x0;

src/TombRaider.cpp

@@ -50,12 +50,12 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <TombRaider.h>
-
 #include <zlib.h>
 
+#include "TombRaider.h"
+
 #ifdef __TEST_TR5_DUMP_TGA
-#include <TGA.h>
+#include "TGA.h"
 #endif
 
 TombRaider::TombRaider()

src/Vector3d.cpp

@@ -7,7 +7,7 @@
 
 #include <math.h>
 
-#include <Vector3d.h>
+#include "Vector3d.h"
 
 Vector3d::Vector3d() {
     mVec[0] = mVec[1] = mVec[2] = 0.0f;

src/ViewVolume.cpp

@@ -9,7 +9,7 @@
 
 #include <math.h>
 
-#include <ViewVolume.h>
+#include "ViewVolume.h"
 
 ViewVolume::ViewVolume() {
     mFrustum[0][0] = mFrustum[0][1] = mFrustum[0][2] = mFrustum[0][3] = 0.0f;

src/World.cpp

@@ -7,7 +7,7 @@
 
 #include <math.h>
 
-#include <World.h>
+#include "World.h"
 
 
 ////////////////////////////////////////////////////////////

src/tga.cpp

@@ -11,7 +11,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <TGA.h>
+#include "TGA.h"
 
 int tga_check(FILE *f) {
     char buffer[10];