Merge pull request cocos2d#3224 from azmeuk/emscripten

emscripten keyboard support
WenhaiLin · Jul 30, 2013 · ccf3584 · ccf3584
2 parents c4e15da + eaa60df
commit ccf3584
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -417,6 +417,7 @@ Developers:
         Creation of CCDeprecated-ext.h
         Use of a single emscripten HTML template file.
         Added some guards in fileutils. Fixed a bug in emscripten file utils.
+        Added emscripten keyboard support
 
     elmiro
         Correction of passed buffer size to readlink and verification of result return by readlink.

diff --git a/cocos2dx/proj.emscripten/Makefile b/cocos2dx/proj.emscripten/Makefile
@@ -46,6 +46,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 \

diff --git a/cocos2dx/proj.emscripten/cocos2dx.mk b/cocos2dx/proj.emscripten/cocos2dx.mk
@@ -1,6 +1,6 @@
 all:
 
-DEFINES += -DEMSCRIPTEN
+DEFINES += -DEMSCRIPTEN -DCC_KEYBOARD_SUPPORT
 
 THIS_MAKEFILE := $(CURDIR)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
 ifndef COCOS_ROOT