Skip to content

Commit bd69ff8

Browse files
alistair23alistair23
committed
examples: lora: Remove cmake build option
Signed-off-by: Alistair Francis <[email protected]>
1 parent e152cd1 commit bd69ff8

File tree

4 files changed

+13
-103
lines changed

4 files changed

+13
-103
lines changed

‎examples/lora/README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,3 @@ make
3434

3535
This will build RadioLib and then the example application for
3636
both ARM and RISC-V architectures.
37-
38-
If you wish to use the RadioLib build infrastructure to build
39-
RadioLib (instead of the libtock-c system) you can also use
40-
41-
```shell
42-
CMAKE=1 make
43-
```

‎examples/lora/sensor-receive/Makefile

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,12 @@ TOCK_USERLAND_BASE_DIR = ../../../
66
# Which files to compile.
77
CXX_SRCS := $(wildcard *.cc)
88

9-
# Include the core RadioLib headers
10-
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/src
11-
12-
# Include the Tock specific headers
13-
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock
14-
15-
# Include the base of libtock-c to fix the libtock/ includes from RadioLib
16-
override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/
17-
18-
ifeq ($(CMAKE),1)
19-
# Use the RadioLib cmake build infrastructure
20-
LIBS_cortex-m += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
21-
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
22-
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
23-
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
24-
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
25-
26-
LIBS_rv32i += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
27-
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
28-
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
29-
30-
# Include userland master makefile. Contains rules and flags for actually
31-
# building the application.
32-
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
33-
34-
$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
35-
cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \
36-
rm -rf build-arm && \
37-
mkdir -p build-arm && cd build-arm && \
38-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" .. && \
39-
$(MAKE) -j4 2> /dev/null || true
40-
41-
$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
42-
cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \
43-
rm -rf build-riscv && \
44-
mkdir -p build-riscv && cd build-riscv && \
45-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
46-
$(MAKE) -j4 2> /dev/null || true
47-
else
489
# Use the libtock-c Make system
49-
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m0/RadioLib.a
50-
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m3/RadioLib.a
51-
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m4/RadioLib.a
52-
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m7/RadioLib.a
53-
54-
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imc/RadioLib.a
55-
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imac/RadioLib.a
56-
5710
EXTERN_LIBS := $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib
5811
include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile
5912

13+
# `EXTERN_LIBS` points to `libradio/RadioLib` so we pull in `Makefile.app`
14+
# manually.
15+
include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile.app
16+
6017
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
61-
endif

‎examples/lora/sensor-transmit/Makefile

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,12 @@ TOCK_USERLAND_BASE_DIR = ../../../
66
# Which files to compile.
77
CXX_SRCS := $(wildcard *.cc)
88

9-
# Include the core RadioLib headers
10-
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/src
11-
12-
# Include the Tock specific headers
13-
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock
14-
15-
# Include the base of libtock-c to fix the libtock/ includes from RadioLib
16-
override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/
17-
18-
ifeq ($(CMAKE),1)
19-
# Use the RadioLib cmake build infrastructure
20-
LIBS_cortex-m += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
21-
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
22-
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
23-
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
24-
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
25-
26-
LIBS_rv32i += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
27-
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
28-
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
29-
30-
# Include userland master makefile. Contains rules and flags for actually
31-
# building the application.
32-
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
33-
34-
$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
35-
cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \
36-
rm -rf build-arm && \
37-
mkdir -p build-arm && cd build-arm && \
38-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" .. && \
39-
$(MAKE) -j4 2> /dev/null || true
40-
41-
$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
42-
cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \
43-
rm -rf build-riscv && \
44-
mkdir -p build-riscv && cd build-riscv && \
45-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
46-
$(MAKE) -j4 2> /dev/null || true
47-
else
489
# Use the libtock-c Make system
49-
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m0/RadioLib.a
50-
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m3/RadioLib.a
51-
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m4/RadioLib.a
52-
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m7/RadioLib.a
53-
54-
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imc/RadioLib.a
55-
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imac/RadioLib.a
56-
5710
EXTERN_LIBS := $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib
5811
include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile
5912

13+
# `EXTERN_LIBS` points to `libradio/RadioLib` so we pull in `Makefile.app`
14+
# manually.
15+
include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile.app
16+
6017
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
61-
endif

‎libradio/Makefile.app

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Include the core RadioLib headers
2+
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/src
3+
4+
# Include the Tock specific headers
5+
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock

0 commit comments

Comments
 (0)