git-svn-id: https://svn.code.sf.net/p/freetel/code@452 01035d8c-6547-0410-b346-abe4f9...

diff --git a/fdmdv2/fdmdv2.mk b/fdmdv2/fdmdv2.mk
index 6ea96b603bd980092aaa1975a2de18834b66b4c4..85b3e0ebe95b962c669cd6c2586a5fcbdd28c397 100644 (file)
--- a/fdmdv2/fdmdv2.mk
+++ b/fdmdv2/fdmdv2.mk
@@ -2,13 +2,13 @@
 ## Auto Generated makefile by CodeLite IDE\r
 ## any manual changes will be erased      \r
 ##\r
-## Debug\r
+## Release\r
 ProjectName            :=fdmdv2\r
-ConfigurationName      :=Debug\r
-IntermediateDirectory  :=./Debug\r
+ConfigurationName      :=Release\r
+IntermediateDirectory  :=./Release\r
 OutDir                 := $(IntermediateDirectory)\r
-WorkspacePath          := "C:\Users\wittend\Projects\fdmdv2"\r
-ProjectPath            := "C:\Users\wittend\Projects\fdmdv2"\r
+WorkspacePath          := "C:\Users\wittend\Projects\Radio\fdmdv2"\r
+ProjectPath            := "C:\Users\wittend\Projects\Radio\fdmdv2"\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
@@ -35,12 +35,12 @@ Preprocessors          :=$(PreprocessorSwitch)__WX__
 ObjectSwitch           :=-o \r
 ArchiveOutputSwitch    := \r
 PreprocessOnlySwitch   :=-E \r
-ObjectsFileList        :="C:\Users\wittend\Projects\fdmdv2\fdmdv2.txt"\r
+ObjectsFileList        :="C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2.txt"\r
 PCHCompileFlags        :=\r
 MakeDirCommand         :=makedir\r
-CmpOptions             := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors)\r
-C_CmpOptions           := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors)\r
-LinkOptions            :=  -mwindows $(shell wx-config --debug=yes --libs --unicode=yes)\r
+CmpOptions             := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)\r
+C_CmpOptions           := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)\r
+LinkOptions            :=  -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes)\r
 IncludePath            :=  $(IncludeSwitch). \r
 IncludePCH             := \r
 RcIncludePath          := \r
@@ -71,7 +71,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
        $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)\r
 \r
 $(IntermediateDirectory)/.d:\r
-       @$(MakeDirCommand) "./Debug"\r
+       @$(MakeDirCommand) "./Release"\r
 \r
 PreBuild:\r
 \r
@@ -80,60 +80,60 @@ PreBuild:
 ## Objects\r
 ##\r
 $(IntermediateDirectory)/topFrame$(ObjectSuffix): topFrame.cpp $(IntermediateDirectory)/topFrame$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/fdmdv2/topFrame.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/topFrame$(ObjectSuffix) $(IncludePath)\r
+       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/topFrame.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/topFrame$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/topFrame$(DependSuffix): topFrame.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/topFrame$(ObjectSuffix) -MF$(IntermediateDirectory)/topFrame$(DependSuffix) -MM "C:/Users/wittend/Projects/fdmdv2/topFrame.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/topFrame$(ObjectSuffix) -MF$(IntermediateDirectory)/topFrame$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/topFrame.cpp"\r
 \r
 $(IntermediateDirectory)/topFrame$(PreprocessSuffix): topFrame.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/topFrame$(PreprocessSuffix) "C:/Users/wittend/Projects/fdmdv2/topFrame.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/topFrame$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/topFrame.cpp"\r
 \r
 $(IntermediateDirectory)/dlg_about$(ObjectSuffix): dlg_about.cpp $(IntermediateDirectory)/dlg_about$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/fdmdv2/dlg_about.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/dlg_about$(ObjectSuffix) $(IncludePath)\r
+       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_about.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/dlg_about$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/dlg_about$(DependSuffix): dlg_about.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/dlg_about$(ObjectSuffix) -MF$(IntermediateDirectory)/dlg_about$(DependSuffix) -MM "C:/Users/wittend/Projects/fdmdv2/dlg_about.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/dlg_about$(ObjectSuffix) -MF$(IntermediateDirectory)/dlg_about$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_about.cpp"\r
 \r
 $(IntermediateDirectory)/dlg_about$(PreprocessSuffix): dlg_about.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/dlg_about$(PreprocessSuffix) "C:/Users/wittend/Projects/fdmdv2/dlg_about.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/dlg_about$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_about.cpp"\r
 \r
 $(IntermediateDirectory)/dlg_audio$(ObjectSuffix): dlg_audio.cpp $(IntermediateDirectory)/dlg_audio$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/fdmdv2/dlg_audio.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/dlg_audio$(ObjectSuffix) $(IncludePath)\r
