diff --git a/platforms/stm32-f103rb-nucleo/spp_and_le_counter.c b/example/embedded/spp_and_le_counter.c similarity index 100% rename from platforms/stm32-f103rb-nucleo/spp_and_le_counter.c rename to example/embedded/spp_and_le_counter.c diff --git a/example/libusb/Makefile b/example/libusb/Makefile index 5d3f311b1..569618137 100644 --- a/example/libusb/Makefile +++ b/example/libusb/Makefile @@ -9,8 +9,10 @@ CFLAGS += -I${BTSTACK_ROOT}/include CFLAGS += -I${BTSTACK_ROOT}/src CFLAGS += -I${BTSTACK_ROOT} -CFLAGS += $(shell pkg-config libusb-1.0 --cflags) -LDFLAGS += $(shell pkg-config libusb-1.0 --libs) +# CFLAGS += $(shell pkg-config libusb-1.0 --cflags) +# LDFLAGS += $(shell pkg-config libusb-1.0 --libs) +CFLAGS += -I/usr/local/include/libusb-1.0 +LDFLAGS += -L/usr/local/lib -lusb-1.0 CORE = \ ${BTSTACK_ROOT}/src/btstack_memory.c \ diff --git a/platforms/stm32-f103rb-nucleo/Makefile b/platforms/stm32-f103rb-nucleo/Makefile index f35eb1424..c0c9a1d09 100644 --- a/platforms/stm32-f103rb-nucleo/Makefile +++ b/platforms/stm32-f103rb-nucleo/Makefile @@ -3,11 +3,12 @@ # # BINARY=led_counter -# BINARY=spp_and_le_counter +BINARY=spp_and_le_counter OPENCM3_DIR = libopencm3 LDSCRIPT = stm32f1-nucleo.ld BTSTACK_ROOT = ../.. +VPATH = $(BTSTACK_ROOT)/example/embedded CORE = \ main.c \ diff --git a/platforms/stm32-f103rb-nucleo/libopencm3.rules.mk b/platforms/stm32-f103rb-nucleo/libopencm3.rules.mk index 9568d30cc..f6cb5cfef 100644 --- a/platforms/stm32-f103rb-nucleo/libopencm3.rules.mk +++ b/platforms/stm32-f103rb-nucleo/libopencm3.rules.mk @@ -131,8 +131,8 @@ LDLIBS += -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group # srec: $(BINARY).srec # list: $(BINARY).list -images: $(BINARY).images -flash: $(BINARY).flash +# images: $(BINARY).images +# flash: $(BINARY).flash %.images: %.bin %.hex %.srec %.list %.map @#printf "*** $* images generated ***\n" @@ -159,15 +159,15 @@ flash: $(BINARY).flash %.o: %.c @#printf " CC $(*).c\n" - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(ARCH_FLAGS) -o $(*).o -c $(*).c + $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(ARCH_FLAGS) -o $(*).o -c $< %.o: %.cxx @#printf " CXX $(*).cxx\n" - $(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(ARCH_FLAGS) -o $(*).o -c $(*).cxx + $(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(ARCH_FLAGS) -o $(*).o -c $< %.o: %.cpp @#printf " CXX $(*).cpp\n" - $(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(ARCH_FLAGS) -o $(*).o -c $(*).cpp + $(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(ARCH_FLAGS) -o $(*).o -c $< # clean: # @#printf " CLEAN\n"