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

diff --git a/fdmdv2/build/codelite/fdmdv2.mk b/fdmdv2/build/codelite/fdmdv2.mk
index d198432c3d9a8fe0812a5f382398385d7863ba4c..65c138c8cc8b7bc367e1ff5edf963561b94fb455 100644 (file)
--- a/fdmdv2/build/codelite/fdmdv2.mk
+++ b/fdmdv2/build/codelite/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=12/16/2012\r
+Date                   :=12/29/2012\r
 CodeLitePath           :="D:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\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=\"1140\"  $(Preprocessors)\r
-CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"1140\"  $(Preprocessors)\r
+CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"1145\"  $(Preprocessors)\r
+CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"1145\"  $(Preprocessors)\r
 \r
 \r
 ##\r

diff --git a/fdmdv2/build/codelite/fdmdv2.project b/fdmdv2/build/codelite/fdmdv2.project
index d0de44830eedc8438cb110b062cf84f55813a0f6..9d64d3de8dacb6ee5589f15d60552d9fee29f076 100644 (file)
--- a/fdmdv2/build/codelite/fdmdv2.project
+++ b/fdmdv2/build/codelite/fdmdv2.project
@@ -36,7 +36,6 @@
     <File Name="../../../codec2-dev/src/codec2.h"/>
     <File Name="../../../codec2-dev/src/fdmdv.h"/>
     <File Name="../../src/fdmdv2_defines.h"/>
-    <File Name="../../../Audio/portaudio/include/portaudio.h"/>
     <File Name="../../../Audio/libsndfile/include/sndfile.h"/>
     <File Name="../../src/fdmdv2_plot_waterfall_linux.h"/>
     <File Name="../../src/dlg_audiooptions.h"/>
@@ -46,6 +45,8 @@
     <File Name="../../src/sox_biquad.h"/>
     <File Name="../../src/dlg_about.h"/>
     <File Name="../version.h"/>
+    <File Name="../../../../code/libCTB-0.16/include/ctb-0.16/ctb.h"/>
+    <File Name="../../../../Audio/portaudio/include/portaudio.h"/>
   </VirtualDirectory>
   <VirtualDirectory Name="resources">
     <File Name="../../src/FDMDV2.fbp"/>

diff --git a/fdmdv2/build/codelite/fdmdv2_wsp.mk b/fdmdv2/build/codelite/fdmdv2_wsp.mk
index bc8f9a8edf677e0b3e062cce373d8f1427923b03..e920a49f92d611834cd057fddc19ad80c7942a1c 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:[ libCTB - Release ]----------"
-       @cd "libCTB" && "$(MAKE)" -f "libCTB.mk"
+       @echo "----------Building project:[ fdmdv2 - Release ]----------"
+       @"$(MAKE)" -f "fdmdv2.mk"
 clean:
-       @echo "----------Cleaning project:[ libCTB - Release ]----------"
-       @cd "libCTB" && "$(MAKE)" -f "libCTB.mk" clean
+       @echo "----------Cleaning project:[ fdmdv2 - Release ]----------"
+       @"$(MAKE)" -f "fdmdv2.mk" clean