Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware

[hackover2013-badge-firmware.git] / build / crossworks / LPC1343_CodeBase.hzp

diff --git a/build/crossworks/LPC1343_CodeBase.hzp b/build/crossworks/LPC1343_CodeBase.hzp
index c05e75e..962314b 100644 (file)
--- a/build/crossworks/LPC1343_CodeBase.hzp
+++ b/build/crossworks/LPC1343_CodeBase.hzp
@@ -73,6 +73,7 @@
             <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
             <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
           </file>
+          <file file_name="../../core/cmd/ansi.h"/>
         </folder>
         <folder Name="usbcdc">
           <file file_name="../../core/usbcdc/cdcuser.c">
@@ -103,6 +104,9 @@
         <folder Name="pwm">
           <file file_name="../../core/pwm/pwm.c"/>
         </folder>
+        <folder Name="swspi">
+          <file file_name="../../core/swspi/swspi.c"/>
+        </folder>
       </folder>
       <file file_name="../../lpc134x.h"/>
       <file file_name="../../projectconfig.h"/>
@@ -122,6 +126,9 @@
           <folder Name="tcs3414">
             <file file_name="../../drivers/sensors/tcs3414/tcs3414.c"/>
           </folder>
+          <folder Name="ina219">
+            <file file_name="../../drivers/sensors/ina219/ina219.c"/>
+          </folder>
         </folder>
         <folder Name="displays" file_name="">
           <folder Name="bitmap">
@@ -167,6 +174,10 @@
                 <configuration Name="THUMB Flash Debug" build_exclude_from_build="Yes"/>
                 <configuration Name="THUMB Flash Release" build_exclude_from_build="Yes"/>
               </file>
+              <file file_name="../../drivers/displays/tft/hw/hx8347d.c">
+                <configuration Name="THUMB Flash Release" build_exclude_from_build="Yes"/>
+                <configuration Name="THUMB Flash Debug" build_exclude_from_build="Yes"/>
+              </file>
             </folder>
             <folder Name="fonts">
               <file file_name="../../drivers/displays/tft/fonts/dejavusans9.c">
@@ -211,9 +222,6 @@
             <file file_name="../../drivers/displays/tft/lcd.h"/>
             <file file_name="../../drivers/displays/tft/touchscreen.c"/>
             <folder Name="aafonts">
-              <folder Name="aa4">
-                <file file_name="../../drivers/displays/tft/aafonts/aa4/FontCalibri18_AA4.c"/>
-              </folder>
               <folder Name="aa2">
                 <file file_name="../../drivers/displays/tft/aafonts/aa2/DejaVuSansCondensed14_AA2.c"/>
                 <file file_name="../../drivers/displays/tft/aafonts/aa2/DejaVuSansCondensedBold14_AA2.c"/>
@@ -236,6 +244,7 @@
               <file file_name="../../drivers/displays/tft/controls/label.c"/>
               <file file_name="../../drivers/displays/tft/controls/labelcentered.c"/>
             </folder>
+            <file file_name="../../drivers/displays/tft/theme.c"/>
           </folder>
           <folder Name="character">
             <folder Name="samsung_20T202DA2JA">
@@ -275,6 +284,9 @@
           <folder Name="mcp4725">
             <file file_name="../../drivers/dac/mcp4725/mcp4725.c"/>
           </folder>
+          <folder Name="mcp4901">
+            <file file_name="../../drivers/dac/mcp4901/mcp4901.c"/>
+          </folder>
         </folder>
         <folder Name="rtc">
           <folder Name="isl12022m">
@@ -319,6 +331,11 @@
             <file file_name="../../drivers/storage/spiflash/spiflash.h"/>
           </folder>
         </folder>
+        <folder Name="audio">
+          <folder Name="tea5767">
+            <file file_name="../../drivers/audio/tea5767/tea5767.c"/>
+          </folder>
+        </folder>
       </folder>
       <file file_name="../../sysinit.c"/>
       <folder Name="project">
@@ -389,6 +406,7 @@
           </folder>
           <file file_name="../../project/commands/cmd_uart.c"/>
           <file file_name="../../project/commands/cmd_reset.c"/>
+          <file file_name="../../project/commands/cmd_pwm.c"/>
         </folder>
         <file file_name="../../project/cmd_tbl.h"/>
       </folder>
@@ -415,5 +433,5 @@
   <configuration Name="Debug" build_debug_information="Yes" c_preprocessor_definitions="DEBUG" gcc_optimization_level="None" hidden="Yes" link_include_startup_code="No"/>
   <configuration Name="THUMB Flash Release" inherited_configurations="THUMB;Flash;Release"/>
   <configuration Name="Release" build_debug_information="No" build_remove_unused_symbols="Yes" c_additional_options="-g1" c_preprocessor_definitions="NDEBUG;STARTUP_FROM_RESET" gcc_optimization_level="Optimize For Size" hidden="Yes" link_include_startup_code="No"/>
-  <configuration Name="Common" arm_linker_allow_multiple_definition="Yes" c_user_include_directories="$(ProjectDir)/../../;$(ProjectDir)/../../Project/"/>
+  <configuration Name="Common" arm_gcc_target="arm-unknown-eabi" arm_library_optimization="Small" arm_linker_allow_multiple_definition="Yes" c_user_include_directories="$(ProjectDir)/../../;$(ProjectDir)/../../Project/"/>
 </solution>