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

Compile dict2dawg by default since dict2dawg.pl has problems; fix warnings.

Browse source
This commit is contained in:
ehouse 2008-03-15 14:52:23 +00:00
parent 08326c6146
commit 15a2154720
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dawg/Makefile.langcommon
View file

@ -32,8 +32,10 @@ LANGUAGE = $(shell basename $$(pwd))
# prefer the compiled version if available. But don't compile it # prefer the compiled version if available. But don't compile it
# automatically until it's a bit better tested. # automatically until it's a bit better tested.
DICT2DAWG = $(if $(shell test -x ../dict2dawg && echo foo),\ # DICT2DAWG = $(if $(shell test -x ../dict2dawg && echo foo),\
../dict2dawg,../dict2dawg.pl) # ../dict2dawg,../dict2dawg.pl)
DICT2DAWG = ../dict2dawg
#all: target_all #all: target_all
@ -268,6 +270,10 @@ values.bin: ../xloc.pl
%.dict: %.dict.gz %.dict: %.dict.gz
zcat $< > $@ zcat $< > $@
# clean this up....
../dict2dawg: ../dict2dawg.cpp
cd ../ && g++ -DDEBUG -O -o dict2dawg dict2dawg.cpp
clean_common: clean_common:
rm -f $(XWLANG)Main.dict *.bin *.pdb *.seb dawg*.stamp *.$(FRANK_EXT) \ rm -f $(XWLANG)Main.dict *.bin *.pdb *.seb dawg*.stamp *.$(FRANK_EXT) \
$(XWLANG)*.pdb $(XWLANG)*.seb $(XWLANG)*.pdb $(XWLANG)*.seb

4
dawg/dict2dawg.cpp
View file

@ -399,7 +399,7 @@ readFromSortedArray( void )
} }
for ( ; ; ) { for ( ; ; ) {
char* word = ""; char* word = (char*)"";
if ( !gDone ) { if ( !gDone ) {
gDone = gNextWordIndex == sInputStrings->size(); gDone = gNextWordIndex == sInputStrings->size();
@ -570,7 +570,7 @@ readFromFile( void )
gDone = NULL == word; gDone = NULL == word;
} }
if ( gDone ) { if ( gDone ) {
word = ""; word = (char*)"";
len = 0; len = 0;
} }