From c74470c7597233c1b59082829b89a25bafa25a14 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 9 Jul 2024 10:15:16 +1000 Subject: [PATCH] examples: lora: Remove cmake build option Signed-off-by: Alistair Francis --- examples/lora/README.md | 7 ---- examples/lora/sensor-receive/Makefile | 53 ++------------------------ examples/lora/sensor-transmit/Makefile | 53 ++------------------------ libradio/Makefile.app | 5 +++ 4 files changed, 13 insertions(+), 105 deletions(-) create mode 100644 libradio/Makefile.app diff --git a/examples/lora/README.md b/examples/lora/README.md index 327181733..e3f0e9d4c 100644 --- a/examples/lora/README.md +++ b/examples/lora/README.md @@ -34,10 +34,3 @@ make This will build RadioLib and then the example application for both ARM and RISC-V architectures. - -If you wish to use the RadioLib build infrastructure to build -RadioLib (instead of the libtock-c system) you can also use - -```shell -CMAKE=1 make -``` diff --git a/examples/lora/sensor-receive/Makefile b/examples/lora/sensor-receive/Makefile index 395197b5c..db7be19e3 100644 --- a/examples/lora/sensor-receive/Makefile +++ b/examples/lora/sensor-receive/Makefile @@ -6,56 +6,11 @@ TOCK_USERLAND_BASE_DIR = ../../../ # Which files to compile. CXX_SRCS := $(wildcard *.cc) -# Include the core RadioLib headers -override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/src - -# Include the Tock specific headers -override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock - -# Include the base of libtock-c to fix the libtock/ includes from RadioLib -override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/ - -ifeq ($(CMAKE),1) -# Use the RadioLib cmake build infrastructure -LIBS_cortex-m += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a -LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a -LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a -LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a -LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a - -LIBS_rv32i += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a -LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a -LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a - -# Include userland master makefile. Contains rules and flags for actually -# building the application. -include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk - -$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a: - cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \ - rm -rf build-arm && \ - mkdir -p build-arm && cd build-arm && \ - LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" .. && \ - $(MAKE) -j4 2> /dev/null || true - -$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a: - cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \ - rm -rf build-riscv && \ - mkdir -p build-riscv && cd build-riscv && \ - LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \ - $(MAKE) -j4 2> /dev/null || true -else # Use the libtock-c Make system -LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m0/RadioLib.a -LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m3/RadioLib.a -LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m4/RadioLib.a -LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m7/RadioLib.a - -LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imc/RadioLib.a -LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imac/RadioLib.a - EXTERN_LIBS := $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib -include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile + +# `EXTERN_LIBS` points to `libradio/RadioLib` so we pull in `Makefile.app` +# manually. +include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile.app include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk -endif diff --git a/examples/lora/sensor-transmit/Makefile b/examples/lora/sensor-transmit/Makefile index 395197b5c..db7be19e3 100644 --- a/examples/lora/sensor-transmit/Makefile +++ b/examples/lora/sensor-transmit/Makefile @@ -6,56 +6,11 @@ TOCK_USERLAND_BASE_DIR = ../../../ # Which files to compile. CXX_SRCS := $(wildcard *.cc) -# Include the core RadioLib headers -override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/src - -# Include the Tock specific headers -override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock - -# Include the base of libtock-c to fix the libtock/ includes from RadioLib -override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/ - -ifeq ($(CMAKE),1) -# Use the RadioLib cmake build infrastructure -LIBS_cortex-m += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a -LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a -LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a -LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a -LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a - -LIBS_rv32i += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a -LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a -LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a - -# Include userland master makefile. Contains rules and flags for actually -# building the application. -include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk - -$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a: - cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \ - rm -rf build-arm && \ - mkdir -p build-arm && cd build-arm && \ - LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" .. && \ - $(MAKE) -j4 2> /dev/null || true - -$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a: - cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \ - rm -rf build-riscv && \ - mkdir -p build-riscv && cd build-riscv && \ - LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \ - $(MAKE) -j4 2> /dev/null || true -else # Use the libtock-c Make system -LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m0/RadioLib.a -LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m3/RadioLib.a -LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m4/RadioLib.a -LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m7/RadioLib.a - -LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imc/RadioLib.a -LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imac/RadioLib.a - EXTERN_LIBS := $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib -include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile + +# `EXTERN_LIBS` points to `libradio/RadioLib` so we pull in `Makefile.app` +# manually. +include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile.app include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk -endif diff --git a/libradio/Makefile.app b/libradio/Makefile.app new file mode 100644 index 000000000..85fe6af6b --- /dev/null +++ b/libradio/Makefile.app @@ -0,0 +1,5 @@ +# Include the core RadioLib headers +override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/src + +# Include the Tock specific headers +override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock \ No newline at end of file