update project file.

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

update project file.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@152 bbd45198-f89e-11dd-88c7-29a3b14d5316
d1278740 · bernard.xiong · eb24e9da · d1278740 · d1278740 · d1278740
4 changed file
--- a/bsp/stm32_radio/board.h
+++ b/bsp/stm32_radio/board.h
-/*
- * File      : board.h
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006, RT-Thread Develop Team
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date           Author       Notes
- * 2009-09-22     Bernard      add board.h to this bsp
- */
-
-// <<< Use Configuration Wizard in Context Menu >>>
-#ifndef __BOARD_H__
-#define __BOARD_H__
-
-/* board configuration */
-// <o> SDCard Driver <1=>SDIO sdcard <0=>SPI MMC card
-// 	<i>Default: 1
-#define STM32_USE_SDIO			1
-
-/* whether use board external SRAM memory */
-// <e>Use external SRAM memory on the board
-// 	<i>Enable External SRAM memory
-#define STM32_EXT_SRAM          1
-//	<o>Begin Address of External SRAM
-//		<i>Default: 0x68000000
-#define STM32_EXT_SRAM_BEGIN    0x68000000 /* the begining address of external SRAM */
-//	<o>End Address of External SRAM
-//		<i>Default: 0x68080000
-#define STM32_EXT_SRAM_END      0x68080000 /* the end address of external SRAM */
-// </e>
-
-// <o> Internal SRAM memory size[Kbytes] <8-64>
-//	<i>Default: 64
-#define STM32_SRAM_SIZE         64
-#define STM32_SRAM_END          (0x20000000 + STM32_SRAM_SIZE * 1024)
-
-// <o> Console on USART: <0=> no console <1=>USART 1 <2=>USART 2 <3=> USART 3
-// 	<i>Default: 1
-#define STM32_CONSOLE_USART			1
-
-void rt_hw_board_led_on(int n);
-void rt_hw_board_led_off(int n);
-void rt_hw_board_init(void);
-
-void rt_hw_usart_init(void);
-void rt_hw_sdcard_init(void);
-
-#endif
-
-// <<< Use Configuration Wizard in Context Menu >>>
+/*
+ * File      : board.h
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2006, RT-Thread Develop Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2009-09-22     Bernard      add board.h to this bsp
+ */
+
+// <<< Use Configuration Wizard in Context Menu >>>
+#ifndef __BOARD_H__
+#define __BOARD_H__
+
+/* board configuration */
+// <o> SDCard Driver <1=>SDIO sdcard <0=>SPI MMC card
+// 	<i>Default: 1
+#define STM32_USE_SDIO			1
+
+/* whether use board external SRAM memory */
+// <e>Use external SRAM memory on the board
+// 	<i>Enable External SRAM memory
+#define STM32_EXT_SRAM          1
+//	<o>Begin Address of External SRAM
+//		<i>Default: 0x68000000
+#define STM32_EXT_SRAM_BEGIN    0x68000000 /* the begining address of external SRAM */
+//	<o>End Address of External SRAM
+//		<i>Default: 0x68080000
+#define STM32_EXT_SRAM_END      0x68080000 /* the end address of external SRAM */
+// </e>
+
+// <o> Internal SRAM memory size[Kbytes] <8-64>
+//	<i>Default: 64
+#define STM32_SRAM_SIZE         64
+#define STM32_SRAM_END          (0x20000000 + STM32_SRAM_SIZE * 1024)
+
+// <o> Console on USART: <0=> no console <1=>USART 1 <2=>USART 2 <3=> USART 3
+// 	<i>Default: 1
+#define STM32_CONSOLE_USART			1
+
+void rt_hw_board_led_on(int n);
+void rt_hw_board_led_off(int n);
+void rt_hw_board_init(void);
+
+void rt_hw_usart_init(void);
+void rt_hw_sdcard_init(void);
+
+#endif
+
+// <<< Use Configuration Wizard in Context Menu >>>
--- a/bsp/stm32_radio/project.Opt
+++ b/bsp/stm32_radio/project.Opt
--- a/bsp/stm32_radio/project.Uv2
+++ b/bsp/stm32_radio/project.Uv2
@@ -13,6 +13,8 @@ Group (Filesystem)
 Group (LwIP)
 Group (mp3)
 Group (RTGUI)
+Group (libpng)
+Group (libz)

 File 1,5,<.\rtconfig.h><rtconfig.h>
 File 1,5,<.\board.h><board.h>
