Skip to content

Commit

Permalink
examples: lora: Remove cmake build option
Browse files Browse the repository at this point in the history
Signed-off-by: Alistair Francis <[email protected]>
  • Loading branch information
alistair23 committed Jul 9, 2024
1 parent e9ef5df commit e0ddbe6
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 69 deletions.
7 changes: 0 additions & 7 deletions examples/lora/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
31 changes: 0 additions & 31 deletions examples/lora/sensor-receive/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,6 @@ override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/exampl
# 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
Expand All @@ -58,4 +28,3 @@ EXTERN_LIBS := $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib
include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile

include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
endif
31 changes: 0 additions & 31 deletions examples/lora/sensor-transmit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,6 @@ override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/exampl
# 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
Expand All @@ -58,4 +28,3 @@ EXTERN_LIBS := $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib
include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile

include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
endif

0 comments on commit e0ddbe6

Please sign in to comment.