+       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_audio.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/dlg_audio$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/dlg_audio$(DependSuffix): dlg_audio.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/dlg_audio$(ObjectSuffix) -MF$(IntermediateDirectory)/dlg_audio$(DependSuffix) -MM "C:/Users/wittend/Projects/fdmdv2/dlg_audio.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/dlg_audio$(ObjectSuffix) -MF$(IntermediateDirectory)/dlg_audio$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_audio.cpp"\r
 \r
 $(IntermediateDirectory)/dlg_audio$(PreprocessSuffix): dlg_audio.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/dlg_audio$(PreprocessSuffix) "C:/Users/wittend/Projects/fdmdv2/dlg_audio.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/dlg_audio$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_audio.cpp"\r
 \r
 $(IntermediateDirectory)/dlg_options$(ObjectSuffix): dlg_options.cpp $(IntermediateDirectory)/dlg_options$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/fdmdv2/dlg_options.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/dlg_options$(ObjectSuffix) $(IncludePath)\r
+       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_options.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/dlg_options$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/dlg_options$(DependSuffix): dlg_options.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/dlg_options$(ObjectSuffix) -MF$(IntermediateDirectory)/dlg_options$(DependSuffix) -MM "C:/Users/wittend/Projects/fdmdv2/dlg_options.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/dlg_options$(ObjectSuffix) -MF$(IntermediateDirectory)/dlg_options$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_options.cpp"\r
 \r
 $(IntermediateDirectory)/dlg_options$(PreprocessSuffix): dlg_options.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/dlg_options$(PreprocessSuffix) "C:/Users/wittend/Projects/fdmdv2/dlg_options.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/dlg_options$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_options.cpp"\r
 \r
 $(IntermediateDirectory)/dlg_comports$(ObjectSuffix): dlg_comports.cpp $(IntermediateDirectory)/dlg_comports$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/fdmdv2/dlg_comports.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/dlg_comports$(ObjectSuffix) $(IncludePath)\r
+       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_comports.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/dlg_comports$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/dlg_comports$(DependSuffix): dlg_comports.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/dlg_comports$(ObjectSuffix) -MF$(IntermediateDirectory)/dlg_comports$(DependSuffix) -MM "C:/Users/wittend/Projects/fdmdv2/dlg_comports.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/dlg_comports$(ObjectSuffix) -MF$(IntermediateDirectory)/dlg_comports$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_comports.cpp"\r
 \r
 $(IntermediateDirectory)/dlg_comports$(PreprocessSuffix): dlg_comports.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/dlg_comports$(PreprocessSuffix) "C:/Users/wittend/Projects/fdmdv2/dlg_comports.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/dlg_comports$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/dlg_comports.cpp"\r
 \r
 $(IntermediateDirectory)/fdmdv2_plot$(ObjectSuffix): fdmdv2_plot.cpp $(IntermediateDirectory)/fdmdv2_plot$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/fdmdv2/fdmdv2_plot.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/fdmdv2_plot$(ObjectSuffix) $(IncludePath)\r
+       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_plot.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/fdmdv2_plot$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/fdmdv2_plot$(DependSuffix): fdmdv2_plot.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fdmdv2_plot$(ObjectSuffix) -MF$(IntermediateDirectory)/fdmdv2_plot$(DependSuffix) -MM "C:/Users/wittend/Projects/fdmdv2/fdmdv2_plot.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fdmdv2_plot$(ObjectSuffix) -MF$(IntermediateDirectory)/fdmdv2_plot$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_plot.cpp"\r
 \r
 $(IntermediateDirectory)/fdmdv2_plot$(PreprocessSuffix): fdmdv2_plot.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fdmdv2_plot$(PreprocessSuffix) "C:/Users/wittend/Projects/fdmdv2/fdmdv2_plot.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fdmdv2_plot$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_plot.cpp"\r
 \r
 $(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix): fdmdv2_main.cpp $(IntermediateDirectory)/fdmdv2_main$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/fdmdv2/fdmdv2_main.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix) $(IncludePath)\r
