diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-24 03:10:24 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-24 03:10:24 (GMT) |
| commit | 009baca90428399d4e3540bff18510ef51a28454 (patch) | |
| tree | c4e377bae63557c060718557186a7484b922edcc /src | |
| parent | e7ea8e12a933849bc6cb9efda5fbb2ac6ddbccab (diff) | |
move imageutils platform stuff to qmake build file mv system-gl. fix gcc warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/fbo.cc | 2 | ||||
| -rw-r--r-- | src/imageutils-lodepng.cc | 1 | ||||
| -rw-r--r-- | src/imageutils.cc | 6 | ||||
| -rw-r--r-- | src/system-gl.h | 12 |
4 files changed, 5 insertions, 16 deletions
@@ -59,7 +59,7 @@ bool check_fbo_status() else if (status == GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT) cerr << "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT\n"; else - cerr << "Unknown Code: glCheckFramebufferStatusEXT returned %i\n",status; + cerr << "Unknown Code: glCheckFramebufferStatusEXT returned:" <<status <<"\n"; return result; } diff --git a/src/imageutils-lodepng.cc b/src/imageutils-lodepng.cc index 8460d9e..c89ed7c 100644 --- a/src/imageutils-lodepng.cc +++ b/src/imageutils-lodepng.cc @@ -1,5 +1,6 @@ #include "lodepng.h" #include <stdio.h> +#include <stdlib.h> bool write_png(const char *filename, unsigned char *pixels, int width, int height) { diff --git a/src/imageutils.cc b/src/imageutils.cc index e15ba2b..7ee14e9 100644 --- a/src/imageutils.cc +++ b/src/imageutils.cc @@ -8,9 +8,3 @@ void flip_image(const unsigned char *src, unsigned char *dst, size_t pixelsize, memmove(dst + (height - i - 1) * rowBytes, src + i * rowBytes, rowBytes); } } - -#ifdef __APPLE__ -#include "imageutils-macosx.cc" -#else -#include "imageutils-lodepng.cc" -#endif diff --git a/src/system-gl.h b/src/system-gl.h index d7de3c6..4a8ccac 100644 --- a/src/system-gl.h +++ b/src/system-gl.h @@ -2,15 +2,9 @@ #define SYSTEMGL_H_ #include <GL/glew.h> +#include <string> -#ifdef __APPLE__ - #include <OpenGL/OpenGL.h> -#else - #include <GL/gl.h> - #include <GL/glu.h> - #ifdef _WIN32 - #include <windows.h> // For the CALLBACK macro - #endif -#endif +std::string glew_dump(bool dumpall=false); +bool report_glerror(const char *task); #endif |