diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-14 13:21:50 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-14 13:21:50 +0200 |
| commit | 16aa53366937621342496b5532f5747c4119a899 (patch) | |
| tree | 084713fbc854cdbd2b47bb5d53de8fe0e4e13ccb /icu | |
| parent | e3841d130855945259074516b7a862434a6eacc5 (diff) | |
Now when attempting to use MSVC2010, use msbuild to build it
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 5d7a92b4545b..a15e4a211daf 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 \ |