@@ -31,12 +33,13 @@ File 1,1,<.\fsmc_sram.c><fsmc_sram.c>
 File 1,1,<.\fmt0371\fmt0371.c><fmt0371.c>
 File 1,1,<.\http.c><http.c>
 File 1,1,<.\lcd.c><lcd.c>
-File 1,1,<..\..\net\apps\tcpecho.c><tcpecho.c>
-File 1,1,<..\..\net\apps\udpecho.c><udpecho.c>
 File 1,1,<.\mp3.c><mp3.c>
 File 1,1,<.\wav.c><wav.c>
 File 1,1,<.\netbuffer.c><netbuffer.c>
 File 1,1,<.\gui.c><gui.c>
+File 1,1,<.\key.c><key.c>
+File 1,1,<.\info.c><info.c>
+File 1,1,<.\today.c><today.c>
 File 2,1,<..\..\src\clock.c><clock.c>
 File 2,1,<..\..\src\idle.c><idle.c>
 File 2,1,<..\..\src\ipc.c><ipc.c>
@@ -99,12 +102,7 @@ File 7,1,<..\..\filesystem\dfs\src\dfs_init.c><dfs_init.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_fs.c><dfs_fs.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_raw.c><dfs_raw.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_util.c><dfs_util.c>
-File 7,1,<..\..\filesystem\dfs\src\dfs_cache.c><dfs_cache.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_posix.c><dfs_posix.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\efs.c><efs.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\extract.c><extract.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\partition.c><partition.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\plibc.c><plibc.c>
 File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\dir.c><dir.c>
 File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fat.c><fat.c>
 File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\file.c><file.c>
@@ -112,6 +110,11 @@ File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fs.c><fs.c>
 File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ls.c><ls.c>
 File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\time.c><time.c>
 File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ui.c><ui.c>
+File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\plibc.c><plibc.c>
+File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\efs.c><efs.c>
+File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\extract.c><extract.c>
+File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\partition.c><partition.c>
+File 7,1,<..\..\filesystem\dfs\src\dfs_cache.c><dfs_cache.c>
 File 8,1,<..\..\net\lwip\src\core\dhcp.c><dhcp.c>
 File 8,1,<..\..\net\lwip\src\core\dns.c><dns.c>
 File 8,1,<..\..\net\lwip\src\core\init.c><init.c>
@@ -195,6 +198,32 @@ File 10,1,<..\..\rtgui\widgets\toplevel.c><toplevel.c>
 File 10,1,<..\..\rtgui\server\mouse.c><mouse.c>
 File 10,1,<..\..\rtgui\server\topwin.c><topwin.c>
 File 10,1,<..\..\rtgui\common\caret.c><caret.c>
+File 10,1,<..\..\rtgui\common\image_png.c><image_png.c>
+File 11,1,<..\..\rtgui\common\libpng\pngwutil.c><pngwutil.c>
+File 11,1,<..\..\rtgui\common\libpng\png.c><png.c>
+File 11,1,<..\..\rtgui\common\libpng\pngerror.c><pngerror.c>
+File 11,1,<..\..\rtgui\common\libpng\pnggccrd.c><pnggccrd.c>
+File 11,1,<..\..\rtgui\common\libpng\pngget.c><pngget.c>
+File 11,1,<..\..\rtgui\common\libpng\pngmem.c><pngmem.c>
+File 11,1,<..\..\rtgui\common\libpng\pngpread.c><pngpread.c>
+File 11,1,<..\..\rtgui\common\libpng\pngread.c><pngread.c>
+File 11,1,<..\..\rtgui\common\libpng\pngrio.c><pngrio.c>
+File 11,1,<..\..\rtgui\common\libpng\pngrtran.c><pngrtran.c>
+File 11,1,<..\..\rtgui\common\libpng\pngrutil.c><pngrutil.c>
+File 11,1,<..\..\rtgui\common\libpng\pngset.c><pngset.c>
+File 11,1,<..\..\rtgui\common\libpng\pngtrans.c><pngtrans.c>
+File 11,1,<..\..\rtgui\common\libpng\pngvcrd.c><pngvcrd.c>
+File 11,1,<..\..\rtgui\common\libpng\pngwio.c><pngwio.c>
+File 11,1,<..\..\rtgui\common\libpng\pngwrite.c><pngwrite.c>
+File 11,1,<..\..\rtgui\common\libpng\pngwtran.c><pngwtran.c>
+File 12,1,<..\..\rtgui\common\libz\zutil.c><zutil.c>
+File 12,1,<..\..\rtgui\common\libz\adler32.c><adler32.c>
+File 12,1,<..\..\rtgui\common\libz\crc32.c><crc32.c>
+File 12,1,<..\..\rtgui\common\libz\infback.c><infback.c>
+File 12,1,<..\..\rtgui\common\libz\inffast.c><inffast.c>
+File 12,1,<..\..\rtgui\common\libz\inflate.c><inflate.c>
+File 12,1,<..\..\rtgui\common\libz\inftrees.c><inftrees.c>
+File 12,1,<..\..\rtgui\common\libz\uncompr.c><uncompr.c>


 Options 1,0,0  // Target 'RT-Thread STM32 Radio'
