aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2009-07-22 20:44:31 +0200
committerPiotr Esden-Tempski2009-07-22 20:44:31 +0200
commit8bdcef8d78dcff57acb037c2b713790d5effd13d (patch)
tree841c0a624ab369549a2163d9d182d1069cf88b2c /examples
parentb6a49764958da52765e8867fb305e2b0027d3435 (diff)
Examples now use the toolchain installed libopenstm32 in default setting. (Uncomment TOOLCHAIN_* lines to use local one)
Diffstat (limited to 'examples')
-rw-r--r--examples/fancyblink/Makefile11
-rw-r--r--examples/miniblink/Makefile11
2 files changed, 18 insertions, 4 deletions
diff --git a/examples/fancyblink/Makefile b/examples/fancyblink/Makefile
index b2790f6..09ec0ee 100644
--- a/examples/fancyblink/Makefile
+++ b/examples/fancyblink/Makefile
@@ -25,9 +25,16 @@ CC = $(PREFIX)-gcc
LD = $(PREFIX)-ld
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
-CFLAGS = -O0 -g -Wall -Wextra -I../../include -fno-common \
+
+TOOLCHAIN_LIB_DIR = `dirname \`which $(CC)\``/../$(PREFIX)/lib
+#TOOLCHAIN_LIB_DIR = ../../lib # uncomment for local directory builds
+
+TOOLCHAIN_INCLUDE_DIR =
+#TOOLCHAIN_INCLUDE_DIR = ../../include # uncomment for local directory builds
+
+CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_INCLUDE_DIR) -fno-common \
-mcpu=cortex-m3 -mthumb
-LDFLAGS = -L../../lib -T$(BINARY).ld -nostartfiles
+LDFLAGS = -T$(BINARY).ld -nostartfiles -L$(TOOLCHAIN_LIB_DIR)
OBJS = $(BINARY).o
OPENOCD = openocd
diff --git a/examples/miniblink/Makefile b/examples/miniblink/Makefile
index 4ffcff8..1b5bd89 100644
--- a/examples/miniblink/Makefile
+++ b/examples/miniblink/Makefile
@@ -25,9 +25,16 @@ CC = $(PREFIX)-gcc
LD = $(PREFIX)-ld
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
-CFLAGS = -O0 -g -Wall -Wextra -I../../include -fno-common \
+
+TOOLCHAIN_LIB_DIR = `dirname \`which $(CC)\``/../$(PREFIX)/lib
+#TOOLCHAIN_LIB_DIR = ../../lib # uncomment for local directory builds
+
+TOOLCHAIN_INCLUDE_DIR =
+#TOOLCHAIN_INCLUDE_DIR = ../../include # uncomment for local directory builds
+
+CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_INCLUDE_DIR) -fno-common \
-mcpu=cortex-m3 -mthumb
-LDFLAGS = -L../../lib -T$(BINARY).ld -nostartfiles
+LDFLAGS = -T$(BINARY).ld -nostartfiles -L$(TOOLCHAIN_LIB_DIR)
OBJS = $(BINARY).o
OPENOCD = openocd