From 4f72d1cba1de7007b930729a49e31e89e5f83fc9 Mon Sep 17 00:00:00 2001 From: "goprife@gmail.com" Date: Tue, 31 Jan 2012 01:29:22 +0000 Subject: remove some warning in jffs2, and fix armcc compile error when using scons git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1929 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/dfs/SConscript | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'components/dfs/SConscript') diff --git a/components/dfs/SConscript b/components/dfs/SConscript index 728bcd65d0..e2f5709492 100644 --- a/components/dfs/SConscript +++ b/components/dfs/SConscript @@ -96,6 +96,18 @@ filesystems/uffs/flash/nand_ids.c jffs2 = Split(''' filesystems/jffs2/dfs_jffs2.c filesystems/jffs2/porting.c + +filesystems/jffs2/cyg/compress/src/adler32.c +filesystems/jffs2/cyg/compress/src/compress.c +filesystems/jffs2/cyg/compress/src/deflate.c +filesystems/jffs2/cyg/compress/src/infback.c +filesystems/jffs2/cyg/compress/src/inffast.c +filesystems/jffs2/cyg/compress/src/inflate.c +filesystems/jffs2/cyg/compress/src/inftrees.c +filesystems/jffs2/cyg/compress/src/trees.c +filesystems/jffs2/cyg/compress/src/uncompr.c +filesystems/jffs2/cyg/compress/src/zutil.c + filesystems/jffs2/cyg/crc/crc16.c filesystems/jffs2/cyg/crc/crc32.c filesystems/jffs2/cyg/crc/posix_crc.c @@ -104,12 +116,14 @@ filesystems/jffs2/src/build.c filesystems/jffs2/src/compr.c filesystems/jffs2/src/compr_rtime.c filesystems/jffs2/src/compr_rubin.c +filesystems/jffs2/src/compr_zlib.c filesystems/jffs2/src/debug.c filesystems/jffs2/src/dir-ecos.c filesystems/jffs2/src/erase.c filesystems/jffs2/src/flashio.c filesystems/jffs2/src/fs-ecos.c filesystems/jffs2/src/gc.c +filesystems/jffs2/src/gcthread.c filesystems/jffs2/src/malloc-ecos.c filesystems/jffs2/src/nodelist.c filesystems/jffs2/src/nodemgmt.c @@ -158,8 +172,9 @@ if GetDepend('RT_USING_DFS_JFFS2'): path = path + [RTT_ROOT + '/components/dfs/filesystems/jffs2/src', \ RTT_ROOT + '/components/dfs/filesystems/jffs2/kernel', \ RTT_ROOT + '/components/dfs/filesystems/jffs2/include', \ - RTT_ROOT + '/components/dfs/filesystems/jffs2'] - CPPDEFINES = CPPDEFINES + ['__ECOS'] + RTT_ROOT + '/components/dfs/filesystems/jffs2', \ + RTT_ROOT + '/components/dfs/filesystems/jffs2/cyg/compress'] + #CPPDEFINES = CPPDEFINES + ['__ECOS', 'CYGOPT_FS_JFFS2_WRITE', 'CYGPKG_FS_JFFS2_RET_DIRENT_DTYPE'] group = DefineGroup('Filesystem', src_local, depend = ['RT_USING_DFS'], CPPPATH = path, CPPDEFINES = CPPDEFINES) -- cgit v1.3.1