[Libreoffice-commits] .: icu/makefile.mk

[Tor Lillqvist]

 icu/makefile.mk |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 77453fdb37acb6548cd8624abc5959a7d159ca93
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Mar 14 13:21:50 2011 +0200

    Now when attempting to use MSVC2010, use msbuild to build it

diff --git a/icu/makefile.mk b/icu/makefile.mk
index 5d7a92b..a15e4a2 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -213,11 +213,7 @@ ICU_BUILD_LIBPOST=
 
 CONFIGURE_ACTION+= $(PERL) ..$/..$/..$/..$/..$/createmak.pl ..$/..$/..$/..$/..$/createmak.cfg .
 
-.IF "$(CCNUMVER)"<="001400000000"
-BUILD_ACTION=cd allinone && nmake /f all.mak EXFLAGS="-EHsc" && cd ..$/..
-.ELSE
-BUILD_ACTION=cd allinone && nmake /f all.mak EXFLAGS="-EHa -Zc:wchar_t-" && cd ..$/..
-.ENDIF
+BUILD_ACTION=cd allinone && msbuild.exe allinone.sln && cd ..$/..
 
 OUT2LIB= \
     $(BUILD_DIR)$/..$/lib$/icudata.lib \