create project.uvprojx by scons mdk5 and delete some useless files

056b3bed · hillcode · 136b9858 · 056b3bed · 056b3bed
隐藏空白更改
内联并排

Showing with 5 addition and 1 deletion

bsp/lpc5410x/project.uvoptx bsp/lpc5410x/project.uvoptx +1 -1

bsp/lpc5410x/project.uvprojx bsp/lpc5410x/project.uvprojx +4 -0

未找到文件。
--- a/bsp/lpc5410x/project.uvoptx
+++ b/bsp/lpc5410x/project.uvoptx
@@ -167,7 +167,7 @@

  <Group>
    <GroupName>Applications</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
    <tvExpOptDlg>0</tvExpOptDlg>
    <cbSel>0</cbSel>
    <RteFlg>0</RteFlg>

--- a/bsp/lpc5410x/project.uvprojx
+++ b/bsp/lpc5410x/project.uvprojx
@@ -365,7 +365,11 @@
              <MiscControls></MiscControls>
              <Define>CORE_M4</Define>
              <Undefine></Undefine>
+<<<<<<< HEAD
              <IncludePath>.;..\..\components\drivers\include;..\..\components\finsh;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;Libraries\CMSIS\Include;Libraries\lpc_chip\chip_5410x;Libraries\lpc_chip\chip_5410x\config;Libraries\lpc_chip\chip_common;applications;drivers</IncludePath>
+=======
+              <IncludePath>applications;.;drivers;Libraries\CMSIS\Include;Libraries\lpc_chip\chip_common;Libraries\lpc_chip\chip_5410x;Libraries\lpc_chip\chip_5410x\config;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh</IncludePath>
+>>>>>>> f68b03f089805f585e6f634b0db80e377344c21d
            </VariousControls>
          </Cads>
          <Aads>