From 44e17aa2772a48697604ba1122da4a0bb9015414 Mon Sep 17 00:00:00 2001 From: yangfasheng Date: Tue, 12 Dec 2017 19:43:37 +0800 Subject: [PATCH] =?UTF-8?q?gui=20=E7=BB=84=E4=BB=B6=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/gui/SConscript | 63 +++---------------- components/gui/include/SConscript | 13 ++++ components/gui/libraries/SConscript | 3 +- .../gui/libraries/freetype-2.6.2/SConscript | 7 ++- .../builds/rt-thread/SConscript | 4 +- .../freetype-2.6.2/include/SConscript | 15 +++-- .../freetype-2.6.2/src/autofit/SConscript | 4 +- .../freetype-2.6.2/src/base/SConscript | 4 +- .../freetype-2.6.2/src/cache/SConscript | 4 +- .../freetype-2.6.2/src/psnames/SConscript | 4 +- .../freetype-2.6.2/src/sfnt/SConscript | 4 +- .../freetype-2.6.2/src/smooth/SConscript | 4 +- .../freetype-2.6.2/src/truetype/SConscript | 4 +- components/gui/libraries/lodepng/SConscript | 11 ++-- components/gui/libraries/tjpgd1a/SConscript | 12 ++-- components/gui/src/SConscript | 11 ++++ 16 files changed, 72 insertions(+), 95 deletions(-) create mode 100644 components/gui/include/SConscript create mode 100644 components/gui/src/SConscript diff --git a/components/gui/SConscript b/components/gui/SConscript index 68831d929f..831c77fb1c 100644 --- a/components/gui/SConscript +++ b/components/gui/SConscript @@ -1,61 +1,16 @@ -# RT-Thread building script for component +# RT-Thread building script for bridge +import os from building import * cwd = GetCurrentDir() -src = Split(''' -src/asc12font.c -src/asc16font.c -src/blit.c -src/box.c -src/color.c -src/container.c -src/dc.c -src/dc_blend.c -src/dc_buffer.c -src/dc_client.c -src/dc_hw.c -src/dc_rotozoom.c -src/dc_trans.c -src/filerw.c -src/font.c -src/font_bmp.c -src/font_fnt.c -src/font_freetype.c -src/font_hz_bmp.c -src/font_hz_file.c -src/hz12font.c -src/hz16font.c -src/image.c -src/image_bmp.c -src/image_container.c -src/image_hdc.c -src/image_jpg.c -src/image_png.c -src/image_xpm.c -src/matrix.c -src/mouse.c -src/region.c -src/rtgui_app.c -src/rtgui_driver.c -src/rtgui_object.c -src/rtgui_system.c -src/server.c -src/title.c -src/topwin.c -src/widget.c -src/window.c -''') -CPPPATH = [cwd + '/include'] +objs = [] +list = os.listdir(cwd) -group = [] if GetDepend('RT_USING_GUIENGINE'): - group = DefineGroup('GUIEngine', src, depend = ['RT_USING_GUIENGINE'], CPPPATH = CPPPATH) + for d in list: + path = os.path.join(cwd, d) + if os.path.isfile(os.path.join(path, 'SConscript')): + objs = objs + SConscript(os.path.join(d, 'SConscript')) - list = os.listdir(cwd) - for d in list: - path = os.path.join(cwd, d) - if os.path.isfile(os.path.join(path, 'SConscript')): - group = group + SConscript(os.path.join(d, 'SConscript')) - -Return('group') +Return('objs') diff --git a/components/gui/include/SConscript b/components/gui/include/SConscript new file mode 100644 index 0000000000..387853aa2f --- /dev/null +++ b/components/gui/include/SConscript @@ -0,0 +1,13 @@ +# RT-Thread building script for gui + +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') + Glob('*.cpp') +CPPPATH = [ cwd, + cwd + '/rtgui', + cwd + '/rtgui/widgets'] + +group = DefineGroup('GuiEngine', src, depend = [''], CPPPATH = CPPPATH) + +Return('group') \ No newline at end of file diff --git a/components/gui/libraries/SConscript b/components/gui/libraries/SConscript index 744d8d7821..4a80f59b5b 100644 --- a/components/gui/libraries/SConscript +++ b/components/gui/libraries/SConscript @@ -1,4 +1,5 @@ -# for module compiling +# RT-Thread building script for bridge + import os from building import * diff --git a/components/gui/libraries/freetype-2.6.2/SConscript b/components/gui/libraries/freetype-2.6.2/SConscript index 6bbc7030fb..562f768a36 100644 --- a/components/gui/libraries/freetype-2.6.2/SConscript +++ b/components/gui/libraries/freetype-2.6.2/SConscript @@ -1,15 +1,16 @@ -# RT-Thread building script for bridge +# RT-Thread building script for FreeType import os from building import * cwd = GetCurrentDir() -src = Split(''' -''') list = os.listdir(cwd) GroupPath = cwd CPPDEFINES = ['FT2_BUILD_LIBRARY'] +src = [] +group = [] + group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPDEFINES=CPPDEFINES, GroupPath = GroupPath) if GetDepend('RTGUI_USING_TTF'): diff --git a/components/gui/libraries/freetype-2.6.2/builds/rt-thread/SConscript b/components/gui/libraries/freetype-2.6.2/builds/rt-thread/SConscript index 6bfd56b3d2..a8e4d83bb1 100644 --- a/components/gui/libraries/freetype-2.6.2/builds/rt-thread/SConscript +++ b/components/gui/libraries/freetype-2.6.2/builds/rt-thread/SConscript @@ -1,4 +1,4 @@ -# RT-Thread building script for component +# RT-Thread building script for FreeType from building import * @@ -9,6 +9,6 @@ gb2312tounicode.c ''') CPPPATH = [cwd] -group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH) +group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/freetype-2.6.2/include/SConscript b/components/gui/libraries/freetype-2.6.2/include/SConscript index d1d80292af..2b7432b25d 100644 --- a/components/gui/libraries/freetype-2.6.2/include/SConscript +++ b/components/gui/libraries/freetype-2.6.2/include/SConscript @@ -1,16 +1,15 @@ -# RT-Thread building script for component +# RT-Thread building script for FreeType from building import * cwd = GetCurrentDir() -src = Split(''' -''') +src = [] CPPPATH = [ cwd, - cwd + '/freetype', - cwd + '/freetype/config', - cwd + '/freetype/internal', - cwd + '/freetype/internal/services'] + cwd + '/freetype', + cwd + '/freetype/config', + cwd + '/freetype/internal', + cwd + '/freetype/internal/services'] -group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH) +group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/freetype-2.6.2/src/autofit/SConscript b/components/gui/libraries/freetype-2.6.2/src/autofit/SConscript index b4f0e4fcef..9a739e3bbc 100644 --- a/components/gui/libraries/freetype-2.6.2/src/autofit/SConscript +++ b/components/gui/libraries/freetype-2.6.2/src/autofit/SConscript @@ -1,4 +1,4 @@ -# RT-Thread building script for component +# RT-Thread building script for FreeType from building import * @@ -8,6 +8,6 @@ autofit.c ''') CPPPATH = [cwd] -group = DefineGroup('freetype', src, depend = ['RT_USING_GUIENGINE'], CPPPATH = CPPPATH) +group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/freetype-2.6.2/src/base/SConscript b/components/gui/libraries/freetype-2.6.2/src/base/SConscript index 130e3ba47b..34a0698060 100644 --- a/components/gui/libraries/freetype-2.6.2/src/base/SConscript +++ b/components/gui/libraries/freetype-2.6.2/src/base/SConscript @@ -1,4 +1,4 @@ -# RT-Thread building script for component +# RT-Thread building script for FreeType from building import * @@ -17,6 +17,6 @@ ftpatent.c ''') CPPPATH = [cwd] -group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH) +group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/freetype-2.6.2/src/cache/SConscript b/components/gui/libraries/freetype-2.6.2/src/cache/SConscript index 88a3e021f5..22c43004f1 100644 --- a/components/gui/libraries/freetype-2.6.2/src/cache/SConscript +++ b/components/gui/libraries/freetype-2.6.2/src/cache/SConscript @@ -1,4 +1,4 @@ -# RT-Thread building script for component +# RT-Thread building script for FreeType from building import * @@ -15,6 +15,6 @@ ftcsbits.c ''') CPPPATH = [cwd] -group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH) +group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/freetype-2.6.2/src/psnames/SConscript b/components/gui/libraries/freetype-2.6.2/src/psnames/SConscript index 3b82c73c8c..6895fb2ac8 100644 --- a/components/gui/libraries/freetype-2.6.2/src/psnames/SConscript +++ b/components/gui/libraries/freetype-2.6.2/src/psnames/SConscript @@ -1,4 +1,4 @@ -# RT-Thread building script for component +# RT-Thread building script for FreeType from building import * @@ -8,6 +8,6 @@ psnames.c ''') CPPPATH = [cwd] -group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH) +group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/freetype-2.6.2/src/sfnt/SConscript b/components/gui/libraries/freetype-2.6.2/src/sfnt/SConscript index a5146b8efe..84a2c91207 100644 --- a/components/gui/libraries/freetype-2.6.2/src/sfnt/SConscript +++ b/components/gui/libraries/freetype-2.6.2/src/sfnt/SConscript @@ -1,4 +1,4 @@ -# RT-Thread building script for component +# RT-Thread building script for FreeType from building import * @@ -8,6 +8,6 @@ sfnt.c ''') CPPPATH = [cwd] -group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH) +group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/freetype-2.6.2/src/smooth/SConscript b/components/gui/libraries/freetype-2.6.2/src/smooth/SConscript index 1a9199eb8e..5dfd3bc09b 100644 --- a/components/gui/libraries/freetype-2.6.2/src/smooth/SConscript +++ b/components/gui/libraries/freetype-2.6.2/src/smooth/SConscript @@ -1,4 +1,4 @@ -# RT-Thread building script for component +# RT-Thread building script for FreeType from building import * @@ -8,6 +8,6 @@ smooth.c ''') CPPPATH = [cwd] -group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH) +group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/freetype-2.6.2/src/truetype/SConscript b/components/gui/libraries/freetype-2.6.2/src/truetype/SConscript index eb21327030..ac3eedff12 100644 --- a/components/gui/libraries/freetype-2.6.2/src/truetype/SConscript +++ b/components/gui/libraries/freetype-2.6.2/src/truetype/SConscript @@ -1,4 +1,4 @@ -# RT-Thread building script for component +# RT-Thread building script for FreeType from building import * @@ -8,6 +8,6 @@ truetype.c ''') CPPPATH = [cwd] -group = DefineGroup('freetype', src, depend = ['RTGUI_USING_TTF'], CPPPATH = CPPPATH) +group = DefineGroup('FreeType', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/lodepng/SConscript b/components/gui/libraries/lodepng/SConscript index 4837665bcf..2ce81bdb56 100644 --- a/components/gui/libraries/lodepng/SConscript +++ b/components/gui/libraries/lodepng/SConscript @@ -1,16 +1,15 @@ +# RT-Thread building script for gui + from building import * import rtconfig cwd = GetCurrentDir() -src = Split(''' -lodepng.c -''') - +src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] if rtconfig.ARCH == 'sim': - group = DefineGroup('RTGUI', src, depend = ['RT_USING_GUIENGINE', 'RTGUI_IMAGE_LODEPNG'], CPPPATH = CPPPATH) + group = DefineGroup('GuiEngine', src, depend = ['RTGUI_IMAGE_LODEPNG'], CPPPATH = CPPPATH) else: - group = DefineGroup('RTGUI', src, depend = ['RT_USING_GUIENGINE', 'RTGUI_IMAGE_LODEPNG', 'RT_USING_LIBC'], CPPPATH = CPPPATH) + group = DefineGroup('GuiEngine', src, depend = ['RTGUI_IMAGE_LODEPNG', 'RT_USING_LIBC'], CPPPATH = CPPPATH) Return('group') diff --git a/components/gui/libraries/tjpgd1a/SConscript b/components/gui/libraries/tjpgd1a/SConscript index f805407555..5478372cf3 100644 --- a/components/gui/libraries/tjpgd1a/SConscript +++ b/components/gui/libraries/tjpgd1a/SConscript @@ -1,13 +1,11 @@ +# RT-Thread building script for gui + from building import * -import rtconfig cwd = GetCurrentDir() -src = Split(''' -tjpgd.c -''') - +src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('RTGUI', src, depend = ['RT_USING_GUIENGINE', 'RTGUI_IMAGE_TJPGD'], CPPPATH = CPPPATH) +group = DefineGroup('GuiEngine', src, depend = ['RTGUI_IMAGE_TJPGD'], CPPPATH = CPPPATH) -Return('group') \ No newline at end of file +Return('group') diff --git a/components/gui/src/SConscript b/components/gui/src/SConscript new file mode 100644 index 0000000000..3bbcb28a22 --- /dev/null +++ b/components/gui/src/SConscript @@ -0,0 +1,11 @@ +# RT-Thread building script for gui + +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') + Glob('*.cpp') +CPPPATH = [cwd] + +group = DefineGroup('GuiEngine', src, depend = [''], CPPPATH = CPPPATH) + +Return('group') \ No newline at end of file