From 70611580dce7977d605f14454558b6e2c9b7ef07 Mon Sep 17 00:00:00 2001 From: prife Date: Fri, 15 Mar 2013 16:54:23 +0800 Subject: [PATCH] simulator: move {dfs_win32.c,moudule_win32.} from drives/ --- bsp/simulator/applications/SConscript | 5 ----- bsp/simulator/drivers/SConscript | 5 ++++- bsp/simulator/{applications => drivers}/dfs_win32.c | 0 bsp/simulator/{applications => drivers}/module_win32.c | 0 4 files changed, 4 insertions(+), 6 deletions(-) rename bsp/simulator/{applications => drivers}/dfs_win32.c (100%) rename bsp/simulator/{applications => drivers}/module_win32.c (100%) diff --git a/bsp/simulator/applications/SConscript b/bsp/simulator/applications/SConscript index 6dbd985812..f13d9e42ca 100644 --- a/bsp/simulator/applications/SConscript +++ b/bsp/simulator/applications/SConscript @@ -3,11 +3,6 @@ from building import * cwd = GetCurrentDir() src = Glob('*.c') -# remove no need file. -if GetDepend('RT_USING_DFS_WINSHAREDIR') == False: - SrcRemove(src, 'dfs_win32.c') -if GetDepend('RT_USING_MODULE') == False: - SrcRemove(src, ['module_win32.c']) CPPPATH = [cwd, str(Dir('#'))] group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/simulator/drivers/SConscript b/bsp/simulator/drivers/SConscript index 94fc2fa643..2f84e1db02 100644 --- a/bsp/simulator/drivers/SConscript +++ b/bsp/simulator/drivers/SConscript @@ -12,7 +12,10 @@ if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_MTD_NAND') == False SrcRemove(src, 'nanddrv_file.c') if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_MTD_NOR') == False: SrcRemove(src, 'sst25vfxx_mtd_sim.c') - +if GetDepend('RT_USING_DFS_WINSHAREDIR') == False: + SrcRemove(src, 'dfs_win32.c') +if GetDepend('RT_USING_MODULE') == False: + SrcRemove(src, ['module_win32.c']) CPPPATH = [cwd] group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/simulator/applications/dfs_win32.c b/bsp/simulator/drivers/dfs_win32.c similarity index 100% rename from bsp/simulator/applications/dfs_win32.c rename to bsp/simulator/drivers/dfs_win32.c diff --git a/bsp/simulator/applications/module_win32.c b/bsp/simulator/drivers/module_win32.c similarity index 100% rename from bsp/simulator/applications/module_win32.c rename to bsp/simulator/drivers/module_win32.c