add image related building script.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1267 bbd45198-f89e-11dd-88c7-29a3b14d5316

components/rtgui/SConscript

@@ -18,6 +18,8 @@ common/image.c
 common/image_xpm.c
 common/image_hdc.c
 common/image_bmp.c
+common/image_png.c
+common/image_jpg.c
 common/image_container.c
 common/font.c
 common/font_bmp.c

components/rtgui/common/image_bmp.c

@@ -5,6 +5,7 @@
 #include <rtgui/image_bmp.h>
 #include <rtgui/blit.h>
 
+#ifdef RTGUI_IMAGE_BMP
 /* Compression encodings for BMP files */
 #ifndef BI_RGB
 #define BI_RGB			0
@@ -641,3 +642,4 @@ void rtgui_image_bmp_init()
 	/* register bmp on image system */
 	rtgui_image_register_engine(&rtgui_image_bmp_engine);
 }
+#endif

components/rtgui/common/image_jpg.c

 #include <rtthread.h>
 #include <rtgui/rtgui.h>
 
-#ifdef RTGUI_USING_JPEG
+#ifdef RTGUI_IMAGE_JPEG
 #include <stdio.h>
 #include <stdlib.h>
 #include "jpeg/jpeglib.h"

components/rtgui/common/image_png.c

 #include <rtthread.h>
 #include <rtgui/rtgui_system.h>
 
-#ifdef RTGUI_USING_PNG
+#ifdef RTGUI_IMAGE_PNG
 #include "libpng/png.h"
 #include <rtgui/image_png.h>
 

components/rtgui/common/jpeg/SConscript

+Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
+
+src	= Split('''
+jaricom.c
+jcomapi.c
+jutils.c
+jerror.c
+jmemmgr.c
+jdapimin.c
+jdapistd.c
+jdarith.c
+jdtrans.c
+jdatasrc.c
+jdmaster.c
+jdinput.c
+jdmarker.c
+jdhuff.c
+jdmainct.c
+jdcoefct.c
+jdpostct.c
+jddctmgr.c
+jidctfst.c
+jidctflt.c
+jidctint.c
+jdsample.c
+jdcolor.c
+jquant1.c
+jquant2.c
+jdmerge.c
+jmemnobs.c
+''')
+CPPPATH = [RTT_ROOT + '/components/rtgui/common/jpeg']
+
+group = DefineGroup('jpeg', src, depend = ['RTGUI_IMAGE_JPEG'], CPPPATH = CPPPATH)
+
+Return('group')

components/rtgui/common/libpng/SConscript

+Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
+
+src	= Split('''
+png.c
+pngerror.c
+pnggccrd.c
+pngget.c
+pngmem.c
+pngpread.c
+pngread.c
+pngrio.c
+pngrtran.c
+pngrutil.c
+pngset.c
+pngtrans.c
+pngvcrd.c
+pngwio.c
+pngwrite.c
+pngwtran.c
+pngwutil.c
+''')
+CPPPATH = [RTT_ROOT + '/components/rtgui/common/libpng']
+
+group = DefineGroup('libpng', src, depend = ['RTGUI_IMAGE_PNG'], CPPPATH = CPPPATH)
+
+Return('group')

components/rtgui/common/libz/SConscript

+Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
+
+src	= Split('''
+adler32.c
+compress.c
+crc32.c
+deflate.c
+gzio.c
+infback.c
+inffast.c
+inflate.c
+inftrees.c
+trees.c
+uncompr.c
+zutil.c
+''')
+CPPPATH = [RTT_ROOT + '/components/rtgui/common/libz']
+
+group = DefineGroup('libz', src, depend = ['RTGUI_IMAGE_PNG'], CPPPATH = CPPPATH)
+
+Return('group')

components/rtgui/include/rtgui/rtgui_config.h

@@ -38,8 +38,8 @@
 	#define RTGUI_IMAGE_CONTAINER
 	#define RTGUI_IMAGE_XPM
 	#define RTGUI_IMAGE_BMP
-	// #define RTGUI_IMAGE_PNG
-	// #define RTGUI_IMAGE_JPEG
+	#define RTGUI_IMAGE_PNG
+	#define RTGUI_IMAGE_JPEG
 	#define RTGUI_USING_FONT12
 	#define RTGUI_USING_HZ_BMP
 	#define RTGUI_MEM_TRACE