浏览代码

simulator: update comments,add 'RTT_IN_MODULE' macro in testdll\SConstruct

prife 12 年之前
父节点
当前提交
2b0ebebcc2
共有 2 个文件被更改,包括 6 次插入3 次删除
  1. 4 2
      bsp/simulator/rtconfig.py
  2. 2 1
      bsp/simulator/testdll/SConstruct

+ 4 - 2
bsp/simulator/rtconfig.py

@@ -1,7 +1,9 @@
 # toolchains options
 ARCH='sim'
-#CROSS_TOOL='msvc' or 'gcc' or 'mingw' (mingw is not supported yet!)
-CROSS_TOOL='mingw'
+#CROSS_TOOL='msvc' or 'gcc' or 'mingw'
+#'msvc' and 'mingw' are both for windows
+# 'gcc' is for linux
+CROSS_TOOL='msvc'
 
 # cross_tool provides the cross compiler
 # EXEC_PATH is the compiler execute path 

+ 2 - 1
bsp/simulator/testdll/SConstruct

@@ -38,7 +38,7 @@ AddOption('--type',
   help='installation prefix')
 
 app = GetOption('app')
-env = Environment()
+env = Environment(TARGET_ARCH='x86')
 CPPPATH = [
 	RTT_ROOT + '/include',
 	RTT_ROOT + '/bsp/' + rtconfig.BSP,
@@ -70,6 +70,7 @@ env.Append(CCFLAGS=rtconfig.CFLAGS)
 env.Append(LINKFLAGS=rtconfig.LFLAGS)
 env.Append(CPPPATH=CPPPATH)
 env.Append(LIBS='rtthread', LIBPATH='../')
+env.Append(CPPDEFINES=['RTT_IN_MODULE'])
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
 PrepareModuleBuilding(env, RTT_ROOT)