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 647f1d87fec72a558c1f6dd2842e85f2b9caeb9b..7c9fa606658b7722e3bc24365522ecaf217f1ecb 100644 (file)
--- a/fdmdv2/build/codelite/fdmdv2.mk
+++ b/fdmdv2/build/codelite/fdmdv2.mk
@@ -2,18 +2,18 @@
 ## Auto Generated makefile by CodeLite IDE\r
 ## any manual changes will be erased      \r
 ##\r
-## Release\r
+## Debug\r
 ProjectName            :=fdmdv2\r
-ConfigurationName      :=Release\r
+ConfigurationName      :=Debug\r
 WorkspacePath          := "D:\Projects\Radio\fdmdv2\build\codelite"\r
 ProjectPath            := "D:\Projects\Radio\fdmdv2\build\codelite"\r
-IntermediateDirectory  :=./Release\r
+IntermediateDirectory  :=./Debug\r
 OutDir                 := $(IntermediateDirectory)\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=3/24/2013\r
+Date                   :=5/4/2013\r
 CodeLitePath           :="D:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -28,7 +28,7 @@ LibraryPathSwitch      :=-L
 PreprocessorSwitch     :=-D\r
 SourceSwitch           :=-c \r
 OutputFile             :=$(IntermediateDirectory)/freeDV\r
-Preprocessors          :=$(PreprocessorSwitch)__WX__ $(PreprocessorSwitch)DMW=1 $(PreprocessorSwitch)_NO_AUTOTOOLS_=1 \r
+Preprocessors          :=$(PreprocessorSwitch)__WX__ $(PreprocessorSwitch)_NO_AUTOTOOLS_=1 $(PreprocessorSwitch)DMW=1 \r
 ObjectSwitch           :=-o \r
 ArchiveOutputSwitch    := \r
 PreprocessOnlySwitch   :=-E \r
@@ -37,13 +37,13 @@ PCHCompileFlags        :=
 MakeDirCommand         :=makedir\r
 RcCmpOptions           := $(shell wx-config --rcflags)\r
 RcCompilerName         :=windres\r
-LinkOptions            :=  -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes)\r
-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 \r
+LinkOptions            :=  -mwindows $(shell wx-config --debug=yes --libs --unicode=yes)\r
+IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.7.1/msys/1.0/local/include $(IncludeSwitch)../../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include \r
 IncludePCH             := \r
 RcIncludePath          := \r
 Libs                   := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp $(LibrarySwitch)samplerate.dll $(LibrarySwitch)ctb-0.16 $(LibrarySwitch)sox \r
-ArLibs                 :=  "libsndfile-1.dll" "codec2" "libportaudio.a" "libportaudiocpp.a" "libsamplerate.dll.a" "libctb-0.16.a" "libsox.a" \r
-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 \r
+ArLibs                 :=  "libsndfile-1.dll" "codec2" "libportaudio.a" "libportaudiocpp.a" "libsamplerate.dll.a" "ctb-0.16.dll" "libsox" \r
+LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/Radio/codec2-dev/src/.libs $(LibraryPathSwitch)d:/bin/MinGW-4.7.1/msys/1.0/local/lib \r
 \r
 ##\r
 ## Common variables\r
@@ -52,8 +52,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"1225\"  $(Preprocessors)\r
-CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"1225\"  $(Preprocessors)\r
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1237\"  $(Preprocessors)\r
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1237\"  $(Preprocessors)\r
 \r
 \r
 ##\r
@@ -84,7 +84,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
        $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)\r
 \r
 $(IntermediateDirectory)/.d:\r
-       @$(MakeDirCommand) "./Release"\r
+       @$(MakeDirCommand) "./Debug"\r
 \r
 PreBuild:\r
 \r
@@ -265,6 +265,6 @@ clean:
        $(RM) $(IntermediateDirectory)/src_golay23$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
-       $(RM) ".build-release/fdmdv2"\r
+       $(RM) ".build-debug/fdmdv2"\r
 \r
 \r

diff --git a/fdmdv2/build/codelite/fdmdv2.project b/fdmdv2/build/codelite/fdmdv2.project
index 9fd3618e293f6c11bd3dfb11f553d7fbe98f504f..fc840523e36e3ce7096dd5a458cb89d654aa46fe 100644 (file)
--- a/fdmdv2/build/codelite/fdmdv2.project
+++ b/fdmdv2/build/codelite/fdmdv2.project
@@ -137,7 +137,7 @@
         <Library Value="libportaudiocpp.a"/>
         <Library Value="libsamplerate.dll.a"/>
         <Library Value="libctb-0.16.a"/>
-        <Library Value="libsox.a"/>
+        <Library Value="libsox.dll.a"/>
       </Linker>
       <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
       <General OutputFile="$(IntermediateDirectory)/freeDV" IntermediateDirectory="./Release" Command="./freeDV.exe" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no"/>

diff --git a/fdmdv2/build/codelite/fdmdv2.txt b/fdmdv2/build/codelite/fdmdv2.txt
index b15aeae67a26807e443b2255a358e2341a2797a4..7b081257baca20f6114d6c60fdfdb38792350c7b 100644 (file)
--- 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   \r
+./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   \r

diff --git a/fdmdv2/build/codelite/fdmdv2.workspace b/fdmdv2/build/codelite/fdmdv2.workspace
index a01f3dd594e2a4ca3dbf2f093c230cfcef3b2893..9a56dfc9040d75edd12454024325a2dafd40c7c7 100644 (file)
--- a/fdmdv2/build/codelite/fdmdv2.workspace
+++ b/fdmdv2/build/codelite/fdmdv2.workspace
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="fdmdv2" Database="./fdmdv2.tags">
-  <Project Name="fdmdv2" Path="fdmdv2.project" Active="No"/>
+  <Project Name="fdmdv2" Path="fdmdv2.project" Active="Yes"/>
   <Environment>
     <![CDATA[]]>
   </Environment>
-  <Project Name="hamlib_trial" Path="hamlib_trial/hamlib_trial.project" Active="Yes"/>
+  <Project Name="hamlib_trial" Path="hamlib_trial/hamlib_trial.project" Active="No"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="no">
+    <WorkspaceConfiguration Name="Debug" Selected="yes">
       <Project Name="fdmdv2" ConfigName="Debug"/>
       <Project Name="rawbits" ConfigName="Debug"/>
       <Project Name="pa_enum" ConfigName="Debug"/>
@@ -16,7 +16,7 @@
       <Project Name="enumSerial" ConfigName="Debug"/>
       <Project Name="hamlib_trial" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="yes">
+    <WorkspaceConfiguration Name="Release" Selected="no">
       <Project Name="fdmdv2" ConfigName="Release"/>
       <Project Name="rawbits" ConfigName="Release"/>
       <Project Name="pa_enum" ConfigName="Release"/>

diff --git a/fdmdv2/build/codelite/fdmdv2_wsp.mk b/fdmdv2/build/codelite/fdmdv2_wsp.mk
index cb83a8bcabb3030f3a073007ede142a44ceec9d5..422624567846289a7b822b0823100d11b66ca8cc 100644 (file)
--- 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