Skip to content

Commit ccf3584

Browse files
author
James Chen
committed
Merge pull request cocos2d#3224 from azmeuk/emscripten
emscripten keyboard support
2 parents c4e15da + eaa60df commit ccf3584

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@ Developers:
417417
Creation of CCDeprecated-ext.h
418418
Use of a single emscripten HTML template file.
419419
Added some guards in fileutils. Fixed a bug in emscripten file utils.
420+
Added emscripten keyboard support
420421

421422
elmiro
422423
Correction of passed buffer size to readlink and verification of result return by readlink.

cocos2dx/proj.emscripten/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ SOURCES = ../actions/CCAction.cpp \
4646
../effects/CCGrid.cpp \
4747
../keypad_dispatcher/CCKeypadDelegate.cpp \
4848
../keypad_dispatcher/CCKeypadDispatcher.cpp \
49+
../keyboard_dispatcher/CCKeyboardDispatcher.cpp \
4950
../label_nodes/CCLabelAtlas.cpp \
5051
../label_nodes/CCLabelBMFont.cpp \
5152
../label_nodes/CCLabelTTF.cpp \

cocos2dx/proj.emscripten/cocos2dx.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
all:
22

3-
DEFINES += -DEMSCRIPTEN
3+
DEFINES += -DEMSCRIPTEN -DCC_KEYBOARD_SUPPORT
44

55
THIS_MAKEFILE := $(CURDIR)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
66
ifndef COCOS_ROOT

0 commit comments

Comments
 (0)