From 8f251e8a9d46634be4741f7f1aef3d52fb1b7dba Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 31 Dec 2010 18:18:39 +0100 Subject: Some more file/path restructuring. All #includes now explicitly use the "" format. If you want to get rid of the "libopencm3" prefix in your local project you can add a respective -I entry in your Makefile (not recommended though). All .ld files and .a libs are installed in $(TOOLCHAIN_DIR)/lib directly (as before), but are now renamed to avoid potential conflicts now or in the future. Examples: libopencm3_lpc13xx.a libopencm3_lpc13xx.ld libopencm3_stm32.a libopencm3_stm32.ld --- examples/lpc13xx/Makefile.include | 3 +-- examples/lpc13xx/lpc-p1343/miniblink/miniblink.c | 4 ++-- examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'examples/lpc13xx') diff --git a/examples/lpc13xx/Makefile.include b/examples/lpc13xx/Makefile.include index 58d2925..6e80fd5 100644 --- a/examples/lpc13xx/Makefile.include +++ b/examples/lpc13xx/Makefile.include @@ -30,8 +30,7 @@ TOOLCHAIN_DIR = ../../../.. CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ -mcpu=cortex-m3 -mthumb LDSCRIPT = $(BINARY).ld -LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/libopencm3 \ - -L$(TOOLCHAIN_DIR)/lib/lpc13xx \ +LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/lpc13xx \ -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections OBJS += $(BINARY).o diff --git a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c index 530da21..505b604 100644 --- a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c +++ b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -// #include -#include +// #include +#include void gpio_setup(void) { diff --git a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld index d0fdd36..0bffae1 100644 --- a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld +++ b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld @@ -27,5 +27,5 @@ MEMORY } /* Include the common ld script. */ -INCLUDE lpc13xx.ld +INCLUDE libopencm3_lpc13xx.ld -- cgit v1.2.3