From fb306882d846523794a496135b65a65d66c0cef2 Mon Sep 17 00:00:00 2001 From: mamborambo <36679886+mamborambo@users.noreply.github.com> Date: Sat, 1 Dec 2018 00:00:00 +0000 Subject: [PATCH 1/2] Improve Makefile - Added CXXFLAGS to fix GCC warnings - make clean: remove pifmrds object files --- src/Makefile | 56 +++++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/src/Makefile b/src/Makefile index 998cc58..e58b3e2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,84 +1,79 @@ all: ../pisstv ../piopera ../pifsq ../pichirp ../sendiq ../tune ../freedv ../dvbrf ../pocsag ../spectrumpaint ../pifmrds ../rpitx -CFLAGS = -Wall -g -O2 -Wno-unused-variable -LDFLAGS = librpitx/src/librpitx.a -lm -lrt -lpthread -CCP= g++ -CC= gcc +CFLAGS = -Wall -g -O2 -Wno-unused-variable +CXXFLAGS = -std=c++11 -Wall -g -O2 -Wno-unused-variable +LDFLAGS = librpitx/src/librpitx.a -lm -lrt -lpthread +CCP = c++ +CC = cc CFLAGS_Pissb = -Wall -g -O2 -Wno-unused-variable LDFLAGS_Pissb = librpitx/src/librpitx.a -lm -lrt -lpthread -lsndfile -lliquid ../pissb: ssbgen/test_ssb.c ssbgen/ssb_gen.c ssbgen/liquid_ssb.c librpitx/src/librpitx.a - $(CC) $(CFLAGS_Pissb) -o ../pissb ssbgen/liquid_ssb.c $(LDFLAGS_Pissb) + $(CC) $(CFLAGS_Pissb) -o ../pissb ssbgen/liquid_ssb.c $(LDFLAGS_Pissb) ../pisstv : sstv/pisstv.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -o ../pisstv sstv/pisstv.cpp $(LDFLAGS) - + $(CCP) $(CXXFLAGS) -o ../pisstv sstv/pisstv.cpp $(LDFLAGS) ../piopera : opera/opera.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -o ../piopera opera/opera.cpp $(LDFLAGS) - + $(CCP) $(CXXFLAGS) -o ../piopera opera/opera.cpp $(LDFLAGS) ../pifsq : fsq/pifsq.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -o ../pifsq fsq/pifsq.cpp $(LDFLAGS) + $(CCP) $(CXXFLAGS) -o ../pifsq fsq/pifsq.cpp $(LDFLAGS) ../pichirp : chirp/chirp.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -o ../pichirp chirp/chirp.cpp $(LDFLAGS) + $(CCP) $(CXXFLAGS) -o ../pichirp chirp/chirp.cpp $(LDFLAGS) ../sendiq : sendiq.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -o ../sendiq sendiq.cpp $(LDFLAGS) + $(CCP) $(CXXFLAGS) -o ../sendiq sendiq.cpp $(LDFLAGS) ../tune : tune.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -o ../tune tune.cpp $(LDFLAGS) + $(CCP) $(CXXFLAGS) -o ../tune tune.cpp $(LDFLAGS) ../freedv : freedv/freedv.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -o ../freedv freedv/freedv.cpp $(LDFLAGS) + $(CCP) $(CXXFLAGS) -o ../freedv freedv/freedv.cpp $(LDFLAGS) ../dvbrf : dvb/dvbrf.cpp dvb/dvbsenco8.s dvb/fec100.c dvb/dvbs2arm_1v30.s librpitx/src/librpitx.a $(CC) $(CFLAGS) -c -o dvb/dvbsenco8.o dvb/dvbsenco8.s $(CC) $(CFLAGS) -c -o dvb/dvbs2arm_1v30.o dvb/dvbs2arm_1v30.s $(CC) $(CFLAGS) -c -o dvb/fec100.o dvb/fec100.c - $(CCP) $(CFLAGS) -o ../dvbrf dvb/dvbrf.cpp dvb/dvbsenco8.o dvb/fec100.o dvb/dvbs2arm_1v30.o $(LDFLAGS) + $(CCP) $(CXXFLAGS) -o ../dvbrf dvb/dvbrf.cpp dvb/dvbsenco8.o dvb/fec100.o dvb/dvbs2arm_1v30.o $(LDFLAGS) ../pocsag: pocsag/pocsag.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -o ../pocsag pocsag/pocsag.cpp $(LDFLAGS) + $(CCP) $(CXXFLAGS) -o ../pocsag pocsag/pocsag.cpp $(LDFLAGS) ../spectrumpaint: spectrumpaint/spectrum.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -o ../spectrumpaint spectrumpaint/spectrum.cpp $(LDFLAGS) + $(CCP) $(CXXFLAGS) -o ../spectrumpaint spectrumpaint/spectrum.cpp $(LDFLAGS) ../pifmrds: pifmrds/rds.c pifmrds/waveforms.c pifmrds/pi_fm_rds.cpp pifmrds/fm_mpx.c pifmrds/control_pipe.c librpitx/src/librpitx.a - $(CC) $(CFLAGS) -c -o pifmrds/rds.o pifmrds/rds.c $(CC) $(CFLAGS) -c -o pifmrds/control_pipe.o pifmrds/control_pipe.c $(CC) $(CFLAGS) -c -o pifmrds/waveforms.o pifmrds/waveforms.c $(CC) $(CFLAGS) -c -o pifmrds/rds_wav.o pifmrds/rds_wav.c $(CC) $(CFLAGS) -c -o pifmrds/fm_mpx.o pifmrds/fm_mpx.c $(CC) -o pifmrds/rds_wav pifmrds/rds_wav.o pifmrds/rds.o pifmrds/waveforms.o pifmrds/fm_mpx.o -lm -lsndfile - $(CCP) $(CFLAGS) -Wno-write-strings -o ../pifmrds pifmrds/rds.o pifmrds/waveforms.o pifmrds/pi_fm_rds.cpp pifmrds/fm_mpx.o pifmrds/control_pipe.o librpitx/src/librpitx.a -lm -lsndfile -lrt -lpthread + $(CCP) $(CXXFLAGS) -Wno-write-strings -o ../pifmrds pifmrds/rds.o pifmrds/waveforms.o pifmrds/pi_fm_rds.cpp pifmrds/fm_mpx.o pifmrds/control_pipe.o librpitx/src/librpitx.a -lm -lsndfile -lrt -lpthread ../rpitx: rpitxv1/rpitx.cpp librpitx/src/librpitx.a - $(CCP) $(CFLAGS) -Wno-write-strings -o ../rpitx rpitxv1/rpitx.cpp $(LDFLAGS) + $(CCP) $(CXXFLAGS) -Wno-write-strings -o ../rpitx rpitxv1/rpitx.cpp $(LDFLAGS) - -CFLAGS_Pifm = -Wall -g -O2 -Wno-unused-variable +CFLAGS_Pifm = -Wall -g -O2 -Wno-unused-variable LDFLAGS_Pifm = librpitx/src/librpitx.a -lm -lrt -lpthread -lsndfile -../pifm : ../fm/pifm.c - $(CC) $(CFLAGS_Pifm) -o ../pifm ../fm/pifm.c $(LDFLAGS_Pifm) +../pifm : ../fm/pifm.c + $(CC) $(CFLAGS_Pifm) -o ../pifm ../fm/pifm.c $(LDFLAGS_Pifm) CFLAGS_Piam = -Wall -g -O2 -Wno-unused-variable LDFLAGS_Piam = librpitx/src/librpitx.a -lm -lrt -lpthread -lsndfile -../piam : ../am/piam.c - $(CC) $(CFLAGS_Piam) -o ../piam ../am/piam.c $(LDFLAGS_Piam) +../piam : ../am/piam.c + $(CC) $(CFLAGS_Piam) -o ../piam ../am/piam.c $(LDFLAGS_Piam) CFLAGS_Pidcf77 = -Wall -g -O2 -Wno-unused-variable LDFLAGS_Pidcf77 = librpitx/src/librpitx.a -lm -lrt -lpthread -../pidcf77 : ../dcf77/pidcf77.c - $(CC) $(CFLAGS_Piam) -o ../pidcf77 ../dcf77/pidcf77.c $(LDFLAGS_Piam) +../pidcf77 : ../dcf77/pidcf77.c + $(CC) $(CFLAGS_Piam) -o ../pidcf77 ../dcf77/pidcf77.c $(LDFLAGS_Piam) clean: - rm -f ../dvbrf ../sendiq ../pissb ../pisstv ../pifsq ../pifm ../piam ../pidcf77 ../pichirp ../tune ../freedv ../piopera ../spectrumpaint ../pocsag ../pifmrds ../rpitx - install: all install -m 0755 ../pisstv /usr/bin install -m 0755 ../piopera /usr/bin @@ -89,4 +84,3 @@ install: all install -m 0755 ../freedv /usr/bin install -m 0755 ../dvbrf /usr/bin install -m 0755 ../rpitx /usr/bin - From 1bdfc6a0618ca35e82d6958fe4a09a08211b26bb Mon Sep 17 00:00:00 2001 From: mamborambo <36679886+mamborambo@users.noreply.github.com> Date: Sat, 1 Dec 2018 00:00:00 +0000 Subject: [PATCH 2/2] Add stdlib include required for atof() --- src/chirp/chirp.cpp | 1 + src/dvb/dvbrf.cpp | 1 + src/rpitxv1/rpitx.cpp | 3 ++- src/sendiq.cpp | 1 + src/tune.cpp | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chirp/chirp.cpp b/src/chirp/chirp.cpp index df637ae..31f7804 100644 --- a/src/chirp/chirp.cpp +++ b/src/chirp/chirp.cpp @@ -4,6 +4,7 @@ #include "stdio.h" #include #include +#include bool running=true; diff --git a/src/dvb/dvbrf.cpp b/src/dvb/dvbrf.cpp index 7c79413..2ac5984 100644 --- a/src/dvb/dvbrf.cpp +++ b/src/dvb/dvbrf.cpp @@ -3,6 +3,7 @@ #include "stdio.h" #include #include +#include // DVBS ENCODER extern "C" diff --git a/src/rpitxv1/rpitx.cpp b/src/rpitxv1/rpitx.cpp index c3a3908..0419c26 100644 --- a/src/rpitxv1/rpitx.cpp +++ b/src/rpitxv1/rpitx.cpp @@ -25,6 +25,7 @@ #include /* va_list, va_start, va_arg, va_end */ #include #include +#include #define PROGRAM_VERSION "2.0" @@ -361,4 +362,4 @@ int main(int argc, char* argv[]) case MODE_RPITX_RF:delete(fmsender);break; } -} \ No newline at end of file +} diff --git a/src/sendiq.cpp b/src/sendiq.cpp index 79a8d31..d4495ce 100644 --- a/src/sendiq.cpp +++ b/src/sendiq.cpp @@ -3,6 +3,7 @@ #include "stdio.h" #include #include +#include bool running=true; diff --git a/src/tune.cpp b/src/tune.cpp index 43b7b7e..bee9558 100644 --- a/src/tune.cpp +++ b/src/tune.cpp @@ -3,6 +3,7 @@ #include "stdio.h" #include #include +#include bool running=true;