summaryrefslogtreecommitdiff
path: root/components/gui/libraries
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2017-12-12 20:16:21 +0800
committerGitHub <[email protected]>2017-12-12 20:16:21 +0800
commit42692c45ca463935b13546607dcb8dcde2b9820d (patch)
tree2369b56b2cb936de281b8e8b335da94828298af3 /components/gui/libraries
parentdcb0f280b491f5e0ff57373c7ec2936a1fba24e6 (diff)
parent2d98c0e7be8e0803de4b4e8e9ba03635bcef91c8 (diff)
Merge pull request #1099 from yangfasheng/master
[GUIEngine] Update GUI Engine.
Diffstat (limited to 'components/gui/libraries')
-rw-r--r--components/gui/libraries/SConscript3
-rw-r--r--components/gui/libraries/freetype-2.6.2/SConscript7
-rw-r--r--components/gui/libraries/freetype-2.6.2/builds/rt-thread/SConscript4
-rw-r--r--components/gui/libraries/freetype-2.6.2/include/SConscript15
-rw-r--r--components/gui/libraries/freetype-2.6.2/src/autofit/SConscript4
-rw-r--r--components/gui/libraries/freetype-2.6.2/src/base/SConscript4
-rw-r--r--components/gui/libraries/freetype-2.6.2/src/cache/SConscript4
-rw-r--r--components/gui/libraries/freetype-2.6.2/src/psnames/SConscript4
-rw-r--r--components/gui/libraries/freetype-2.6.2/src/sfnt/SConscript4
-rw-r--r--components/gui/libraries/freetype-2.6.2/src/smooth/SConscript4
-rw-r--r--components/gui/libraries/freetype-2.6.2/src/truetype/SConscript4
-rw-r--r--components/gui/libraries/lodepng/SConscript11
-rw-r--r--components/gui/libraries/tjpgd1a/SConscript12
13 files changed, 39 insertions, 41 deletions
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')