- refactored

git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@889 b431acfa-c32f-4a4a-93f1-934dc6c82436

Builds/Linux/Makefile

@@ -3,14 +3,14 @@
 
 # (this disables dependency generation if multiple architectures are set)
 DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
-
-LIBSRC_PATH := ../../../../libsrc
+PROJ_HOME := $(shell pwd)
+LIBSRC_PATH := ${PROJ_HOME}/../../../../libsrc
 LIBSRC := -L$(LIBSRC_PATH)/fir -L$(LIBSRC_PATH)/crc -L$(LIBSRC_PATH)/radio
 
-JUCE_PATH := ../../../../extlib/JUCE
-EIGEN_PATH := ../../../../extlib/eigen
+JUCE_PATH :=  ${PROJ_HOME}/../../../../extlib/JUCE
+EIGEN_PATH := ${PROJ_HOME}/../../../../extlib/eigen
 
-INCLUDES := -I /usr/include/freetype2 -I ../../JuceLibraryCode -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(LIBSRC_PATH) -I ../../Source -I $(EIGEN_PATH)
+INCLUDES := -I /usr/include/freetype2 -I $(PROJ_HOME)/../../JuceLibraryCode -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(LIBSRC_PATH) -I ../../Source -I $(EIGEN_PATH)
 
 
 DEFINES_Debug := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "radio_float_t=float" -D "fir_float_t=float" 
@@ -67,6 +67,9 @@ endif
 
 OBJECTS := \
   $(OBJDIR)/Frame_c2c56272.o \
+  $(OBJDIR)/Formatter_c2c56272.o \
+  $(OBJDIR)/Symbolizer_c2c56272.o \
+  $(OBJDIR)/Scrambler_c2c56272.o \
   $(OBJDIR)/GraphComponent_e41edf58.o \
   $(OBJDIR)/LogComponent_246d8222.o \
   $(OBJDIR)/Receiver_5b8294f8.o \
@@ -108,6 +111,21 @@ strip:
 	@echo Stripping M-QAM Transceiver
 	-@strip --strip-unneeded $(OUTDIR)/$(TARGET)
 
+$(OBJDIR)/Formatter_c2c56272.o: ../../../../libsrc/cpp/radio/Formatter.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling Formatter.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/Symbolizer_c2c56272.o: ../../../../libsrc/cpp/radio/Symbolizer.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling Symbolizer.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/Scrambler_c2c56272.o: ../../../../libsrc/cpp/radio/Scrambler.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling Scrambler.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/Frame_c2c56272.o: ../../../../libsrc/cpp/radio/Frame.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling Frame.cpp"

Source/ControlComponent.h

@@ -22,8 +22,8 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include "JuceHeader.h"
-#include "Receiver.h"
-#include "Transmitter.h"
+#include "Receiver.hpp"
+#include "Transmitter.hpp"
 //[/Headers]
 
 

Source/GraphComponent.h

@@ -22,7 +22,7 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
-#include "Receiver.h"
+#include "Receiver.hpp"
 //[/Headers]
 
 

Source/IQPlaneComponent.h

@@ -22,7 +22,7 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include "JuceHeader.h"
-#include "Receiver.h"
+#include "Receiver.hpp"
 #define NUM_TRACKER_POINTS		4
 //[/Headers]
 

Source/MainComponent.h

@@ -26,10 +26,10 @@
 #include "GraphComponent.h"
 #include "LogComponent.h"
 #include "ControlComponent.h"
-#include "Receiver.h"
-#include "Transmitter.h"
+#include "Receiver.hpp"
+#include "Transmitter.hpp"
 #include <cpp/radio/Vector.hpp>
-#include "RxBuffer.hpp"
+#include "ReceiverBuffer.hpp"
 //[/Headers]
 
 

Source/Receiver.cpp

@@ -1,6 +1,6 @@
 #include <cmath>
 #include <float.h>
-#include "Receiver.h"
+#include "Receiver.hpp"
 #include "MinMaxLemire.h"
 #include <cpp/radio/Interpolation.hpp>
 #include <cpp/radio/Frame.hpp>

Source/Transmitter.cpp

@@ -1,4 +1,4 @@
-#include "Transmitter.h"
+#include "Transmitter.hpp"
 
 
 Transmitter::Transmitter(void)