Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix wasm build a bit

Browse source 
Still doesn't seem to work on new install
This commit is contained in:
Eric House 2021-06-26 17:00:40 -07:00
parent 29bc7ad029
commit 44152f6c36
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/wasm/Makefile
View file

@ -64,7 +64,7 @@ DEFINES += -DROOT_PATH=\"$(ROOT_PATH)\"
OUTPUTS = main.html main.js main.js.mem main.data main.html.mem main.wasm OUTPUTS = main.html main.js main.js.mem main.data main.html.mem main.wasm
all: main.js all: main.html
# PHONY: install # PHONY: install
@ -89,6 +89,7 @@ main.html: ${INPUTS} Makefile shell_minimal.html
install: main.html install: main.html
if [ -n "${XW_WASM_DEST}" ]; then \ if [ -n "${XW_WASM_DEST}" ]; then \
for FILE in ${OUTPUTS} paho-mqtt.js xwutils.js; do \ for FILE in ${OUTPUTS} paho-mqtt.js xwutils.js; do \
mkdir -p ${XW_WASM_DEST}/${WEBDIR}; \
[ -f $$FILE ] && scp $$FILE ${XW_WASM_DEST}/${WEBDIR}/; \ [ -f $$FILE ] && scp $$FILE ${XW_WASM_DEST}/${WEBDIR}/; \
echo "$$FILE copied"; \ echo "$$FILE copied"; \
done; \ done; \

12
xwords4/wasm/wasmdutil.c
View file

@ -425,6 +425,15 @@ wasm_dutil_onGameGoneReceived( XW_DUtilCtxt* duc, XWEnv XP_UNUSED(xwe),
main_onGameGone( globals, gameID ); main_onGameGone( globals, gameID );
} }
static void
wasm_dutil_ackMQTTMsg( XW_DUtilCtxt* duc, XWEnv xwe, XP_U32 gameID,
const MQTTDevID* senderID, const XP_U8* msg,
XP_U16 len )
{
XP_ASSERT(0); /* implement me */
}
static void static void
onSynced(void* closure, const char* str) onSynced(void* closure, const char* str)
{ {
@ -487,10 +496,11 @@ wasm_dutil_make( MPFORMAL VTableMgr* vtMgr, void* closure )
SET_PROC(onInviteReceived); SET_PROC(onInviteReceived);
SET_PROC(onMessageReceived); SET_PROC(onMessageReceived);
SET_PROC(onGameGoneReceived); SET_PROC(onGameGoneReceived);
SET_PROC(ackMQTTMsg);
# undef SET_PROC # undef SET_PROC
assertTableFull( &result->super.vtable, sizeof(result->super.vtable), "wasmutil" ); assertTableFull( &result->super.vtable, sizeof(result->super.vtable), "wasmdutil" );
LOG_RETURNF( "%p", &result->super ); LOG_RETURNF( "%p", &result->super );
return &result->super; return &result->super;

3
xwords4/wasm/wasmutil.c
View file

@ -637,6 +637,7 @@ wasm_util_make( MPFORMAL CurGameInfo* gi, XW_DUtilCtxt* dctxt, GameState* closur
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informMove, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informMove, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informUndo, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informUndo, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informNetDict, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_informNetDict, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_getDict, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_notifyGameOver, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_notifyGameOver, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_engineProgressCallback, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_engineProgressCallback, wasm );
#ifdef XWFEATURE_HILITECELL #ifdef XWFEATURE_HILITECELL
@ -655,8 +656,6 @@ wasm_util_make( MPFORMAL CurGameInfo* gi, XW_DUtilCtxt* dctxt, GameState* closur
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_bonusSquareHeld, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_bonusSquareHeld, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_playerScoreHeld, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_playerScoreHeld, wasm );
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_getDict, wasm );
#ifdef XWFEATURE_BOARDWORDS #ifdef XWFEATURE_BOARDWORDS
SET_VTABLE_ENTRY( wuctxt->super.vtable, util_cellSquareHeld, wasm ); SET_VTABLE_ENTRY( wuctxt->super.vtable, util_cellSquareHeld, wasm );
#endif #endif