Merge branch 'master' of git://github.com/microbuilder/LPC1343CodeBase

[hackover2013-badge-firmware.git] / build / codelite / LPC1343_CodeBase.project

diff --git a/build/codelite/LPC1343_CodeBase.project b/build/codelite/LPC1343_CodeBase.project
index ad75d70..d2b88b4 100644 (file)
--- a/build/codelite/LPC1343_CodeBase.project
+++ b/build/codelite/LPC1343_CodeBase.project
@@ -168,10 +168,6 @@
           <File Name="../../drivers/displays/tft/fonts/verdanabold14.c"/>
           <File Name="../../drivers/displays/tft/fonts/verdanabold14.h"/>
         </VirtualDirectory>
           <File Name="../../drivers/displays/tft/fonts/verdanabold14.c"/>
           <File Name="../../drivers/displays/tft/fonts/verdanabold14.h"/>
         </VirtualDirectory>

-        <VirtualDirectory Name="dialogues">
-          <File Name="../../drivers/displays/tft/dialogues/alphanumeric.c"/>
-          <File Name="../../drivers/displays/tft/dialogues/alphanumeric.h"/>
-        </VirtualDirectory>

         <File Name="../../drivers/displays/tft/bmp.c"/>
         <File Name="../../drivers/displays/tft/bmp.h"/>
         <File Name="../../drivers/displays/tft/colors.h"/>
         <File Name="../../drivers/displays/tft/bmp.c"/>
         <File Name="../../drivers/displays/tft/bmp.h"/>
         <File Name="../../drivers/displays/tft/colors.h"/>


@@ -201,6 +197,22 @@
           <VirtualDirectory Name="aa4"/>
         </VirtualDirectory>
         <File Name="../../drivers/displays/tft/colors.c"/>
           <VirtualDirectory Name="aa4"/>
         </VirtualDirectory>
         <File Name="../../drivers/displays/tft/colors.c"/>

+        <VirtualDirectory Name="controls">
+          <File Name="../../drivers/displays/tft/controls/button.c"/>
+          <File Name="../../drivers/displays/tft/controls/button.h"/>
+          <File Name="../../drivers/displays/tft/controls/hsbchart.c"/>
+          <File Name="../../drivers/displays/tft/controls/hsbchart.h"/>
+          <File Name="../../drivers/displays/tft/controls/huechart.c"/>
+          <File Name="../../drivers/displays/tft/controls/huechart.h"/>
+          <File Name="../../drivers/displays/tft/controls/label.c"/>
+          <File Name="../../drivers/displays/tft/controls/label.h"/>
+          <File Name="../../drivers/displays/tft/controls/labelcentered.c"/>
+          <File Name="../../drivers/displays/tft/controls/labelcentered.h"/>
+          <File Name="../../drivers/displays/tft/controls/progressbar.c"/>
+          <File Name="../../drivers/displays/tft/controls/progressbar.h"/>
+        </VirtualDirectory>
+        <File Name="../../drivers/displays/tft/theme.c"/>
+        <File Name="../../drivers/displays/tft/theme.h"/>

       </VirtualDirectory>
       <VirtualDirectory Name="bitmap">
         <VirtualDirectory Name="st7565">
       </VirtualDirectory>
       <VirtualDirectory Name="bitmap">
         <VirtualDirectory Name="st7565">


@@ -358,7 +370,7 @@
       </Linker>
       <ResourceCompiler Options=""/>
     </GlobalSettings>
       </Linker>
       <ResourceCompiler Options=""/>
     </GlobalSettings>

-    <Configuration Name="Debug" CompilerType="gnu gcc" DebuggerType="GNU gdb debugger Cortex M3" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
+    <Configuration Name="Debug" CompilerType="gnu gcc" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">

       <Compiler Options="-g" C_Options="-g" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
         <IncludePath Value="."/>
       </Compiler>
       <Compiler Options="-g" C_Options="-g" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
         <IncludePath Value="."/>
       </Compiler>


@@ -368,7 +380,7 @@
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>

-      <Debugger IsRemote="yes" RemoteHostName="localhost" RemoteHostPort="2331" DebuggerPath="arm-none-eabi-gdb.exe">
+      <Debugger IsRemote="yes" RemoteHostName="localhost" RemoteHostPort="2331" DebuggerPath="C:\yagarto\bin\arm-none-eabi-gdb.exe">

         <PostConnectCommands/>
         <StartupCommands># Make sure that we are using SWD
 monitor interface SWD
         <PostConnectCommands/>
         <StartupCommands># Make sure that we are using SWD
 monitor interface SWD