From 14709082a51768df533d96732b715344bce2c61f Mon Sep 17 00:00:00 2001 From: "goprife@gmail.com" Date: Sat, 17 Nov 2012 05:18:06 +0000 Subject: [PATCH] fix the link bug in bsp/simulator git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2423 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/simulator/SConstruct | 5 +---- bsp/simulator/rtconfig.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bsp/simulator/SConstruct b/bsp/simulator/SConstruct index 1a54eccb2..f4128d5fb 100644 --- a/bsp/simulator/SConstruct +++ b/bsp/simulator/SConstruct @@ -14,7 +14,7 @@ if os.getenv('RTT_RTGUI'): else: # set the rtgui root directory by hand # empty string means use the RTGUI in svn - #RTT_RTGUI = os.path.normpath('F:/Project/git/rt-gui') + # RTT_RTGUI = os.path.normpath('F:/Project/git/rt-gui') RTT_RTGUI ='' sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] @@ -28,10 +28,7 @@ Export('RTT_ROOT') Export('rtconfig') libs = Split(''' -kernel32 -msvcrt winmm -user32 gdi32 winspool comdlg32 diff --git a/bsp/simulator/rtconfig.py b/bsp/simulator/rtconfig.py index 4f6d5b024..cb86c719c 100644 --- a/bsp/simulator/rtconfig.py +++ b/bsp/simulator/rtconfig.py @@ -58,17 +58,20 @@ elif PLATFORM == 'cl': AR = PREFIX + 'cl' LINK = PREFIX + 'cl' AFLAGS = '' + CFLAGS = '' + LFLAGS = '' - CFLAGS = '/MT /ZI /Od /W 3 /WL ' - #LFLAGS = '/SUBSYSTEM:WINDOWS /NODEFAULTLIB /MACHINE:X86 /DEBUG' - LFLAGS = '/SUBSYSTEM:CONSOLE /NODEFAULTLIB /MACHINE:X86 ' + if BUILD == 'debug': + CFLAGS += ' /MTd' + LFLAGS += ' /DEBUG' + else: + CFLAGS += ' /MT' + LFLAGS += '' + + CFLAGS += ' /ZI /Od /W 3 /WL ' + LFLAGS += ' /SUBSYSTEM:CONSOLE /MACHINE:X86 ' CPATH = '' LPATH = '' - if BUILD == 'debug': - CFLAGS += ' /DEBUG' - else: - CFLAGS += '' - POST_ACTION = ''