From 59739a7a0e3e4826ba7b27d5270a8d7a26b787ef Mon Sep 17 00:00:00 2001 From: Chris Warren-Smith Date: Sun, 7 Aug 2011 21:33:32 +1000 Subject: BADA: Initial BADA port implementation --- backends/graphics/opengl/gltexture.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'backends/graphics/opengl/gltexture.h') diff --git a/backends/graphics/opengl/gltexture.h b/backends/graphics/opengl/gltexture.h index 2f0bef2bbf..f1c77073a4 100644 --- a/backends/graphics/opengl/gltexture.h +++ b/backends/graphics/opengl/gltexture.h @@ -25,7 +25,7 @@ #include "common/scummsys.h" -#ifdef WIN32 +#if defined(WIN32) && !defined(BADA) #if defined(ARRAYSIZE) && !defined(_WINDOWS_) #undef ARRAYSIZE #endif @@ -44,7 +44,10 @@ #define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0]))) #endif -#if defined(USE_GLES) +#if defined(BADA) +#include +using namespace Osp::Graphics::Opengl; +#elif defined(USE_GLES) #include #elif defined(SDL_BACKEND) #include -- cgit v1.2.3 From c39b7491e6a23450ae0dc41ca6f3c3b06ed91c2e Mon Sep 17 00:00:00 2001 From: Chris Warren-Smith Date: Sun, 21 Aug 2011 17:11:26 +1000 Subject: BADA: Remove incorrect BADA defined check --- backends/graphics/opengl/gltexture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/graphics/opengl/gltexture.h') diff --git a/backends/graphics/opengl/gltexture.h b/backends/graphics/opengl/gltexture.h index f1c77073a4..71f1eeb78f 100644 --- a/backends/graphics/opengl/gltexture.h +++ b/backends/graphics/opengl/gltexture.h @@ -25,7 +25,7 @@ #include "common/scummsys.h" -#if defined(WIN32) && !defined(BADA) +#ifdef WIN32 #if defined(ARRAYSIZE) && !defined(_WINDOWS_) #undef ARRAYSIZE #endif -- cgit v1.2.3