revert RTGUI path in SConstruct, update applications/platform.c

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2462 bbd45198-f89e-11dd-88c7-29a3b14d5316

2 files changed, 5 insertions, 9 deletions

diff --git a/bsp/simulator/SConstruct b/bsp/simulator/SConstruct
index 25ade08977..c58b6c1acb 100644
--- a/bsp/simulator/SConstruct
+++ b/bsp/simulator/SConstruct
@@ -12,8 +12,8 @@ if os.getenv('RTT_RTGUI'):
 else:

     # set the rtgui root directory by hand

     # empty string means use the RTGUI in svn

-    RTT_RTGUI = os.path.normpath(r'F:\Project\git\rt-gui\components\rtgui')

-    # RTT_RTGUI =''

+    # RTT_RTGUI = os.path.normpath(r'F:\Project\git\rt-gui\components\rtgui')

+    RTT_RTGUI =''

 

 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]

 from building import *

diff --git a/bsp/simulator/applications/platform.c b/bsp/simulator/applications/platform.c
index 84b9147103..d137be0bf9 100644
--- a/bsp/simulator/applications/platform.c
+++ b/bsp/simulator/applications/platform.c
@@ -5,25 +5,21 @@ void rt_platform_init(void)
 {

 #ifdef RT_USING_DFS

     /* initilize sd card */

-#ifdef RT_USING_DFS_ELMFAT

     rt_hw_sdcard_init();

-#endif 

 

-#if defined(RT_USING_MTD_NAND) && defined(RT_USING_DFS_UFFS)

+#if defined(RT_USING_MTD_NAND)

     rt_hw_mtd_nand_init();

 #endif 

 

-#if defined(RT_USING_MTD_NOR) && defined(RT_USING_DFS_JFFS2)

+#if defined(RT_USING_MTD_NOR)

     sst25vfxx_mtd_init("nor", 0, RT_UINT32_MAX);

 #endif 

 

 #endif /* RT_USING_DFS */

 

 #ifdef RT_USING_RTGUI

-

     /* initilize sdl */

-	 sdl_start();

-

+    sdl_start();

 #endif /* RT_USING_RTGUI */

 

     rt_thread_delay(50);