@@ -255,7 +284,7 @@ Options 1,0,0  // Target 'RT-Thread STM32 Radio'
 ADSCMISC ()
 ADSCDEFN (USE_STDPERIPH_DRIVER, STM32F10X_HD,)
 ADSCUDEF ()
- ADSCINCD (.;.\Libraries\STM32F10x_StdPeriph_Driver\inc;.\Libraries\CMSIS\Core\CM3;..\..\include;..\..\libcpu\arm\stm32;..\..\finsh;..\..\net\lwip\src;..\..\net\lwip\src\include;..\..\net\lwip\src\arch\include;..\..\net\lwip\src\include\ipv4;..\..\filesystem\dfs;..\..\filesystem\dfs\include;..\..\filesystem\dfs\filesystems\efsl\src\include;..\..\filesystem\dfs\filesystems\efsl\src\base\include;..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\include;..\..\rtgui\include)
+ ADSCINCD (.;.\Libraries\STM32F10x_StdPeriph_Driver\inc;.\Libraries\CMSIS\Core\CM3;..\..\include;..\..\libcpu\arm\stm32;..\..\finsh;..\..\net\lwip\src;..\..\net\lwip\src\include;..\..\net\lwip\src\arch\include;..\..\net\lwip\src\include\ipv4;..\..\filesystem\dfs;..\..\filesystem\dfs\include;..\..\filesystem\dfs\filesystems\efsl\src\include;..\..\filesystem\dfs\filesystems\efsl\src\base\include;..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\include;..\..\rtgui\include;..\..\rtgui\common\libz)
 ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
 ADSAMISC ()
 ADSADEFN ()
@@ -331,7 +360,58 @@ Options 1,10,0  // Group 'RTGUI'
 ADSAINCD ()
 EndOpt

-Options 1,1,23  // File 'gui.c'
+Options 1,1,21  // File 'gui.c'
+ PropFld { 2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ IncBld=2
+ AlwaysBuild=2
+ GenAsm=2
+ AsmAsm=2
+ PublicsOnly=2
+ StopCode=11
+ CustArgs ()
+ LibMods ()
+ ADSCCFLG { 2,84,85,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ ADSCMISC (--gnu)
+ ADSCDEFN ()
+ ADSCUDEF ()
+ ADSCINCD ()
+EndOpt
+
+Options 1,1,22  // File 'key.c'
+ PropFld { 2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ IncBld=2
+ AlwaysBuild=2
+ GenAsm=2
+ AsmAsm=2
+ PublicsOnly=2
+ StopCode=11
+ CustArgs ()
+ LibMods ()
+ ADSCCFLG { 2,84,85,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ ADSCMISC (--gnu)
+ ADSCDEFN ()
+ ADSCUDEF ()
+ ADSCINCD ()
+EndOpt
+
+Options 1,1,23  // File 'info.c'
+ PropFld { 2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ IncBld=2
+ AlwaysBuild=2
+ GenAsm=2
+ AsmAsm=2
+ PublicsOnly=2
+ StopCode=11
+ CustArgs ()
+ LibMods ()
+ ADSCCFLG { 2,84,85,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ ADSCMISC (--gnu)
+ ADSCDEFN ()
+ ADSCUDEF ()
+ ADSCINCD ()
+EndOpt
+
+Options 1,1,24  // File 'today.c'
 PropFld { 2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
 IncBld=2
 AlwaysBuild=2

--- a/bsp/stm32_radio/rtconfig.h
+++ b/bsp/stm32_radio/rtconfig.h
@@ -92,7 +92,6 @@
 /* SECTION: lwip, a lighwight TCP/IP protocol stack */
 /* Using lighweight TCP/IP protocol stack */
 #define RT_USING_LWIP
-/* #define RT_USING_WEBSERVER */

 /* Trace LwIP protocol */
 /* #define RT_LWIP_DEBUG */