From 00407203faaccfbb95631603b4c97e02d5f39d4d Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Wed, 27 Nov 2013 15:53:09 -0800 Subject: [PATCH] Tizen fixes --- project/include/Utils.h | 10 ++++++---- project/include/renderer/opengl/OGL.h | 7 ++++--- project/src/renderer/opengl/OGLExport.cpp | 5 +++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/project/include/Utils.h b/project/include/Utils.h index 70c45ea25..f3faa382a 100644 --- a/project/include/Utils.h +++ b/project/include/Utils.h @@ -23,15 +23,17 @@ #define ELOG(args...) __android_log_print(ANDROID_LOG_ERROR, "NME",args) #elif defined(TIZEN) -#include + +extern "C" __attribute__ ((visibility("default"))) void AppLogInternal(const char* pFunction, int lineNumber, const char* pFormat, ...); +extern "C" __attribute__ ((visibility("default"))) void AppLogDebugInternal(const char* pFunction, int lineNumber, const char* pFormat, ...); #ifdef VERBOSE -#define VLOG(args...) AppLog(args) +#define VLOG(...) AppLogInternal(__PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) #else -#define VLOG(args...) +#define VLOG(...) #endif -#define ELOG(args...) AppLogDebug(args) +#define ELOG(...) AppLogDebugInternal(__PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) #else diff --git a/project/include/renderer/opengl/OGL.h b/project/include/renderer/opengl/OGL.h index 42e629e1f..c54e42eda 100644 --- a/project/include/renderer/opengl/OGL.h +++ b/project/include/renderer/opengl/OGL.h @@ -22,14 +22,15 @@ #elif defined(TIZEN) //#include -//#include -#include +#include +//#include using namespace Tizen::Graphics::Opengl; //#include -#define ALLOW_OGL2 +//#define ALLOW_OGL2 //#define NME_FORCE_GLES2 +#define NME_FORCE_GLES1 #define NME_GLES #elif defined(IPHONE) diff --git a/project/src/renderer/opengl/OGLExport.cpp b/project/src/renderer/opengl/OGLExport.cpp index f37741769..fdeaad310 100644 --- a/project/src/renderer/opengl/OGLExport.cpp +++ b/project/src/renderer/opengl/OGLExport.cpp @@ -17,6 +17,9 @@ using namespace nme; + +#ifndef NME_FORCE_GLES1 + #define INT(a) val_int(arg[a]) // --- General ------------------------------------------- @@ -1708,6 +1711,8 @@ value nme_gl_get_tex_parameter(value inTarget,value inPname) DEFINE_PRIM(nme_gl_get_tex_parameter,2); +#endif + extern "C" int nme_oglexport_register_prims() { return 0; }