mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-18 22:26:30 +01:00
separate dbg and rel directories
This commit is contained in:
parent
664913b2eb
commit
dd78abb116
2 changed files with 4 additions and 2 deletions
|
@ -52,8 +52,10 @@ DEFINES += -DGITREV=\"$(shell git describe --tags --dirty)\"
|
||||||
|
|
||||||
ifeq ($(MEMDEBUG),TRUE)
|
ifeq ($(MEMDEBUG),TRUE)
|
||||||
DEFINES += -DMEM_DEBUG -DDEBUG -O0
|
DEFINES += -DMEM_DEBUG -DDEBUG -O0
|
||||||
|
WEBDIR = dbg
|
||||||
else
|
else
|
||||||
DEFINES += -O3
|
DEFINES += -O3
|
||||||
|
WEBDIR = rel
|
||||||
endif
|
endif
|
||||||
|
|
||||||
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
|
||||||
|
@ -83,7 +85,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 \
|
||||||
[ -f $$FILE ] && scp $$FILE ${XW_WASM_DEST}; \
|
[ -f $$FILE ] && scp $$FILE ${XW_WASM_DEST}/${WEBDIR}/; \
|
||||||
echo "$$FILE copied"; \
|
echo "$$FILE copied"; \
|
||||||
done; \
|
done; \
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -476,7 +476,7 @@ showName( GameState* gs )
|
||||||
{
|
{
|
||||||
const char* title = gs->gameName;
|
const char* title = gs->gameName;
|
||||||
char buf[64];
|
char buf[64];
|
||||||
if ( 1 < countDicts( gs->globals ) ) {
|
if ( true || 1 < countDicts( gs->globals ) ) {
|
||||||
sprintf( buf, "%s (%s)", gs->gameName, lcToLocale(gs->gi.dictLang) );
|
sprintf( buf, "%s (%s)", gs->gameName, lcToLocale(gs->gi.dictLang) );
|
||||||
title = buf;
|
title = buf;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue