Skip to content

Commit 97e3809

Browse files
authored
Update cocos2d port (#26420)
See emscripten-ports/Cocos2d#3
1 parent 1627eb0 commit 97e3809

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

test/test_browser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3191,7 +3191,7 @@ def test_sdl3_canvas_write(self):
31913191
def test_cocos2d_hello(self):
31923192
# cocos2d build contains a bunch of warnings about tiff symbols being missing at link time:
31933193
# e.g. warning: undefined symbol: TIFFClientOpen
3194-
cocos2d_root = os.path.join(ports.Ports.get_dir(), 'cocos2d', 'Cocos2d-version_3_3')
3194+
cocos2d_root = os.path.join(ports.Ports.get_dir(), 'cocos2d', 'Cocos2d-version_3_3r1')
31953195
preload_file = os.path.join(cocos2d_root, 'samples', 'Cpp', 'HelloCpp', 'Resources') + '@'
31963196
self.reftest('cocos2d_hello.cpp', reference_slack=1,
31973197
cflags=['-sUSE_COCOS2D=3', '-sERROR_ON_UNDEFINED_SYMBOLS=0',

tools/ports/cocos2d.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
from tools import diagnostics
1010

11-
TAG = 'version_3_3'
12-
HASH = 'd7b22660036c684f09754fcbbc7562984f02aa955eef2b76555270c63a717e6672c4fe695afb16280822e8b7c75d4b99ae21975a01a4ed51cad957f7783722cd'
11+
TAG = 'version_3_3r1'
12+
HASH = '28037e54bef4ff5363a2a185245afc4670d1664dbded1a13459fef3bcbcd18f61c3df1404415e89aa69cad383637b959a76c4efc7dce55ffaa42a5530b5c9034'
1313

1414
deps = ['libpng', 'zlib']
1515

@@ -37,9 +37,6 @@ def create(final):
3737
'-DCC_KEYBOARD_SUPPORT',
3838
'-DGL_ES=1',
3939
'-DNDEBUG', # '-DCOCOS2D_DEBUG=1' 1 - error/warn, 2 - verbose
40-
# Cocos2d source code hasn't switched to __EMSCRIPTEN__.
41-
# See https://github.com/emscripten-ports/Cocos2d/pull/3
42-
'-DEMSCRIPTEN',
4340
'-DCP_USE_DOUBLES=0',
4441
'-sUSE_ZLIB',
4542
'-sUSE_LIBPNG',

0 commit comments

Comments
 (0)