Forráskód Böngészése

Merge pull request #950 from enkiller/gui_modify_SConscript

[gui]修改 SConscript 文件。 RT_USING_RTGUI -> RT_USING_GUIENGINE
Bernard Xiong 7 éve
szülő
commit
babc1a1990

+ 2 - 2
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')

+ 1 - 1
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')