From ca38f53e158da01f753faff36f7d7e9ad53ab585 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Sun, 15 May 2011 13:39:14 -0300 Subject: [PATCH] OpenGL in prerequesites --- src/framework/graphics/animatedtexture.cpp | 2 -- src/framework/graphics/framebuffer.cpp | 4 ---- src/framework/graphics/graphics.cpp | 4 ---- src/framework/graphics/texture.cpp | 2 -- src/framework/platform/win32platform.cpp | 5 +---- src/framework/prerequisites.h | 5 +++++ 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/framework/graphics/animatedtexture.cpp b/src/framework/graphics/animatedtexture.cpp index cb7fbc7e..e1c677a8 100644 --- a/src/framework/graphics/animatedtexture.cpp +++ b/src/framework/graphics/animatedtexture.cpp @@ -23,8 +23,6 @@ #include - -#include #include #include diff --git a/src/framework/graphics/framebuffer.cpp b/src/framework/graphics/framebuffer.cpp index 0eb8a602..f80c63a6 100644 --- a/src/framework/graphics/framebuffer.cpp +++ b/src/framework/graphics/framebuffer.cpp @@ -26,10 +26,6 @@ #include #include -#include -#include -#include - PFNGLGENFRAMEBUFFERSPROC oglGenFramebuffers = 0; PFNGLBINDFRAMEBUFFERPROC oglBindFramebuffer = 0; PFNGLFRAMEBUFFERTEXTURE2DPROC oglFramebufferTexture2D = 0; diff --git a/src/framework/graphics/graphics.cpp b/src/framework/graphics/graphics.cpp index b8d41997..17c05b3d 100644 --- a/src/framework/graphics/graphics.cpp +++ b/src/framework/graphics/graphics.cpp @@ -25,10 +25,6 @@ #include #include -#include -#include -#include - Graphics g_graphics; void Graphics::init() diff --git a/src/framework/graphics/texture.cpp b/src/framework/graphics/texture.cpp index daeffb46..937db370 100644 --- a/src/framework/graphics/texture.cpp +++ b/src/framework/graphics/texture.cpp @@ -25,8 +25,6 @@ #include #include -#include - Texture::Texture(int width, int height, int components, uchar *pixels) { m_size.setSize(width, height); diff --git a/src/framework/platform/win32platform.cpp b/src/framework/platform/win32platform.cpp index 2bfaf684..3d51783e 100644 --- a/src/framework/platform/win32platform.cpp +++ b/src/framework/platform/win32platform.cpp @@ -31,9 +31,6 @@ #include -#include -#include - LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); struct Win32PlatformPrivate { @@ -246,7 +243,7 @@ int Platform::getTicks() static ulong firstTick = 0; if(!firstTick) firstTick = GetTickCount(); - + return (uint32_t)(GetTickCount() - firstTick); } diff --git a/src/framework/prerequisites.h b/src/framework/prerequisites.h index a49bd449..7a1d8308 100644 --- a/src/framework/prerequisites.h +++ b/src/framework/prerequisites.h @@ -61,6 +61,11 @@ typedef int8_t int8; #include #include +// OpenGL +#include +#include +#include + // boost utilities #include #include