Merge pull request #5 from mysterywolf/master

优化 Sconscript
liu2guang · Feb 17, 2022 · 4722bc8 · 4722bc8
2 parents 2892db0 + 022e719
commit 4722bc8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/SConscript b/SConscript
@@ -5,14 +5,8 @@ from building import *
 cwd = GetCurrentDir()
 
 # init src and inc vars
-src = []
-inc = []
-
-# add getparse common include
-inc = inc + [cwd]
-
-# add getparse basic code
-src = src + Glob('./*.c')
+src = Glob('*.c')
+inc = [cwd]
 
 # add group to IDE project
 group = DefineGroup('optparse', src, depend = ['PKG_USING_OPTPARSE'], CPPPATH = inc)

diff --git a/example/SConscript b/example/SConscript
@@ -1,20 +1,7 @@
-import os
 from building import * 
 
-# get current dir path
-cwd = GetCurrentDir()
+src = ['optparse_demo.c']
 
-# init src and inc vars
-src = []
-inc = []
-
-# add optparse common include
-inc = inc + [cwd]
-
-# add optparse basic code
-src = src + Glob('./*.c')
-
-# add group to IDE project
-objs = DefineGroup('optparse', src, depend = ['OPTPARSE_USING_DEMO'], CPPPATH = inc)
+objs = DefineGroup('optparse', src, depend = ['OPTPARSE_USING_DEMO'])
 
 Return('objs')
diff --git a/example/optparse_demo.c b/example/optparse_demo.c
@@ -1,5 +1,5 @@
-#include "optparse.h"
-#include "finsh.h"
+#include <optparse.h>
+#include <finsh.h>
 
 int optparse_short_test(int argc, char **argv)
 {