diff --git a/.gitignore b/.gitignore index 5f8dbb2..de1cd40 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,7 @@ #CodeLite .clang -.codelite \ No newline at end of file +.codelite +.Debug +*.cpp.o +*.cpp.o.d \ No newline at end of file diff --git a/CrossGen.workspace b/CrossGen.workspace index b5e8e66..0a4b414 100644 --- a/CrossGen.workspace +++ b/CrossGen.workspace @@ -2,7 +2,7 @@ - + diff --git a/Makefile b/Makefile index 2ec856c..c1fa320 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ .PHONY: clean All All: - @echo "----------Building project:[ wxCrossGen - Debug ]----------" + @echo "----------Building project:[ wxCrossGen - Release ]----------" @cd "wxCrossGen" && $(MAKE) -f "wxCrossGen.mk" clean: - @echo "----------Cleaning project:[ wxCrossGen - Debug ]----------" + @echo "----------Cleaning project:[ wxCrossGen - Release ]----------" @cd "wxCrossGen" && $(MAKE) -f "wxCrossGen.mk" clean diff --git a/wxCrossGen/main.cpp b/wxCrossGen/main.cpp index d1fea7b..ab9b084 100644 --- a/wxCrossGen/main.cpp +++ b/wxCrossGen/main.cpp @@ -327,7 +327,7 @@ void MainFrame::OnbtnGenerateClick(wxCommandEvent &event) { event.Skip(); DictType dict; std::vector words_out; - readDict(wxT("fdict.txt"), dict); + readDict(wxT("big_cross_ru.txt"), dict); GridType grid; if (tPath->GetValue() == wxEmptyString){ wxMessageBox( wxT("Не указана путь к сетке"), wxT("Инфо"), wxICON_INFORMATION); diff --git a/wxCrossGen/wxCrossGen.mk b/wxCrossGen/wxCrossGen.mk index 4bf9de1..d8829b4 100644 --- a/wxCrossGen/wxCrossGen.mk +++ b/wxCrossGen/wxCrossGen.mk @@ -2,18 +2,18 @@ ## Auto Generated makefile by CodeLite IDE ## any manual changes will be erased ## -## Debug +## Release ProjectName :=wxCrossGen -ConfigurationName :=Debug +ConfigurationName :=Release WorkspacePath := "/data/Sync/SyncProjects/CrossGen" ProjectPath := "/data/Sync/SyncProjects/CrossGen/wxCrossGen" -IntermediateDirectory :=./Debug +IntermediateDirectory :=../Release OutDir := $(IntermediateDirectory) CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=Aleksey Lobanov -Date :=30/05/15 +Date :=31/05/15 CodeLitePath :="/home/alex/.codelite" LinkerName :=/usr/bin/g++-4.8 SharedObjectLinkerName :=/usr/bin/g++-4.8 -shared -fPIC @@ -28,14 +28,14 @@ LibraryPathSwitch :=-L PreprocessorSwitch :=-D SourceSwitch :=-c OutputFile :=$(IntermediateDirectory)/$(ProjectName) -Preprocessors := +Preprocessors :=$(PreprocessorSwitch)NDEBUG ObjectSwitch :=-o ArchiveOutputSwitch := PreprocessOnlySwitch :=-E ObjectsFileList :="wxCrossGen.txt" PCHCompileFlags := MakeDirCommand :=mkdir -p -LinkOptions := $(shell wx-config --debug=yes --libs --unicode=yes) +LinkOptions := -s $(shell wx-config --debug=no --libs --unicode=yes) IncludePath := $(IncludeSwitch). IncludePCH := RcIncludePath := @@ -50,8 +50,8 @@ LibPath := $(LibraryPathSwitch). AR := /usr/bin/ar rcu CXX := /usr/bin/g++-4.8 CC := /usr/bin/gcc-4.8 -CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors) -CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors) +CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) +CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) ASFLAGS := AS := /usr/bin/as @@ -79,7 +79,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects) $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) $(IntermediateDirectory)/.d: - @test -d ./Debug || $(MakeDirCommand) ./Debug + @test -d ../Release || $(MakeDirCommand) ../Release PreBuild: @@ -101,6 +101,6 @@ $(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp ## Clean ## clean: - $(RM) -r ./Debug/ + $(RM) -r ../Release/ diff --git a/wxCrossGen/wxCrossGen.project b/wxCrossGen/wxCrossGen.project index 54cb64f..db3d332 100644 --- a/wxCrossGen/wxCrossGen.project +++ b/wxCrossGen/wxCrossGen.project @@ -1,7 +1,34 @@ + + + + + + + + + @@ -54,7 +81,7 @@ - + @@ -87,8 +114,4 @@ - - - - diff --git a/wxCrossGen/wxCrossGen.txt b/wxCrossGen/wxCrossGen.txt index 6716386..b7e8d8a 100644 --- a/wxCrossGen/wxCrossGen.txt +++ b/wxCrossGen/wxCrossGen.txt @@ -1 +1 @@ -./Debug/main.cpp.o +../Release/main.cpp.o