From a9df1314e96010ed2163d23f8d8ce64cfd7a0d45 Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Sat, 16 Jun 2012 16:57:48 -0500 Subject: [PATCH] Explicitly including stm32f0xx_conf.h in Libraries makefile fixes compile warings/errors --- Libraries/Makefile | 2 +- Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_dac.c | 1 - {Device => Libraries}/stm32f0xx_conf.h | 0 Makefile | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) rename {Device => Libraries}/stm32f0xx_conf.h (100%) diff --git a/Libraries/Makefile b/Libraries/Makefile index c624147..045985a 100755 --- a/Libraries/Makefile +++ b/Libraries/Makefile @@ -8,7 +8,7 @@ vpath %.c STM32F0xx_StdPeriph_Driver/src CFLAGS = -g -O2 -Wall CFLAGS += -mlittle-endian -mthumb -mcpu=cortex-m0 -march=armv6s-m CFLAGS += -ffreestanding -nostdlib -CFLAGS += -I../Device -ICMSIS/Include -ICMSIS/Device/ST/STM32F0xx/Include -ISTM32F0xx_StdPeriph_Driver/inc +CFLAGS += -includestm32f0xx_conf.h -ICMSIS/Include -ICMSIS/Device/ST/STM32F0xx/Include -ISTM32F0xx_StdPeriph_Driver/inc SRCS = stm32f0xx_adc.c stm32f0xx_cec.c stm32f0xx_comp.c stm32f0xx_crc.c \ diff --git a/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_dac.c b/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_dac.c index fd96a0d..752c7c0 100644 --- a/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_dac.c +++ b/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_dac.c @@ -98,7 +98,6 @@ /* Includes ------------------------------------------------------------------*/ #include "stm32f0xx_dac.h" -#include "stm32f0xx_rcc.h" /** @addtogroup STM32F0xx_StdPeriph_Driver * @{ diff --git a/Device/stm32f0xx_conf.h b/Libraries/stm32f0xx_conf.h similarity index 100% rename from Device/stm32f0xx_conf.h rename to Libraries/stm32f0xx_conf.h diff --git a/Makefile b/Makefile index 02b9cfe..78613af 100755 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ vpath %.a Libraries ROOT=$(shell pwd) -CFLAGS += -Iinc -IDevice -ILibraries/CMSIS/Device/ST/STM32F0xx/Include +CFLAGS += -Iinc -ILibraries -ILibraries/CMSIS/Device/ST/STM32F0xx/Include CFLAGS += -ILibraries/CMSIS/Include -ILibraries/STM32F0xx_StdPeriph_Driver/inc SRCS += Device/startup_stm32f0xx.s # add startup file to build