update rtconfig.h and SConstruct

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

bsp/mini2440/SConstruct

@@ -23,25 +23,17 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 Export('RTT_ROOT')
 Export('rtconfig')
 
-if rtconfig.PLATFORM == 'gcc':
-	start_obj  = 'build/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU + '/start_gcc.o',
-elif rtconfig.PLATFORM == 'armcc':
-	start_obj  = 'build/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU + '/start_rvds.o',
-
 # prepare building environment
-libs = PrepareBuilding(env, RTT_ROOT)
+objs = PrepareBuilding(env, RTT_ROOT)
 
 if GetDepend('RT_USING_RTGUI'):
-    libs = libs + SConscript(RTT_ROOT + '/examples/gui/SConscript', variant_dir='build/examples/gui', duplicate=0)
+    objs = objs + SConscript(RTT_ROOT + '/examples/gui/SConscript', variant_dir='build/examples/gui', duplicate=0)
 
 # libc testsuite 
-# libs = libs + SConscript(RTT_ROOT + '/examples/libc/SConscript', variant_dir='build/examples/libc', duplicate=0)
+# objs = objs + SConscript(RTT_ROOT + '/examples/libc/SConscript', variant_dir='build/examples/libc', duplicate=0)
 
 # build program 
-if GetDepend('RT_USING_NEWLIB'):
-    env.Program(target = TARGET, source = [start_obj, 'build/components/libc/newlib/syscalls.o', 'build/components/libc/newlib/libc.o'], LIBS = libs)
-else:
-    env.Program(target = TARGET, source = start_obj, LIBS = libs)
+env.Program(TARGET, objs)
 
 # end building 
 EndBuilding(TARGET)

bsp/mini2440/rtconfig.h

@@ -82,8 +82,8 @@
 
 /* SECTION: a runtime libc library */
 /* a runtime libc library */
-/* #define RT_USING_NEWLIB */
-/* #define RT_USING_PTHREADS */
+#define RT_USING_NEWLIB
+#define RT_USING_PTHREADS
 
 /* SECTION: C++ support */
 /* Using C++ support */
@@ -99,12 +99,12 @@
 #define RT_DFS_ELM_MAX_LFN		128
 /* #define RT_USING_DFS_YAFFS2 */
 /* #define RT_USING_DFS_UFFS */
-/* #define RT_USING_DFS_DEVFS */
+#define RT_USING_DFS_DEVFS
 
 /* #define RT_USING_DFS_NFS */
 #define RT_NFS_HOST_EXPORT		"192.168.1.5:/"
 
-/* #define DFS_USING_WORKDIR */
+#define DFS_USING_WORKDIR
 
 /* the max number of mounted filesystem */
 #define DFS_FILESYSTEMS_MAX		4

tools/building.py

@@ -343,8 +343,10 @@ def DefineGroup(name, src, depend, **parameters):
     if group.has_key('LINKFLAGS'):
         Env.Append(LINKFLAGS = group['LINKFLAGS'])
 
-    objs = Env.Object(group['src'])
-    objs = Env.Library(name, objs)
+    objs = Env.Object(group['src'])    
+
+    if group.has_key('LIBRARY'):
+        objs = Env.Library(name, objs)
     
     return objs