diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2011-03-14 14:20:54 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-14 14:25:54 +0100 |
| commit | fb99fbe9bf1cb52b01cf718d0a79217fa90af10f (patch) | |
| tree | a4836981cbf117e51f39deda981fbb8912eff856 /icu/makefile.mk | |
| parent | beb70d756ae09e4bab3f45eea54b8abe4b081b41 (diff) | |
Don't build with builtin wchar_t on Windows
Diffstat (limited to 'icu/makefile.mk')
| -rw-r--r-- | icu/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index d8f2e6af23b9..5c8d742f4025 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -48,6 +48,7 @@ PATCH_FILES=\ icu4c-build.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch \ + icu4c-4_6-wchar_t.patch \ icu4c-warnings.patch .IF "$(GUI)"=="UNX" @@ -211,12 +212,16 @@ ICU_BUILD_VERSION=Release ICU_BUILD_LIBPOST= .ENDIF -CONFIGURE_ACTION+= $(PERL) ..$/..$/..$/..$/..$/createmak.pl ..$/..$/..$/..$/..$/createmak.cfg . +.IF "$(CPU)" == "I" +ICU_BUILD_ARCH=Win32 +.ELSE +ICU_BUILD_ARCH=x64 +.ENDIF -BUILD_ACTION=cd allinone && msbuild.exe /p:Configuration=Release allinone.sln && cd ..$/.. +BUILD_ACTION=cd allinone && msbuild.exe allinone.sln /p:Configuration=$(ICU_BUILD_VERSION) /p:Platform=$(ICU_BUILD_ARCH) OUT2LIB= \ - $(BUILD_DIR)$/..$/lib$/icudata.lib \ + $(BUILD_DIR)$/..$/lib$/icudt.lib \ $(BUILD_DIR)$/..$/lib$/icuin$(ICU_BUILD_LIBPOST).lib \ $(BUILD_DIR)$/..$/lib$/icuuc$(ICU_BUILD_LIBPOST).lib \ $(BUILD_DIR)$/..$/lib$/icule$(ICU_BUILD_LIBPOST).lib \ |