diff --git a/examples/module/SConstruct b/examples/module/SConstruct index f7fdfd948a..9706df1ba8 100644 --- a/examples/module/SConstruct +++ b/examples/module/SConstruct @@ -32,7 +32,7 @@ Export('rtconfig') Export('projects') Export('TARGET') -SConscript(RTT_ROOT + '/components/module/tetris/SConscript', duplicate=0) -SConscript(RTT_ROOT + '/components/module/basicapp/SConscript', duplicate=0) -SConscript(RTT_ROOT + '/components/module/extension/SConscript', duplicate=0) -SConscript(RTT_ROOT + '/components/module/extapp/SConscript', duplicate=0) \ No newline at end of file +SConscript(RTT_ROOT + '/examples/module/tetris/SConscript', duplicate=0) +SConscript(RTT_ROOT + '/examples/module/basicapp/SConscript', duplicate=0) +SConscript(RTT_ROOT + '/examples/module/extension/SConscript', duplicate=0) +SConscript(RTT_ROOT + '/examples/module/extapp/SConscript', duplicate=0) \ No newline at end of file diff --git a/examples/module/basicapp/SConscript b/examples/module/basicapp/SConscript index 207b35fb94..d03f4ded91 100644 --- a/examples/module/basicapp/SConscript +++ b/examples/module/basicapp/SConscript @@ -11,7 +11,7 @@ group = {} group['name'] = 'examples' group['src'] = Glob('*.c') group['CCFLAGS'] = '' -group['CPPPATH'] = [RTT_ROOT + '/include', RTT_ROOT + '/components/module'] +group['CPPPATH'] = [RTT_ROOT + '/include', RTT_ROOT + '/components/examples'] group['CPPDEFINES'] = '' target = 'basicapp.so' diff --git a/examples/module/extapp/SConscript b/examples/module/extapp/SConscript index c3af53aba2..a7dc25f5ab 100644 --- a/examples/module/extapp/SConscript +++ b/examples/module/extapp/SConscript @@ -11,7 +11,7 @@ group = {} group['name'] = 'examples' group['src'] = Glob('*.c') group['CCFLAGS'] = '' -group['CPPPATH'] = [RTT_ROOT + '/include', RTT_ROOT + '/components/module', RTT_ROOT + '/components/libdl'] +group['CPPPATH'] = [RTT_ROOT + '/include', RTT_ROOT + '/examples/module', RTT_ROOT + '/components/libdl'] group['CPPDEFINES'] = '' target = 'extapp.so' diff --git a/examples/module/extension/SConscript b/examples/module/extension/SConscript new file mode 100644 index 0000000000..89fc7b2999 --- /dev/null +++ b/examples/module/extension/SConscript @@ -0,0 +1,34 @@ +Import('env') +Import('projects') +Import('RTT_ROOT') +Import('rtconfig') +Import('TARGET') + +RTMLINKER = RTT_ROOT + '/tools/rtmlinker.exe ' + +# group definitions +group = {} +group['name'] = 'examples' +group['src'] = Glob('*.c') +group['CCFLAGS'] = '' +group['CPPPATH'] = [RTT_ROOT + '/include', RTT_ROOT + '/examples/module'] +group['CPPDEFINES'] = '' + +target = 'extension.so' +POST_ACTION = RTMLINKER + '-l ' + TARGET + ' -o extension.mo ' + '$TARGET' + +# add group to project list +projects.append(group) + +src_local = Glob('extension.c') + +env.Append(CCFLAGS = group['CCFLAGS']) +env.Append(CPPPATH = group['CPPPATH']) +env.Append(CPPDEFINES = group['CPPDEFINES']) +module_env = env.Clone(CPPDEFINE = 'RT_MODULE') +module_env = env.Clone(CCFLAGS = ' -mcpu=arm920t -O0 -fPIC') +module_env.Replace(LINK = 'arm-none-eabi-ld') +module_env.Replace(LINKFLAGS = '-z max-page-size=0x4 -shared -fPIC -e 0 -nostdlib -s') +module_env.Program(target, src_local) +module_env.AddPostAction(target, POST_ACTION) + diff --git a/examples/module/tetris/SConscript b/examples/module/tetris/SConscript index 9ac380ebb8..6806ffdefd 100644 --- a/examples/module/tetris/SConscript +++ b/examples/module/tetris/SConscript @@ -10,7 +10,7 @@ RTMLINKER = RTT_ROOT + '/tools/rtmlinker.exe ' group = {} group['CCFLAGS'] = '' group['CPPPATH'] = [RTT_ROOT + '/include', - RTT_ROOT + '/components/module', + RTT_ROOT + '/examples/module', RTT_ROOT + '/components/rtgui/include', RTT_ROOT + '/components/rgtui/common', RTT_ROOT + '/components/rtgui/server',