From 156f69c528b5f4eb1bc67b60750e13bc6428dd04 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Tue, 17 Dec 2013 19:06:22 -0800 Subject: [PATCH] Renderer is subclass of Object again... needed for Android. ouch --- cocos/2d/platform/android/java/project.properties | 2 +- cocos/2d/renderer/CCRenderer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/2d/platform/android/java/project.properties b/cocos/2d/platform/android/java/project.properties index 88ca83f9d0..4a46b9d1c9 100644 --- a/cocos/2d/platform/android/java/project.properties +++ b/cocos/2d/platform/android/java/project.properties @@ -12,4 +12,4 @@ android.library=true # Project target. -target=android-10 +target=android-17 diff --git a/cocos/2d/renderer/CCRenderer.h b/cocos/2d/renderer/CCRenderer.h index 8091063e6e..87fc85fdea 100644 --- a/cocos/2d/renderer/CCRenderer.h +++ b/cocos/2d/renderer/CCRenderer.h @@ -43,7 +43,7 @@ struct RenderStackElement size_t currentIndex; }; -class Renderer +class Renderer : public Object { public: static const int vbo_size = 65536 / 6;