diff options
| author | Ira Rice <irarice@gmail.com> | 2008-11-21 02:54:04 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-11-21 02:54:04 +0000 |
| commit | 22aa43fac05d9a7f61f776bd03230b36ed853ad5 (patch) | |
| tree | c1e8c7a81ac42b49889fdadab54e9f5e27fbab83 | |
| parent | 40f2ec0582932bb21952cb58c5e51ca508206cae (diff) | |
| download | mana-22aa43fac05d9a7f61f776bd03230b36ed853ad5.tar.gz mana-22aa43fac05d9a7f61f776bd03230b36ed853ad5.tar.bz2 mana-22aa43fac05d9a7f61f776bd03230b36ed853ad5.tar.xz mana-22aa43fac05d9a7f61f776bd03230b36ed853ad5.zip | |
Fixed the linker error that we've been having. Apparently, it was caused
by me accidently removing the include for main.h in openglgraphics.
| -rw-r--r-- | src/main.cpp | 30 | ||||
| -rw-r--r-- | src/openglgraphics.cpp | 23 |
2 files changed, 28 insertions, 25 deletions
diff --git a/src/main.cpp b/src/main.cpp index 42a504fe..bebf4591 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,20 +34,6 @@ #include <libxml/parser.h> -#ifdef __APPLE__ -#include <CoreFoundation/CFBundle.h> -#endif -#ifdef __MINGW32__ -#include <windows.h> -#define usleep(usec) (Sleep ((usec) / 1000), 0) -#endif -#ifdef WIN32 -#include <SDL_syswm.h> -#else -#include <cerrno> -#include <sys/stat.h> -#endif - #include "configuration.h" #include "game.h" #include "graphics.h" @@ -92,6 +78,22 @@ #include "utils/dtor.h" #include "utils/tostring.h" +#ifdef __APPLE__ +#include <CoreFoundation/CFBundle.h> +#endif + +#ifdef __MINGW32__ +#include <windows.h> +#define usleep(usec) (Sleep ((usec) / 1000), 0) +#endif + +#ifdef WIN32 +#include <SDL_syswm.h> +#else +#include <cerrno> +#include <sys/stat.h> +#endif + // Account infos char n_server, n_character; diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 8f47bc1f..eeedcdf1 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -19,28 +19,29 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef USE_OPENGL - -#ifndef GL_TEXTURE_RECTANGLE_ARB -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif - #include <cstring> #include <SDL.h> -#ifdef __APPLE__ -#include <OpenGL/OpenGL.h> -#endif - #include <guichan/exception.hpp> #include <guichan/image.hpp> #include "log.h" +#include "main.h" #include "openglgraphics.h" #include "resources/image.h" +#ifdef __APPLE__ +#include <OpenGL/OpenGL.h> +#endif + +#ifdef USE_OPENGL + +#ifndef GL_TEXTURE_RECTANGLE_ARB +#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 +#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 +#endif + OpenGLGraphics::OpenGLGraphics(): mAlpha(false), mTexture(false), mColorAlpha(false) { |