From: c vw <dl1ycf@darc.de>
Date: Wed, 15 Jan 2020 14:46:41 +0000 (+0100)
Subject: Removed RADIOBERRY
X-Git-Url: https://git.rkrishnan.org/%5B/htmlfontify-example.html?a=commitdiff_plain;h=7fb8bbf7f5c09d032df9ba2b8082c18202a90661;p=pihpsdr.git
Removed RADIOBERRY
---
diff --git a/Makefile b/Makefile
index a52f6fc..79a7b2f 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,6 @@ PURESIGNAL_INCLUDE=PURESIGNAL
# uncomment the line below to include MIDI support
MIDI_INCLUDE=MIDI
-# uncomment the line below when Radioberry radio cape is plugged in (for now use emulator and old protocol)
-#RADIOBERRY_INCLUDE=RADIOBERRY
-
# uncomment the line below for various debug facilities
#DEBUG_OPTION=-D DEBUG
@@ -103,10 +100,6 @@ ozyio.o
endif
-ifeq ($(RADIOBERRY_INCLUDE),RADIOBERRY)
-RADIOBERRY_OPTIONS=-D RADIOBERRY
-endif
-
ifeq ($(SOAPYSDR_INCLUDE),SOAPYSDR)
SOAPYSDR_OPTIONS=-D SOAPYSDR
SOAPYSDRLIBS=-lSoapySDR
@@ -215,7 +208,7 @@ AUDIO_LIBS=-lasound
CFLAGS= -g -Wno-deprecated-declarations -O3
OPTIONS=$(MIDI_OPTIONS) $(PURESIGNAL_OPTIONS) $(REMOTE_OPTIONS) $(USBOZY_OPTIONS) \
- $(I2C_OPTIONS) $(GPIO_OPTIONS) $(SOAPYSDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) $(RADIOBERRY_OPTIONS) \
+ $(I2C_OPTIONS) $(GPIO_OPTIONS) $(SOAPYSDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) \
$(PSK_OPTIONS) $(STEMLAB_OPTIONS) $(CONTROLLER2_OPTIONS) \
-D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(DEBUG_OPTION)
diff --git a/Makefile.mac b/Makefile.mac
index 63f3893..f15eb9b 100644
--- a/Makefile.mac
+++ b/Makefile.mac
@@ -44,9 +44,6 @@ STEMLAB_DISCOVERY=STEMLAB_DISCOVERY_NOAVAHI
# uncomment the line below to include MIDI support
MIDI_INCLUDE=MIDI
-# uncomment the line below when Radioberry radio cape is plugged in (for now use emulator and old protocol)
-#RADIOBERRY_INCLUDE=RADIOBERRY
-
# uncomment the line below for various debug facilities
#DEBUG_OPTION=-D DEBUG
@@ -103,10 +100,6 @@ ozyio.o
endif
-ifeq ($(RADIOBERRY_INCLUDE),RADIOBERRY)
-RADIOBERRY_OPTIONS=-D RADIOBERRY
-endif
-
ifeq ($(SOAPYSDR_INCLUDE),SOAPYSDR)
SOAPYSDR_OPTIONS=-D SOAPYSDR
SOAPYSDRLIBS=-lSoapySDR
@@ -214,7 +207,7 @@ AUDIO_LIBS=-lportaudio -O3
CFLAGS= -g -Wno-deprecated-declarations
OPTIONS=$(MIDI_OPTIONS) $(PURESIGNAL_OPTIONS) $(REMOTE_OPTIONS) $(USBOZY_OPTIONS) \
- $(I2C_OPTIONS) $(GPIO_OPTIONS) $(SOAPYSDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) $(RADIOBERRY_OPTIONS) \
+ $(I2C_OPTIONS) $(GPIO_OPTIONS) $(SOAPYSDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) \
$(PSK_OPTIONS) $(STEMLAB_OPTIONS) \
$(CONTROLLER2_OPTIONS) $(AUDIO_OPTIONS) \
-D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(DEBUG_OPTION)