From 2d6bb86360570605264ca50c9801cf09a8ef9a32 Mon Sep 17 00:00:00 2001
From: "dzzxzz@gmail.com" <dzzxzz@gmail.com>
Date: Thu, 20 Sep 2012 07:41:04 +0000
Subject: [PATCH] fixed a compiling error while components_init.h changed to
 components.h

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2300 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 bsp/ls1bdev/applications/application.c   | 2 +-
 bsp/ls1bdev/rtconfig.h                   | 2 +-
 bsp/mb9bf506r/applications/application.c | 2 +-
 bsp/mb9bf506r/project.ewp                | 2 +-
 bsp/mb9bf506r/project.uvopt              | 4 ++--
 bsp/mb9bf506r/project.uvproj             | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bsp/ls1bdev/applications/application.c b/bsp/ls1bdev/applications/application.c
index 282620fff2..d010f0f220 100644
--- a/bsp/ls1bdev/applications/application.c
+++ b/bsp/ls1bdev/applications/application.c
@@ -17,7 +17,7 @@
 #include <ls1b.h>
 
 #ifdef RT_USING_COMPONENTS_INIT
-#include <components_init.h>
+#include <components.h>
 #endif
 
 #ifdef RT_USING_RTGUI
diff --git a/bsp/ls1bdev/rtconfig.h b/bsp/ls1bdev/rtconfig.h
index 8a2ad89a44..347f25b052 100644
--- a/bsp/ls1bdev/rtconfig.h
+++ b/bsp/ls1bdev/rtconfig.h
@@ -189,7 +189,7 @@
 // </section>
 
 // <section name="RT_USING_RTGUI" description="RTGUI, a graphic user interface" default="true" >
-#define RT_USING_RTGUI
+// #define RT_USING_RTGUI
 // <integer name="RTGUI_NAME_MAX" description="Maximal size of RTGUI object name length" default="16" />
 #define RTGUI_NAME_MAX	16
 // <bool name="RTGUI_USING_FONT16" description="Support 16 weight font" default="true" />
diff --git a/bsp/mb9bf506r/applications/application.c b/bsp/mb9bf506r/applications/application.c
index c5dcaf5f1c..15877dd151 100644
--- a/bsp/mb9bf506r/applications/application.c
+++ b/bsp/mb9bf506r/applications/application.c
@@ -23,7 +23,7 @@
 #include "led.h"
 
 #ifdef RT_USING_COMPONENTS_INIT
-#include <components_init.h>
+#include <components.h>
 #endif
 
 #ifdef RT_USING_DFS
diff --git a/bsp/mb9bf506r/project.ewp b/bsp/mb9bf506r/project.ewp
index fa3492b420..63100e2d6c 100644
--- a/bsp/mb9bf506r/project.ewp
+++ b/bsp/mb9bf506r/project.ewp
@@ -1857,7 +1857,7 @@
   <group>
     <name>Components</name>
     <file>
-      <name>$PROJ_DIR$\..\..\components\init\components_init.c</name>
+      <name>$PROJ_DIR$\..\..\components\init\components.c</name>
     </file>
   </group>
   <group>
diff --git a/bsp/mb9bf506r/project.uvopt b/bsp/mb9bf506r/project.uvopt
index 568c5aee58..b6139c711c 100644
--- a/bsp/mb9bf506r/project.uvopt
+++ b/bsp/mb9bf506r/project.uvopt
@@ -797,8 +797,8 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\components\init\components_init.c</PathWithFileName>
-      <FilenameWithoutPath>components_init.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\components\init\components.c</PathWithFileName>
+      <FilenameWithoutPath>components.c</FilenameWithoutPath>
     </File>
   </Group>
 
diff --git a/bsp/mb9bf506r/project.uvproj b/bsp/mb9bf506r/project.uvproj
index c270d1dd2a..5707f6c5f3 100644
--- a/bsp/mb9bf506r/project.uvproj
+++ b/bsp/mb9bf506r/project.uvproj
@@ -624,9 +624,9 @@
           <GroupName>Components</GroupName>
           <Files>
             <File>
-              <FileName>components_init.c</FileName>
+              <FileName>components.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\init\components_init.c</FilePath>
+              <FilePath>..\..\components\init\components.c</FilePath>
             </File>
           </Files>
         </Group>
-- 
GitLab