diff -r df63379a03bd -r adc615fe34e8 sbsv2/raptor/lib/flm/tools2exe.flm --- a/sbsv2/raptor/lib/flm/tools2exe.flm Wed Jan 20 18:28:33 2010 +0000 +++ b/sbsv2/raptor/lib/flm/tools2exe.flm Fri Jan 22 16:42:55 2010 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of the License "Eclipse Public License v1.0" @@ -19,8 +19,15 @@ ifeq ($(OSTYPE),cygwin) SYSTEMLIBS:=$(LIBS.WIN32) else +ifneq ($(TOOLS2WIN32),) +# Build win32 tools in Linux +SYSTEMLIBS:=$(LIBS.WIN32) +else +# Build linux tools in Linux SYSTEMLIBS:=$(LIBS.LINUX) endif +endif + EXETARGET:=$(RELEASEPATH)/$(TARGET)$(DOTEXE)