From a8e3f1465326b135495313ed7007cc7f31cbc0ba Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Sat, 4 Nov 2017 14:42:23 +0800 Subject: [PATCH] =?UTF-8?q?[gui]=E4=BF=AE=E6=94=B9=20SConscript=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E3=80=82=20RT=5FUSING=5FRTGUI=20->=20RT=5FUS?= =?UTF-8?q?ING=5FGUIENGINE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/gui/libraries/lodepng/SConscript | 4 ++-- 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 55d6d01d3..4837665bc 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 37448fcc3..14728005c 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') -- GitLab