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

diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk
index 01de3a337ae303bba0d6e6805d0fed0d67d9cc65..85d3fa9943f49541d1773408000fb056caff2f93 100644 (file)
--- a/fdmdv2/build/fdmdv2.mk
+++ b/fdmdv2/build/fdmdv2.mk
@@ -2,18 +2,18 @@
 ## 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
+ConfigurationName      :=Release\r
 WorkspacePath          := "C:\bin\Projects\Radio\fdmdv2\build"\r
 ProjectPath            := "C:\bin\Projects\Radio\fdmdv2\build"\r
-IntermediateDirectory  :=./Debug\r
+IntermediateDirectory  :=./Release\r
 OutDir                 := $(IntermediateDirectory)\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=OFA-Staff\r
-Date                   :=10/25/2012\r
+Date                   :=11/3/2012\r
 CodeLitePath           :="C:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -35,8 +35,10 @@ PreprocessOnlySwitch   :=-E
 ObjectsFileList        :="C:\bin\Projects\Radio\fdmdv2\build\fdmdv2.txt"\r
 PCHCompileFlags        :=\r
 MakeDirCommand         :=makedir\r
-LinkOptions            :=  -mwindows $(shell wx-config --debug=yes --libs --unicode=yes)\r
-IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include \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.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/ \r
 IncludePCH             := \r
 RcIncludePath          := \r
 Libs                   := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp \r
@@ -50,8 +52,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/Project
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"810\"  $(Preprocessors)\r
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"810\"  $(Preprocessors)\r
+CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"914\"  $(Preprocessors)\r
+CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"914\"  $(Preprocessors)\r
 \r
 \r
 ##\r
@@ -78,7 +80,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
@@ -237,6 +239,6 @@ clean:
        $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
-       $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-debug\fdmdv2"\r
+       $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-release\fdmdv2"\r
 \r
 \r

diff --git a/fdmdv2/build/fdmdv2.workspace b/fdmdv2/build/fdmdv2.workspace
index 82b31d8aecdb38029cabc98d18f10989b024b4db..8dca1ae04f25e17e7be929d5424a17d8cd679bf4 100644 (file)
--- a/fdmdv2/build/fdmdv2.workspace
+++ b/fdmdv2/build/fdmdv2.workspace
@@ -1,11 +1,11 @@
 <?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="rawbits" Path="../tests/image/rawbits.project" Active="No"/>
-  <Project Name="pa_enum" Path="../tests/pa_enum/pa_enum.project" Active="Yes"/>
+  <Project Name="pa_enum" Path="../tests/pa_enum/pa_enum.project" Active="No"/>
   <Project Name="appWithDlg" Path="../tests/appWithDlg/appWithDlg.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="no">

diff --git a/fdmdv2/build/fdmdv2_wsp.mk b/fdmdv2/build/fdmdv2_wsp.mk
index 332ad0d5d1e30207e24e4e085aa861f54ef24acb..e920a49f92d611834cd057fddc19ad80c7942a1c 100644 (file)
--- a/fdmdv2/build/fdmdv2_wsp.mk
+++ b/fdmdv2/build/fdmdv2_wsp.mk
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-       @echo ----------Building project:[ pa_enum - Release ]----------
-       @cd "C:\bin\Projects\Radio\fdmdv2\tests\pa_enum" && "$(MAKE)" -f "pa_enum.mk"
+       @echo "----------Building project:[ fdmdv2 - Release ]----------"
+       @"$(MAKE)" -f "fdmdv2.mk"
 clean:
-       @echo ----------Cleaning project:[ pa_enum - Release ]----------
-       @cd "C:\bin\Projects\Radio\fdmdv2\tests\pa_enum" && "$(MAKE)" -f "pa_enum.mk" clean
+       @echo "----------Cleaning project:[ fdmdv2 - Release ]----------"
+       @"$(MAKE)" -f "fdmdv2.mk" clean

diff --git a/fdmdv2/tests/pa_enum/AudioOptsDialog.cpp b/fdmdv2/tests/pa_enum/AudioOptsDialog.cpp
index 6cc358092661d7f4888a44950e047c9f71700282..4b269eb34c787c768181b3c0c773ab5d81020d04 100644 (file)
--- a/fdmdv2/tests/pa_enum/AudioOptsDialog.cpp
+++ b/fdmdv2/tests/pa_enum/AudioOptsDialog.cpp
@@ -663,7 +663,7 @@ void AudioOptsDialog::OnRefreshClick(wxCommandEvent& event)
 //-------------------------------------------------------------------------\r
 // OnApplyAudioParameters()\r
 //-------------------------------------------------------------------------\r
-void AudioOptsDialog::OnApplyAudioParameters(wxCommandEvent& event)\r
+ void AudioOptsDialog::OnApplyAudioParameters(wxCommandEvent& event)\r
 {\r
     ExchangeData(EXCHANGE_DATA_OUT);
     if(m_isPaInitialized)\r
@@ -676,7 +676,6 @@ void AudioOptsDialog::OnApplyAudioParameters(wxCommandEvent& event)
         {\r
             wxMessageBox(wxT("Port Audio failed to Terminate"), wxT("Pa_Terminate"), wxOK);\r
         }\r
-    }\r
 }\r
 \r
 //-------------------------------------------------------------------------\r

diff --git a/fdmdv2/tests/pa_enum/pa_enum.mk b/fdmdv2/tests/pa_enum/pa_enum.mk
index 3bdad048dff973b70a950908903a20f1ae898966..630a8eb3519d7ec4bb2ce610003682f41b3f991c 100644 (file)
--- a/fdmdv2/tests/pa_enum/pa_enum.mk
+++ b/fdmdv2/tests/pa_enum/pa_enum.mk
@@ -50,8 +50,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW-4
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"886\"  $(Preprocessors)\r
-CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"886\"  $(Preprocessors)\r
+CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"914\"  $(Preprocessors)\r
+CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"914\"  $(Preprocessors)\r
 \r
 \r
 ##\r