From 2a54c9ed208f026d6eb9d236ec1baca8004e4578 Mon Sep 17 00:00:00 2001 From: Eric House Date: Mon, 19 Aug 2019 07:49:23 +0300 Subject: [PATCH] fix Slovak makefile for new wordlist --- xwords4/common/board.c | 1 - xwords4/common/model.c | 5 +++-- xwords4/dawg/Slovak/Makefile | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xwords4/common/board.c b/xwords4/common/board.c index decf444f6..0b6931233 100644 --- a/xwords4/common/board.c +++ b/xwords4/common/board.c @@ -1262,7 +1262,6 @@ board_setBlankValue( BoardCtxt* board, XP_U16 player, XP_U16 col, XP_U16 row, return draw; } - #ifdef XWFEATURE_MINIWIN /* Find a rectangle either centered on the board or pinned to the point at * which the mouse went down. diff --git a/xwords4/common/model.c b/xwords4/common/model.c index 289a5f361..a4e834c02 100644 --- a/xwords4/common/model.c +++ b/xwords4/common/model.c @@ -1362,7 +1362,7 @@ model_packTilesUtil( ModelCtxt* model, PoolContext* pool, /* setup async query for blank value, but while at it return a reasonable default. */ Tile -model_askBlankTile( ModelCtxt* model, XP_U16 turn, XP_U16 col, XP_U16 row) +model_askBlankTile( ModelCtxt* model, XP_U16 turn, XP_U16 col, XP_U16 row ) { XP_U16 nUsed = MAX_UNIQUE_TILES; const XP_UCHAR* tfaces[MAX_UNIQUE_TILES]; @@ -1390,7 +1390,8 @@ model_moveTrayToBoard( ModelCtxt* model, XP_S16 turn, XP_U16 col, XP_U16 row, tile = blankFace; } else { XP_ASSERT( turn >= 0 ); - tile = TILE_BLANK_BIT | model_askBlankTile( model, (XP_U16)turn, col, row ); + tile = TILE_BLANK_BIT + | model_askBlankTile( model, (XP_U16)turn, col, row ); } tile |= TILE_BLANK_BIT; } diff --git a/xwords4/dawg/Slovak/Makefile b/xwords4/dawg/Slovak/Makefile index f807e13f5..f0092dc59 100644 --- a/xwords4/dawg/Slovak/Makefile +++ b/xwords4/dawg/Slovak/Makefile @@ -18,16 +18,17 @@ XWLANG = Slovak LANGCODE = sk_SK ENC = UTF-8 -DICTNOTE = "from http://scrabble.hrejsi.cz/pravidla/blex.htm" +DICTNOTE = "compiled by a user from Slovak Scrabble Association dictionaries (Slovenský Spolok Scrabble) at www.hramescrabble.sk" TARGET_TYPE ?= WINCE include ../Makefile.langcommon -SOURCEDICT ?= $(XWDICTPATH)/Slovak/slovnik_scrabble.dict.gz +SOURCEDICT ?= $(XWDICTPATH)/Slovak/Scrabble_SK.dict $(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile - zcat $< | tr -d '\r' | \ + cat $< | tr -d '\r' | \ + tr [aáäbcčdďeéfghiíjklĺľmnňoôóprŕsštťuúvxyýzž] [AÁÄBCČDĎEÉFGHIÍJKLĹĽMNŇOÔÓPRŔSŠTŤUÚVXYÝZŽ] | \ sed 's,.,\U\0,g' | \ grep '^[AÁÄBCČDĎEÉFGHIÍJKLĹĽMNŇOÔÓPRŔSŠTŤUÚVXYÝZŽ]*$$' | \ gzip -c > $@