+       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_main.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/fdmdv2_main$(DependSuffix): fdmdv2_main.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix) -MF$(IntermediateDirectory)/fdmdv2_main$(DependSuffix) -MM "C:/Users/wittend/Projects/fdmdv2/fdmdv2_main.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix) -MF$(IntermediateDirectory)/fdmdv2_main$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_main.cpp"\r
 \r
 $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix): fdmdv2_main.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix) "C:/Users/wittend/Projects/fdmdv2/fdmdv2_main.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_main.cpp"\r
 \r
 \r
 -include $(IntermediateDirectory)/*$(DependSuffix)\r
@@ -164,6 +164,6 @@ clean:
        $(RM) $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
-       $(RM) "C:\Users\wittend\Projects\fdmdv2\.build-release\fdmdv2"\r
+       $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\fdmdv2"\r
 \r
 \r

diff --git a/fdmdv2/fdmdv2.workspace b/fdmdv2/fdmdv2.workspace
index fdbc4bbc91565d17ff1c23bc305175f7f56358b3..748741c324022d917b7b2822cd60400e54923ab1 100644 (file)
--- a/fdmdv2/fdmdv2.workspace
+++ b/fdmdv2/fdmdv2.workspace
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="fdmdv2" Database="./fdmdv2.tags">
   <Project Name="test_portaudio" Path="libsndfile/Projects/w32-mingw/test_sndfile.project" Active="No"/>
-  <Project Name="test_portaudio" Path="portaudio/examples/test_portaudio/test_portaudio.project" Active="No"/>
-  <Project Name="test_codec2" Path="test_codec2/test_codec2.project" Active="No"/>
   <Project Name="test_hamlib" Path="hamlib-3.0/test_hamlib/test_hamlib.project" Active="No"/>
-  <Project Name="librs232" Path="rs232/librs232.project" Active="No"/>
   <Project Name="fdmdv2" Path="fdmdv2.project" Active="Yes"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="no">

diff --git a/fdmdv2/hamlib-3.0/test_hamlib/test_hamlib.mk b/fdmdv2/hamlib-3.0/test_hamlib/test_hamlib.mk
index 1dcd36ffc68fdae72c0cd7a8bba51748dc3ab542..3831fe3b301bcc640000b1798e7716893bb900df 100644 (file)
--- a/fdmdv2/hamlib-3.0/test_hamlib/test_hamlib.mk
+++ b/fdmdv2/hamlib-3.0/test_hamlib/test_hamlib.mk
@@ -7,8 +7,8 @@ ProjectName            :=test_hamlib
 ConfigurationName      :=Release\r
 IntermediateDirectory  :=./Release\r
 OutDir                 := $(IntermediateDirectory)\r
-WorkspacePath          := "C:\Users\wittend\Projects\dvui"\r
-ProjectPath            := "C:\Users\wittend\Projects\dvui\hamlib-3.0\test_hamlib"\r
+WorkspacePath          := "C:\Users\wittend\Projects\Radio\fdmdv2"\r
+ProjectPath            := "C:\Users\wittend\Projects\Radio\fdmdv2\hamlib-3.0\test_hamlib"\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
@@ -35,7 +35,7 @@ Preprocessors          :=
 ObjectSwitch           :=-o \r
 ArchiveOutputSwitch    := \r
 PreprocessOnlySwitch   :=-E \r
-ObjectsFileList        :="C:\Users\wittend\Projects\dvui\hamlib-3.0\test_hamlib\test_hamlib.txt"\r
+ObjectsFileList        :="C:\Users\wittend\Projects\Radio\fdmdv2\hamlib-3.0\test_hamlib\test_hamlib.txt"\r
 PCHCompileFlags        :=\r
 MakeDirCommand         :=makedir\r
 CmpOptions             := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)\r
@@ -80,12 +80,12 @@ PreBuild:
 ## Objects\r
 ##\r
 $(IntermediateDirectory)/main$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/dvui/hamlib-3.0/test_hamlib/main.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath)\r
+       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/hamlib-3.0/test_hamlib/main.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/main$(DependSuffix): main.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main$(ObjectSuffix) -MF$(IntermediateDirectory)/main$(DependSuffix) -MM "C:/Users/wittend/Projects/dvui/hamlib-3.0/test_hamlib/main.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main$(ObjectSuffix) -MF$(IntermediateDirectory)/main$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/hamlib-3.0/test_hamlib/main.cpp"\r
 \r
 $(IntermediateDirectory)/main$(PreprocessSuffix): main.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/Users/wittend/Projects/dvui/hamlib-3.0/test_hamlib/main.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/hamlib-3.0/test_hamlib/main.cpp"\r
 \r
 \r
 -include $(IntermediateDirectory)/*$(DependSuffix)\r
@@ -98,6 +98,6 @@ clean:
        $(RM) $(IntermediateDirectory)/main$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
-       $(RM) "C:\Users\wittend\Projects\dvui\.build-release\test_hamlib"\r
+       $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\test_hamlib"\r
 \r
 \r

diff --git a/fdmdv2/libsndfile/Projects/w32-mingw/Release/main.o.d b/fdmdv2/libsndfile/Projects/w32-mingw/Release/main.o.d
index 93701e40efef68a5b2dba4e200a90734790503cf..49f06fd158a387f04ca020227b14a50ce716ef78 100644 (file)
--- a/fdmdv2/libsndfile/Projects/w32-mingw/Release/main.o.d
+++ b/fdmdv2/libsndfile/Projects/w32-mingw/Release/main.o.d
@@ -1,5 +1,5 @@
 Release/main.o: \\r
- C:/Users/wittend/Projects/libsndfile/Projects/w32-mingw/main.cpp \\r
- C:/Users/wittend/Projects/libsndfile/Projects/w32-mingw/sndfile.h\r
+ C:/Users/wittend/Projects/Radio/fdmdv2/libsndfile/Projects/w32-mingw/main.cpp \\r
+ C:/Users/wittend/Projects/Radio/fdmdv2/libsndfile/Projects/w32-mingw/sndfile.h\r
 \r
-C:/Users/wittend/Projects/libsndfile/Projects/w32-mingw/sndfile.h:\r
+C:/Users/wittend/Projects/Radio/fdmdv2/libsndfile/Projects/w32-mingw/sndfile.h:\r

diff --git a/fdmdv2/libsndfile/Projects/w32-mingw/Release/test_sndfile.exe b/fdmdv2/libsndfile/Projects/w32-mingw/Release/test_sndfile.exe
index e7732f889f64f94fdfd5b31ed9ca9fcafc267bd3..0584dd127d1757cd3f4b4b52795ad4e8c9348beb 100644 (file)
Binary files a/fdmdv2/libsndfile/Projects/w32-mingw/Release/test_sndfile.exe and b/fdmdv2/libsndfile/Projects/w32-mingw/Release/test_sndfile.exe differ

diff --git a/fdmdv2/libsndfile/Projects/w32-mingw/test_sndfile.mk b/fdmdv2/libsndfile/Projects/w32-mingw/test_sndfile.mk
index a9f199eb9710748cde042d33929da1e2e77721a1..6500d56622593edf2dc35cde2e131ff8f7edd462 100644 (file)
--- a/fdmdv2/libsndfile/Projects/w32-mingw/test_sndfile.mk
+++ b/fdmdv2/libsndfile/Projects/w32-mingw/test_sndfile.mk
@@ -7,13 +7,13 @@ ProjectName            :=test_sndfile
 ConfigurationName      :=Release\r
 IntermediateDirectory  :=./Release\r
 OutDir                 := $(IntermediateDirectory)\r
-WorkspacePath          := "C:\Users\wittend\Projects\dvui"\r
-ProjectPath            := "C:\Users\wittend\Projects\libsndfile\Projects\w32-mingw"\r
+WorkspacePath          := "C:\Users\wittend\Projects\Radio\fdmdv2"\r
+ProjectPath            := "C:\Users\wittend\Projects\Radio\fdmdv2\libsndfile\Projects\w32-mingw"\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=5/6/2012\r
+Date                   :=5/13/2012\r
 CodeLitePath           :="C:\Program Files\CodeLite"\r
 LinkerName             :=g++\r
 ArchiveTool            :=ar rcus\r
@@ -35,7 +35,7 @@ Preprocessors          :=
 ObjectSwitch           :=-o \r
 ArchiveOutputSwitch    := \r
 PreprocessOnlySwitch   :=-E \r
-ObjectsFileList        :="C:\Users\wittend\Projects\libsndfile\Projects\w32-mingw\test_sndfile.txt"\r
+ObjectsFileList        :="C:\Users\wittend\Projects\Radio\fdmdv2\libsndfile\Projects\w32-mingw\test_sndfile.txt"\r
 PCHCompileFlags        :=\r
 MakeDirCommand         :=makedir\r
 CmpOptions             := -O2 -Wall $(Preprocessors)\r
@@ -80,12 +80,12 @@ PreBuild:
 ## Objects\r
 ##\r
 $(IntermediateDirectory)/main$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/libsndfile/Projects/w32-mingw/main.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath)\r
+       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/libsndfile/Projects/w32-mingw/main.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/main$(DependSuffix): main.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main$(ObjectSuffix) -MF$(IntermediateDirectory)/main$(DependSuffix) -MM "C:/Users/wittend/Projects/libsndfile/Projects/w32-mingw/main.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main$(ObjectSuffix) -MF$(IntermediateDirectory)/main$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/libsndfile/Projects/w32-mingw/main.cpp"\r
 \r
 $(IntermediateDirectory)/main$(PreprocessSuffix): main.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/Users/wittend/Projects/libsndfile/Projects/w32-mingw/main.cpp"\r
+       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/libsndfile/Projects/w32-mingw/main.cpp"\r
 \r
 \r
 -include $(IntermediateDirectory)/*$(DependSuffix)\r
@@ -98,6 +98,6 @@ clean:
        $(RM) $(IntermediateDirectory)/main$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
-       $(RM) "C:\Users\wittend\Projects\dvui\.build-release\test_sndfile"\r
+       $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\test_sndfile"\r
 \r
 \r