Explorar el Código

[SConscript] Solved the problem that file with the same name in keil caused by SConscript group
1 delete examples/SConscript
2 modify SConscript

MurphyZhao hace 8 años
padre
commit
9be46520ac
Se han modificado 2 ficheros con 7 adiciones y 17 borrados
  1. 7 1
      SConscript
  2. 0 16
      examples/SConscript

+ 7 - 1
SConscript

@@ -38,6 +38,12 @@ if rtconfig.CROSS_TOOL == 'keil':
     LOCAL_CCFLAGS += ' --gnu'
 
 group = DefineGroup('coap', src, depend = ['PKG_USING_COAP', 'RT_USING_LWIP', 'RT_USING_LWIP_IPV6', 'RT_USING_LIBC', 'RT_USING_POSIX', 'RT_USING_DFS', 'RT_USING_DFS_NET'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS, CPPDEFINES = CPPDEFINES)
-group += SConscript('examples/SConscript')
+
+examples_src = Split('''
+examples/coap_client.c
+examples/coap_server.c
+''')
+
+group = group + DefineGroup('coap-examples', examples_src, depend = ['PKG_USING_COAP_EXAMPLE', 'PKG_USING_COAP'], CPPPATH = CPPPATH)
 
 Return('group')

+ 0 - 16
examples/SConscript

@@ -1,16 +0,0 @@
-
-import os
-from building import *
-
-cwd = GetCurrentDir()
-
-src = Split('''
-coap_client.c
-coap_server.c
-''')
-
-CPPPATH = [cwd ]
-
-group = DefineGroup('coap-examples', src, depend = ['PKG_USING_COAP_EXAMPLE', 'PKG_USING_COAP', 'RT_USING_LWIP', 'RT_USING_LWIP_IPV6', 'RT_USING_LIBC', 'RT_USING_POSIX', 'RT_USING_DFS', 'RT_USING_DFS_NET'], CPPPATH = CPPPATH)
-
-Return('group')