Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup so building .html works again

Browse source
This commit is contained in:
Eric House 2021-02-03 11:47:03 -08:00
parent d620461574
commit 66a422e2a2
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/wasm/Makefile
View file

@ -23,21 +23,30 @@ DEFINES += -DXWFEATURE_KNOWNPLAYERS
DEFINES += -DXWFEATURE_DICTSANITY DEFINES += -DXWFEATURE_DICTSANITY
DEFINES += -DPOINTER_SUPPORT DEFINES += -DPOINTER_SUPPORT
DEFINES += -DPLATFORM_WASM DEFINES += -DPLATFORM_WASM
DEFINES += -O2
OUTPUTS = main.html main.js main.js.mem main.data OUTPUTS = main.html main.js main.js.mem main.data main.html.mem
all: main.js all: main.js
# PHONY: upload # PHONY: upload
main.js: ${INPUTS} Makefile main.js: ${INPUTS} Makefile
emcc $(DEFINES) -I . -I ../common -I ../relay -s USE_SDL=2 \ emcc $(DEFINES) -O2 -DNAKED_MODE=1 -I . -I ../common -I ../relay -s USE_SDL=2 \
--preload-file assets_dir --memory-init-file 1 \ --preload-file assets_dir --memory-init-file 1 \
-s USE_SDL_TTF=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' \ -s USE_SDL_TTF=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' \
-s EXPORTED_FUNCTIONS='["_mainf", "_button"]' -s WASM=0 \ -s EXPORTED_FUNCTIONS='["_mainf", "_button"]' -s WASM=0 \
-s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall']" \ -s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall']" \
${INPUTS} -o $@ ${INPUTS} -o $@
main.html: ${INPUTS} Makefile
emcc $(DEFINES) -I . -I ../common -I ../relay -s USE_SDL=2 \
--preload-file assets_dir \
-s USE_SDL_TTF=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' \
-s WASM=0 \
${INPUTS} -o $@
upload: main.js upload: main.js
scp ${OUTPUTS} pi4:/tmp scp ${OUTPUTS} pi4:/tmp
clean:
rm ${OUTPUTS}

5
xwords4/wasm/main.c
View file

@ -25,9 +25,6 @@
#include <emscripten.h> #include <emscripten.h>
#endif #endif
/* Might want to pass this from the Makefile */
#define NAKED_MODE 1
#define WASM_BOARD_LEFT 0 #define WASM_BOARD_LEFT 0
#define WASM_HOR_SCORE_TOP 0 #define WASM_HOR_SCORE_TOP 0
@ -50,7 +47,7 @@ initGlobals( Globals* globals )
{ {
globals->cp.showBoardArrow = XP_TRUE; globals->cp.showBoardArrow = XP_TRUE;
globals->cp.allowPeek = XP_TRUE; globals->cp.allowPeek = XP_TRUE;
globals->cp.showRobotScores = XP_TRUE; // globals->cp.showRobotScores = XP_TRUE;
globals->cp.sortNewTiles = XP_TRUE; globals->cp.sortNewTiles = XP_TRUE;
globals->gi.serverRole = SERVER_STANDALONE; globals->gi.serverRole = SERVER_STANDALONE;