diff --git a/src/Makefile b/src/Makefile index 0ba5083..a752e9e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -52,16 +52,16 @@ $(CMLIB): #unit test Trie.ut: Trie.cpp Trie.h globals.h TransCode.cpp TransCode.h $(CMLIB) - $(CXX) -o $@ Trie.cpp TransCode.cpp -DTRIE_UT $(CMLIB) + $(CXX) -o $@ $(CXXFLAGS) Trie.cpp TransCode.cpp -DTRIE_UT $(CMLIB) Segment.ut: Segment.cpp Trie.cpp Segment.h Trie.h globals.h $(CMLIB) - $(CXX) -o $@ Segment.cpp Trie.cpp TransCode.cpp -DSEGMENT_UT $(CMLIB) + $(CXX) -o $@ $(CXXFLAGS) Segment.cpp Trie.cpp TransCode.cpp -DSEGMENT_UT $(CMLIB) KeyWordExt.ut: KeyWordExt.cpp KeyWordExt.h Segment.h Trie.h globals.h TransCode.cpp TransCode.h $(CMLIB) - $(CXX) -o $@ KeyWordExt.cpp Segment.cpp Trie.cpp TransCode.cpp -DKEYWORDEXT_UT $(CMLIB) + $(CXX) -o $@ $(CXXFLAGS) KeyWordExt.cpp Segment.cpp Trie.cpp TransCode.cpp -DKEYWORDEXT_UT $(CMLIB) TransCode.ut: TransCode.cpp TransCode.h globals.h $(CMLIB) - $(CXX) -o $@ TransCode.cpp -DCPPJIEBA_TRANSCODE_UT $(CMLIB) + $(CXX) -o $@ $(CXXFLAGS) TransCode.cpp -DCPPJIEBA_TRANSCODE_UT $(CMLIB) clean: rm -f *.o *.d *.ut $(LIBA) diff --git a/src/Segment.cpp b/src/Segment.cpp index 7c2e122..98693f9 100644 --- a/src/Segment.cpp +++ b/src/Segment.cpp @@ -214,13 +214,14 @@ int main() { Segment segment; segment.init(); - if(!segment.loadSegDict("../dicts/segdict.gbk.v2.1")) + if(!segment.loadSegDict("../dicts/segdict.gbk.v3.0")) { cerr<<"1"< res; string line; while(getline(ifile, line))