diff options
| author | Johannes Schickel | 2013-07-04 23:30:22 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-07-04 23:33:02 +0200 |
| commit | be61cb669a5d6de733c9a42b3714de3750e5f2e3 (patch) | |
| tree | 0d83ab94ac7895c1a5f7f75a623a5be135230d2d /backends/graphics | |
| parent | d089658fb84f67652e9569bc03c76bcc65e7b881 (diff) | |
| parent | be399188c4ec25463c4a777a5e96fd69a4b0b1e3 (diff) | |
| download | scummvm-rg350-be61cb669a5d6de733c9a42b3714de3750e5f2e3.tar.gz scummvm-rg350-be61cb669a5d6de733c9a42b3714de3750e5f2e3.tar.bz2 scummvm-rg350-be61cb669a5d6de733c9a42b3714de3750e5f2e3.zip | |
Merge pull request #350 from chrisws/tizen_port_1_6_0a
TIZEN: bada port updated to tizen
Conflicts:
backends/platform/tizen/system.cpp
Diffstat (limited to 'backends/graphics')
| -rw-r--r-- | backends/graphics/opengl/gltexture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/graphics/opengl/gltexture.h b/backends/graphics/opengl/gltexture.h index 8ff9838ff7..6ef80923ae 100644 --- a/backends/graphics/opengl/gltexture.h +++ b/backends/graphics/opengl/gltexture.h @@ -44,9 +44,9 @@ #define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0]))) #endif -#if defined(BADA) +#if defined(TIZEN) #include <FGraphicsOpengl.h> -using namespace Osp::Graphics::Opengl; +using namespace Tizen::Graphics::Opengl; #elif defined(USE_GLES) #include <GLES/gl.h> #elif defined(SDL_BACKEND) |