update module construction

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

3 files changed, 35 insertions, 40 deletions

diff --git a/examples/module/ftk_calculator/SConscript b/examples/module/ftk_calculator/SConscript
deleted file mode 100644
index bbfd5ca8a9..0000000000
--- a/examples/module/ftk_calculator/SConscript
+++ /dev/null
@@ -1,39 +0,0 @@
-Import('env')
-Import('projects')
-Import('RTT_ROOT')
-Import('rtconfig')
-Import('TARGET')
-
-RTMLINKER = RTT_ROOT + '/tools/rtmlinker.exe '
-
-# group definitions
-group = {}
-group['CCFLAGS'] = ''
-group['CPPPATH'] = [RTT_ROOT + '/include',
-		RTT_ROOT + '/examples/module',
-		RTT_ROOT + '/components/external/ftk/ftk/apps/common',
-		RTT_ROOT + '/components/external/ftk/ftk/src/os/rt-thread',
-		RTT_ROOT + '/components/external/ftk/ftk/src',
-		RTT_ROOT + '/components/dfs', 
-		RTT_ROOT + '/components/dfs/include',
-		RTT_ROOT + '/components/libc/newlib']
-group['CPPDEFINES'] = ''
-
-target = 'calculator.so'
-POST_ACTION = RTMLINKER + ' -l ' + TARGET + ' -o calculator.mo ' + '$TARGET'
-
-# add group to project list
-projects.append(group)
-
-src_local = Split("""
-ftk_app_calc.c
-""")
-
-env.Append(CCFLAGS = group['CCFLAGS'])
-env.Append(CPPPATH = group['CPPPATH'])
-env.Append(CPPDEFINES = group['CPPDEFINES'])
-module_env = env.Clone(CCFLAGS = ' -DRT_THREAD -mcpu=arm920t -O0 -fPIC')
-module_env.Replace(LINKFLAGS = '-z max-page-size=0x4 -shared -fPIC -e 0 -nostdlib -s')
-module_env.Program(target, src_local) 
-module_env.AddPostAction(target, POST_ACTION) 
-
diff --git a/examples/module/ftk_calculator/SConstruct b/examples/module/ftk_calculator/SConstruct
new file mode 100644
index 0000000000..e7177f5e39
--- /dev/null
+++ b/examples/module/ftk_calculator/SConstruct
@@ -0,0 +1,34 @@
+import os

+import sys

+

+EXEC_PATH = '/home/shaolin/CodeSourcery/Sourcery_G++_Lite/bin'

+RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..')

+sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]

+PREFIX = 'arm-none-eabi-'

+env = Environment(tools = ['mingw'],

+	AS = PREFIX + 'gcc', 

+	ASFLAGS = '',

+	CC = PREFIX + 'gcc',

+	CCFLAGS = '-DRT_THREAD -DFTK_AS_PLUGIN -mcpu=arm920t -O0 -fPIC' ,

+	AR = PREFIX + 'ar', 

+	ARFLAGS = '-rc',

+	LINK = PREFIX + 'ld',

+	LINKFLAGS = '-z max-page-size=0x4 -shared -fPIC -e 0 -nostdlib -s',

+	CPPPATH = [

+		RTT_ROOT + '/include', 

+		RTT_ROOT + '/bsp/mini2440',

+		RTT_ROOT + '/components/external/ftk/ftk/src/os/rt-thread',

+		RTT_ROOT + '/components/external/ftk/ftk/src/demos',	

+		RTT_ROOT + '/components/external/ftk/ftk/apps/common',

+		RTT_ROOT + '/components/external/ftk/ftk/src',

+		RTT_ROOT + '/components/dfs', 

+		RTT_ROOT + '/components/dfs/include',

+		RTT_ROOT + '/components/libc/newlib'

+		])

+env.PrependENVPath('PATH', EXEC_PATH)

+

+target = 'calculator.so'

+src = Glob('*.c')

+

+env.Program(target, src) 

+

diff --git a/examples/module/ftk_calculator/ftk_app_calc.c b/examples/module/ftk_calculator/ftk_app_calc.c
index 118ce8dba7..e2952572bc 100644
--- a/examples/module/ftk_calculator/ftk_app_calc.c
+++ b/examples/module/ftk_calculator/ftk_app_calc.c
@@ -1,7 +1,6 @@
 #include "ftk_xul.h"
 #include "ftk_expr.h"
 #include "ftk_app_calc.h"
-#include "ftk_animator_expand.h"
 
 typedef struct _PrivInfo
 {
@@ -73,6 +72,7 @@ static FtkWidget* ftk_calc_create_window(void)
 	FtkBitmap* bitmap_focus = NULL;
 	char path[FTK_MAX_PATH+1] = {0};
 	FtkWidget* win =  ftk_app_window_create();
+	ftk_window_set_animation_hint(win, "app_main_window");
 	width = ftk_widget_width(win);
 	height = ftk_widget_height(win);
 	entry = ftk_entry_create(win, 0, 0, width, 30);