diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-11-06 10:33:49 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-11-06 10:33:49 +0000 |
| commit | ab3e17547f9cb49a7b78aca9da76de8556e1d6f0 (patch) | |
| tree | ded0637397cb7414e1587771e2b9c61f8ca19ed5 | |
| parent | c7dab5762e8cdd914568e05bf85209bfbbaef639 (diff) | |
| download | ChibiOS-ab3e17547f9cb49a7b78aca9da76de8556e1d6f0.tar.gz ChibiOS-ab3e17547f9cb49a7b78aca9da76de8556e1d6f0.tar.bz2 ChibiOS-ab3e17547f9cb49a7b78aca9da76de8556e1d6f0.zip | |
Fixed code:blocks STM32F103 project example.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2333 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM3-STM32F103-GCC/codeblocks/ch/ch.cbp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/demos/ARMCM3-STM32F103-GCC/codeblocks/ch/ch.cbp b/demos/ARMCM3-STM32F103-GCC/codeblocks/ch/ch.cbp index 82c5f1179..b3bffac75 100644 --- a/demos/ARMCM3-STM32F103-GCC/codeblocks/ch/ch.cbp +++ b/demos/ARMCM3-STM32F103-GCC/codeblocks/ch/ch.cbp @@ -42,11 +42,11 @@ <Add directory="..\..\..\ARMCM3-STM32F103-GCC" /> <Add directory="..\..\..\..\os\kernel\include" /> <Add directory="..\..\..\..\os\ports\GCC\ARMCMx" /> - <Add directory="..\..\..\..\os\ports\GCC\ARMCMx\STM32F10x" /> + <Add directory="..\..\..\..\os\ports\GCC\ARMCMx\STM32" /> + <Add directory="..\..\..\..\os\ports\GCC\ARMCMx\cmsis" /> <Add directory="..\..\..\..\os\hal\include" /> <Add directory="..\..\..\..\os\hal\platforms\STM32" /> <Add directory="..\..\..\..\boards\OLIMEX_STM32_P103" /> - <Add directory="..\..\..\..\os\ports\GCC\ARMCMx\cmsis" /> <Add directory="..\..\..\..\test" /> </Compiler> <Linker> @@ -224,10 +224,8 @@ <Unit filename="..\..\..\..\os\kernel\src\chvt.c"> <Option compilerVar="CC" /> </Unit> - <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\STM32F10x\cmparams.h" /> - <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\STM32F10x\vectors.s"> - <Option compiler="armelfgcc" use="1" buildCommand="$compiler -x assembler-with-cpp $options $includes -c $file -o $object" /> - </Unit> + <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\STM32\cmparams.h" /> + <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\STM32\vectors_md.s" /> <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\chcore.c"> <Option compilerVar="CC" /> </Unit> @@ -238,9 +236,7 @@ <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\chcore_v7m.h" /> <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\chtypes.h" /> <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\cmsis\core_cm0.h" /> - <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\crt0.s"> - <Option compiler="armelfgcc" use="1" buildCommand="$compiler -x assembler-with-cpp $options $includes -c $file -o $object" /> - </Unit> + <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\crt0_v7m.s" /> <Unit filename="..\..\..\..\os\ports\GCC\ARMCMx\nvic.c"> <Option compilerVar="CC" /> </Unit> |