summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2007-08-27 17:47:16 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2007-08-27 17:47:16 +0000
commitfa6183886117f01f619f167c4948af05848b9ddd (patch)
tree813cb27fa5377ad4024d941d8e1c4c344148e3cc
parent4abed272455c535ed87445f97cfe103c1ddb8d37 (diff)
downloadmana-fa6183886117f01f619f167c4948af05848b9ddd.tar.gz
mana-fa6183886117f01f619f167c4948af05848b9ddd.tar.bz2
mana-fa6183886117f01f619f167c4948af05848b9ddd.tar.xz
mana-fa6183886117f01f619f167c4948af05848b9ddd.zip
Fixed compilation with old OpenGL headers.
-rw-r--r--ChangeLog2
-rw-r--r--src/openglgraphics.cpp5
-rw-r--r--tmw.cbp30
3 files changed, 17 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index eca546f6..034aea18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2007-08-27 Eugenio Favalli <elvenprogrammer@gmail.com>
* data/maps/new_1-1.tmx.gz: Added test npcs.
+ * src/openglgraphics.cpp, tmw.cbp: Fixed compilation with old OpenGL
+ headers.
2007-08-27 Guillaume Melquiond <guillaume.melquiond@gmail.com>
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 509107d5..375c43a0 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -25,6 +25,11 @@
#ifdef USE_OPENGL
+#ifndef GL_TEXTURE_RECTANGLE_ARB
+#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif
+
#include "openglgraphics.h"
#include <cstring>
diff --git a/tmw.cbp b/tmw.cbp
index 12e92c78..d7f17192 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -1311,6 +1311,16 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
+ <Unit filename="src\resources\imageloader.cpp">
+ <Option compilerVar="CPP"/>
+ <Option target="default"/>
+ </Unit>
+ <Unit filename="src\resources\imageloader.h">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
+ <Option target="default"/>
+ </Unit>
<Unit filename="src\resources\imageset.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -1391,16 +1401,6 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
- <Unit filename="src\resources\openglsdlimageloader.cpp">
- <Option compilerVar="CPP"/>
- <Option target="default"/>
- </Unit>
- <Unit filename="src\resources\openglsdlimageloader.h">
- <Option compilerVar="CPP"/>
- <Option compile="0"/>
- <Option link="0"/>
- <Option target="default"/>
- </Unit>
<Unit filename="src\resources\resource.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -1421,16 +1421,6 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
- <Unit filename="src\resources\sdlimageloader.cpp">
- <Option compilerVar="CPP"/>
- <Option target="default"/>
- </Unit>
- <Unit filename="src\resources\sdlimageloader.h">
- <Option compilerVar=""/>
- <Option compile="0"/>
- <Option link="0"/>
- <Option target="default"/>
- </Unit>
<Unit filename="src\resources\soundeffect.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>