From 8d2e51f559917499c6d6359d5e2fa1b023a44718 Mon Sep 17 00:00:00 2001 From: Ken Hughes Date: Mon, 8 Mar 2010 20:37:45 +0000 Subject: scons build systems ------------------- Revert inadvertent ffmpeg changes. --- SConstruct | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/SConstruct b/SConstruct index ae2c92ef218..30d8788f040 100644 --- a/SConstruct +++ b/SConstruct @@ -335,17 +335,19 @@ if not quickie and do_clean: else: # remove file print "remove file %s"%(B.root_build_dir+entry) os.remove(B.root_build_dir+entry) - for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak', - 'extern/xvidcore/build/generic/platform.inc', 'extern/ffmpeg/include']: - if os.path.exists(confile): - print "clean file %s"%confile - if os.path.isdir(confile): - for root, dirs, files in os.walk(confile): - for name in files: - os.remove(os.path.join(root, name)) - else: - os.remove(confile) - print B.bc.OKGREEN+'...done'+B.bc.ENDC + for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak', + 'extern/xvidcore/build/generic/platform.inc', 'extern/ffmpeg/include']: + if os.path.exists(confile): + print "clean file %s"%confile + if os.path.isdir(confile): + for root, dirs, files in os.walk(confile): + for name in files: + os.remove(os.path.join(root, name)) + else: + os.remove(confile) + print B.bc.OKGREEN+'...done'+B.bc.ENDC + else: + print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC Exit() if not os.path.isdir ( B.root_build_dir): -- cgit v1.2.3