From fd6a9db2391daa75c20a77f18c0ee935e7e1d39d Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 23 Nov 2018 00:32:50 +0100
Subject: fix radio dep problem -- still now working, but closer ;)

---
 lib/arduino-minimal.h |  8 ++++++++
 radiohead.mk          | 11 ++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/arduino-minimal.h b/lib/arduino-minimal.h
index 64eb867..fcac3ab 100644
--- a/lib/arduino-minimal.h
+++ b/lib/arduino-minimal.h
@@ -23,6 +23,10 @@
 #ifndef SPREADAVR_arduino_minimal_h_INCLUDED
 #define SPREADAVR_arduino_minimal_h_INCLUDED
 
+#ifdef __cplusplus
+extern "C"{
+#endif
+
 #define HIGH 0x1
 #define LOW  0x0
 
@@ -47,6 +51,10 @@ void digitalWrite(uint8_t, uint8_t);
 void attachInterrupt(uint8_t, void (*)(void), int mode);
 //void detachInterrupt(uint8_t);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 // WMath prototypes
 long random(long);
 long random(long, long);
diff --git a/radiohead.mk b/radiohead.mk
index 94d1de3..d4a969e 100644
--- a/radiohead.mk
+++ b/radiohead.mk
@@ -26,18 +26,23 @@ include $(SPREADAVR_PATH)/defines.mk
 RADIOHEAD_COMPONENTS := RH_$(RADIOHEAD_DRIVER) RHGenericDriver RHSPIDriver RHHardwareSPI RHGenericSPI
 
 SRC:=$(foreach COMP,$(RADIOHEAD_COMPONENTS),$(RADIOHEAD_PATH)/$(COMP).cpp)
+DEPLIBS := arduino-stub
 
 CXXFLAGS += -I$(RADIOHEAD_PATH)
 CXXFLAGS += -DRH_PLATFORM=RH_PLATFORM_GENERIC_AVR8
 CXXFLAGS += $(RADIOHEAD_OPTS)
 
 OBJ = $(SRC:%.cpp=%.o)
+OBJ_DEPLIB = $(DEPLIBS:%=deplib-radiohead--%.o)
 
-libradiohead.a: $(OBJ)
-	$(AR) $@ $(OBJ)
+libradiohead.a: $(OBJ) $(OBJ_DEPLIB)
+	$(AR) $@ $(OBJ) $(OBJ_DEPLIB)
 
 %.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $< -o $@
 
+deplib-radiohead--%.o: $(LIB_DIR)/%.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
 clean:
-	rm -f $(SRC:%.cpp=%.o)
+	rm -f $(SRC:%.cpp=%.o) $(OBJ_DEPLIB)
-- 
cgit v1.2.3