diff options
| author | Bernard Xiong <[email protected]> | 2017-11-04 14:49:29 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-11-04 14:49:29 +0800 |
| commit | babc1a199096450ac175101cd644b65b82d3d5bc (patch) | |
| tree | 55f8ea7a9b2a9a1793616f524524f839dae4d0b4 /components/gui | |
| parent | a70d7f5f3786658ad6cd6fa5c6a1f2902f64a60f (diff) | |
| parent | a8e3f1465326b135495313ed7007cc7f31cbc0ba (diff) | |
Merge pull request #950 from enkiller/gui_modify_SConscript
[gui]修改 SConscript 文件。 RT_USING_RTGUI -> RT_USING_GUIENGINE
Diffstat (limited to 'components/gui')
| -rw-r--r-- | components/gui/libraries/lodepng/SConscript | 4 | ||||
| -rw-r--r-- | components/gui/libraries/tjpgd1a/SConscript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/gui/libraries/lodepng/SConscript b/components/gui/libraries/lodepng/SConscript index 55d6d01d3f..4837665bcf 100644 --- a/components/gui/libraries/lodepng/SConscript +++ b/components/gui/libraries/lodepng/SConscript @@ -9,8 +9,8 @@ lodepng.c CPPPATH = [cwd] if rtconfig.ARCH == 'sim': - group = DefineGroup('RTGUI', src, depend = ['RT_USING_RTGUI', 'RTGUI_IMAGE_LODEPNG'], CPPPATH = CPPPATH) + group = DefineGroup('RTGUI', src, depend = ['RT_USING_GUIENGINE', 'RTGUI_IMAGE_LODEPNG'], CPPPATH = CPPPATH) else: - group = DefineGroup('RTGUI', src, depend = ['RT_USING_RTGUI', 'RTGUI_IMAGE_LODEPNG', 'RT_USING_LIBC'], CPPPATH = CPPPATH) + group = DefineGroup('RTGUI', src, depend = ['RT_USING_GUIENGINE', '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 37448fcc3b..14728005c6 100644 --- a/components/gui/libraries/tjpgd1a/SConscript +++ b/components/gui/libraries/tjpgd1a/SConscript @@ -8,7 +8,7 @@ tjpgd.c CPPPATH = [RTT_ROOT + '/components/external/tjpgd1a'] -group = DefineGroup('RTGUI', src, depend = ['RT_USING_RTGUI', 'RTGUI_IMAGE_TJPGD'], CPPPATH = CPPPATH) +group = DefineGroup('RTGUI', src, depend = ['RT_USING_GUIENGINE', 'RTGUI_IMAGE_TJPGD'], CPPPATH = CPPPATH) Return('group') |