From: wittend99 Date: Mon, 6 May 2013 17:14:34 +0000 (+0000) Subject: Just changes to my personal IDE workspace. Irrelevant to everyone but me -DMW X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=57aa2eda2ac2f873f8d2b7cb9db71c8a8885f105;p=freetel-svn-tracking.git Just changes to my personal IDE workspace. Irrelevant to everyone but me -DMW git-svn-id: https://svn.code.sf.net/p/freetel/code@1240 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/build/codelite/fdmdv2.mk b/fdmdv2/build/codelite/fdmdv2.mk index 647f1d87..7c9fa606 100644 --- a/fdmdv2/build/codelite/fdmdv2.mk +++ b/fdmdv2/build/codelite/fdmdv2.mk @@ -2,18 +2,18 @@ ## Auto Generated makefile by CodeLite IDE ## any manual changes will be erased ## -## Release +## Debug ProjectName :=fdmdv2 -ConfigurationName :=Release +ConfigurationName :=Debug WorkspacePath := "D:\Projects\Radio\fdmdv2\build\codelite" ProjectPath := "D:\Projects\Radio\fdmdv2\build\codelite" -IntermediateDirectory :=./Release +IntermediateDirectory :=./Debug OutDir := $(IntermediateDirectory) CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=3/24/2013 +Date :=5/4/2013 CodeLitePath :="D:\bin\CodeLite" LinkerName :=g++ SharedObjectLinkerName :=g++ -shared -fPIC @@ -28,7 +28,7 @@ LibraryPathSwitch :=-L PreprocessorSwitch :=-D SourceSwitch :=-c OutputFile :=$(IntermediateDirectory)/freeDV -Preprocessors :=$(PreprocessorSwitch)__WX__ $(PreprocessorSwitch)DMW=1 $(PreprocessorSwitch)_NO_AUTOTOOLS_=1 +Preprocessors :=$(PreprocessorSwitch)__WX__ $(PreprocessorSwitch)_NO_AUTOTOOLS_=1 $(PreprocessorSwitch)DMW=1 ObjectSwitch :=-o ArchiveOutputSwitch := PreprocessOnlySwitch :=-E @@ -37,13 +37,13 @@ PCHCompileFlags := MakeDirCommand :=makedir RcCmpOptions := $(shell wx-config --rcflags) RcCompilerName :=windres -LinkOptions := -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes) -IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.7.1/msys/1.0/local/include $(IncludeSwitch)../../../codec2-dev/src $(IncludeSwitch)../../../Audio/portaudio/include $(IncludeSwitch)../../../Audio/libsndfile/include $(IncludeSwitch)../../../Audio/libsamplerate-0.1.8/src +LinkOptions := -mwindows $(shell wx-config --debug=yes --libs --unicode=yes) +IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.7.1/msys/1.0/local/include $(IncludeSwitch)../../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include IncludePCH := RcIncludePath := Libs := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp $(LibrarySwitch)samplerate.dll $(LibrarySwitch)ctb-0.16 $(LibrarySwitch)sox -ArLibs := "libsndfile-1.dll" "codec2" "libportaudio.a" "libportaudiocpp.a" "libsamplerate.dll.a" "libctb-0.16.a" "libsox.a" -LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/Radio/codec2-dev/src/.libs $(LibraryPathSwitch)d:/bin/MinGW-4.7.1/msys/1.0/local/lib $(LibraryPathSwitch)d:/Projects/Audio/libsndfile/lib +ArLibs := "libsndfile-1.dll" "codec2" "libportaudio.a" "libportaudiocpp.a" "libsamplerate.dll.a" "ctb-0.16.dll" "libsox" +LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/Radio/codec2-dev/src/.libs $(LibraryPathSwitch)d:/bin/MinGW-4.7.1/msys/1.0/local/lib ## ## Common variables @@ -52,8 +52,8 @@ LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/ AR := ar rcus CXX := g++ CC := gcc -CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1225\" $(Preprocessors) -CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1225\" $(Preprocessors) +CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"1237\" $(Preprocessors) +CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"1237\" $(Preprocessors) ## @@ -84,7 +84,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects) $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) $(IntermediateDirectory)/.d: - @$(MakeDirCommand) "./Release" + @$(MakeDirCommand) "./Debug" PreBuild: @@ -265,6 +265,6 @@ clean: $(RM) $(IntermediateDirectory)/src_golay23$(PreprocessSuffix) $(RM) $(OutputFile) $(RM) $(OutputFile).exe - $(RM) ".build-release/fdmdv2" + $(RM) ".build-debug/fdmdv2" diff --git a/fdmdv2/build/codelite/fdmdv2.project b/fdmdv2/build/codelite/fdmdv2.project index 9fd3618e..fc840523 100644 --- a/fdmdv2/build/codelite/fdmdv2.project +++ b/fdmdv2/build/codelite/fdmdv2.project @@ -137,7 +137,7 @@ - + diff --git a/fdmdv2/build/codelite/fdmdv2.txt b/fdmdv2/build/codelite/fdmdv2.txt index b15aeae6..7b081257 100644 --- a/fdmdv2/build/codelite/fdmdv2.txt +++ b/fdmdv2/build/codelite/fdmdv2.txt @@ -1 +1 @@ -./Release/src_dlg_comports.o ./Release/src_fdmdv2_main.o ./Release/src_fdmdv2_plot.o ./Release/src_topFrame.o ./Release/src_fdmdv2_plot_scatter.o ./Release/src_fdmdv2_plot_spectrum.o ./Release/src_fdmdv2_pa_wrapper.o ./Release/src_fdmdv2_plot_scalar.o ./Release/src_fdmdv2_plot_waterfall_linux.o ./Release/src_dlg_audiooptions.o ./Release/src_dlg_filter.o ./Release/src_varicode.o ./Release/src_sox_biquad.o ./Release/src_dlg_about.o ./Release/src_golay23.o +./Debug/src_dlg_comports.o ./Debug/src_fdmdv2_main.o ./Debug/src_fdmdv2_plot.o ./Debug/src_topFrame.o ./Debug/src_fdmdv2_plot_scatter.o ./Debug/src_fdmdv2_plot_spectrum.o ./Debug/src_fdmdv2_pa_wrapper.o ./Debug/src_fdmdv2_plot_scalar.o ./Debug/src_fdmdv2_plot_waterfall_linux.o ./Debug/src_dlg_audiooptions.o ./Debug/src_dlg_filter.o ./Debug/src_varicode.o ./Debug/src_sox_biquad.o ./Debug/src_dlg_about.o ./Debug/src_golay23.o diff --git a/fdmdv2/build/codelite/fdmdv2.workspace b/fdmdv2/build/codelite/fdmdv2.workspace index a01f3dd5..9a56dfc9 100644 --- a/fdmdv2/build/codelite/fdmdv2.workspace +++ b/fdmdv2/build/codelite/fdmdv2.workspace @@ -1,12 +1,12 @@ - + - + - + @@ -16,7 +16,7 @@ - + diff --git a/fdmdv2/build/codelite/fdmdv2_wsp.mk b/fdmdv2/build/codelite/fdmdv2_wsp.mk index cb83a8bc..42262456 100644 --- a/fdmdv2/build/codelite/fdmdv2_wsp.mk +++ b/fdmdv2/build/codelite/fdmdv2_wsp.mk @@ -1,8 +1,8 @@ .PHONY: clean All All: - @echo "----------Building project:[ hamlib_trial - Release ]----------" - @cd "hamlib_trial" && $(MAKE) -f "hamlib_trial.mk" + @echo "----------Building project:[ fdmdv2 - Debug ]----------" + @$(MAKE) -f "fdmdv2.mk" clean: - @echo "----------Cleaning project:[ hamlib_trial - Release ]----------" - @cd "hamlib_trial" && $(MAKE) -f "hamlib_trial.mk" clean + @echo "----------Cleaning project:[ fdmdv2 - Debug ]----------" + @$(MAKE) -f "fdmdv2.mk" clean