From c2ce65a32b3b9b768eaadf4b016956d3ccd6b03c Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 1 Jul 2013 17:35:51 +0800 Subject: [PATCH] issue #2347: Compiled ok for android, marmalade and nacl, windows needs to be tested too. --- cocos2dx/Android.mk | 1 + cocos2dx/proj.marmalade/cocos2dx.mkf | 5 +++++ cocos2dx/proj.nacl/Makefile | 1 + 3 files changed, 7 insertions(+) diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index cc6ed94737..fae21b44c0 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -59,6 +59,7 @@ kazmath/src/GL/mat4stack.c \ kazmath/src/GL/matrix.c \ keypad_dispatcher/CCKeypadDelegate.cpp \ keypad_dispatcher/CCKeypadDispatcher.cpp \ +keyboard_dispatcher/CCKeyboardDispatcher.cpp \ label_nodes/CCLabelAtlas.cpp \ label_nodes/CCLabelBMFont.cpp \ label_nodes/CCLabelTTF.cpp \ diff --git a/cocos2dx/proj.marmalade/cocos2dx.mkf b/cocos2dx/proj.marmalade/cocos2dx.mkf index 8f5a075930..c5a696ef41 100644 --- a/cocos2dx/proj.marmalade/cocos2dx.mkf +++ b/cocos2dx/proj.marmalade/cocos2dx.mkf @@ -109,6 +109,11 @@ files "*.h" "*.cpp" + ("../keyboard_dispatcher") + [keyboard_dispatcher] + "*.h" + "*.cpp" + ("../label_nodes") [label_nodes] "*.h" diff --git a/cocos2dx/proj.nacl/Makefile b/cocos2dx/proj.nacl/Makefile index 1b625891b1..5150410a89 100644 --- a/cocos2dx/proj.nacl/Makefile +++ b/cocos2dx/proj.nacl/Makefile @@ -37,6 +37,7 @@ SOURCES = ../actions/CCAction.cpp \ ../effects/CCGrid.cpp \ ../keypad_dispatcher/CCKeypadDelegate.cpp \ ../keypad_dispatcher/CCKeypadDispatcher.cpp \ +../keyboard_dispatcher/CCKeyboardDispatcher.cpp \ ../label_nodes/CCLabelAtlas.cpp \ ../label_nodes/CCLabelBMFont.cpp \ ../label_nodes/CCLabelTTF.cpp \