From f0f44e915e5576cff4872c4119a7e516a5529770 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Mon, 29 Jul 2002 21:04:18 +0000 Subject: [PATCH] ICU-2030 WIndows build changes to allow apps to use static C runtime lib X-SVN-Rev: 9400 --- icu4c/source/common/cmemory.h | 12 +- icu4c/source/common/common.dsp | 1172 +++++++++++++++++++++- icu4c/source/common/unicode/uobject.h | 2 + icu4c/source/extra/uconv/uconv.dsp | 4 +- icu4c/source/extra/ustdio/ustdio.dsp | 226 ++++- icu4c/source/i18n/i18n.dsp | 984 +++++++++++++++++- icu4c/source/layout/layout.dsp | 4 +- icu4c/source/stubdata/stubdata.dsp | 10 +- icu4c/source/test/cintltst/capitst.c | 6 +- icu4c/source/test/cintltst/cbiapts.c | 6 +- icu4c/source/test/cintltst/cbiditst.c | 40 +- icu4c/source/test/cintltst/ccaltst.c | 36 +- icu4c/source/test/cintltst/ccapitst.c | 4 +- icu4c/source/test/cintltst/ccolltst.c | 11 +- icu4c/source/test/cintltst/cdattst.c | 64 +- icu4c/source/test/cintltst/cdtdptst.c | 44 +- icu4c/source/test/cintltst/cdtrgtst.c | 32 +- icu4c/source/test/cintltst/cintltst.c | 17 +- icu4c/source/test/cintltst/cintltst.dsp | 956 +++++++++++++++++- icu4c/source/test/cintltst/citertst.c | 14 +- icu4c/source/test/cintltst/cmsccoll.c | 70 +- icu4c/source/test/cintltst/cmsgtst.c | 10 +- icu4c/source/test/cintltst/cnmdptst.c | 84 +- icu4c/source/test/cintltst/cnumtst.c | 32 +- icu4c/source/test/cintltst/creststn.c | 8 +- icu4c/source/test/cintltst/ctstdep.c | 4 +- icu4c/source/test/cintltst/cucdtst.c | 45 +- icu4c/source/test/cintltst/custrtrn.c | 24 +- icu4c/source/test/cintltst/ncnvtst.c | 16 +- icu4c/source/test/cintltst/nucnvtst.c | 136 +-- icu4c/source/test/cintltst/putiltst.c | 8 +- icu4c/source/test/cintltst/ucmptst.c | 12 +- icu4c/source/test/cintltst/uenumtst.c | 8 +- icu4c/source/test/cintltst/utransts.c | 12 +- icu4c/source/test/collperf/collperf.dsp | 30 +- icu4c/source/test/ieeetest/ieeetest.dsp | 28 +- icu4c/source/test/intltest/apicoll.cpp | 5 +- icu4c/source/test/intltest/calregts.cpp | 7 +- icu4c/source/test/intltest/dtfmttst.cpp | 4 +- icu4c/source/test/intltest/intltest.dsp | 24 +- icu4c/source/test/intltest/tzregts.cpp | 4 +- icu4c/source/test/intltest/tztest.cpp | 14 +- icu4c/source/test/utfperf/utfperf.dsp | 32 +- icu4c/source/tools/ctestfw/ctestfw.dsp | 37 +- icu4c/source/tools/genccode/genccode.dsp | 28 +- icu4c/source/tools/gencmn/decmn.dsp | 28 +- icu4c/source/tools/gencmn/gencmn.dsp | 28 +- icu4c/source/tools/gencnval/gencnval.dsp | 28 +- icu4c/source/tools/gennames/gennames.dsp | 28 +- icu4c/source/tools/gennorm/gennorm.dsp | 28 +- icu4c/source/tools/genprops/genprops.dsp | 28 +- icu4c/source/tools/genrb/derb.dsp | 24 +- icu4c/source/tools/genrb/genrb.dsp | 28 +- icu4c/source/tools/gentest/gentest.dsp | 28 +- icu4c/source/tools/gentz/gentz.dsp | 28 +- icu4c/source/tools/genuca/genuca.dsp | 30 +- icu4c/source/tools/makeconv/makeconv.dsp | 28 +- icu4c/source/tools/pkgdata/pkgdata.dsp | 28 +- icu4c/source/tools/toolutil/toolutil.c | 4 +- icu4c/source/tools/toolutil/toolutil.dsp | 158 +-- icu4c/source/tools/toolutil/toolutil.h | 6 +- 61 files changed, 4102 insertions(+), 754 deletions(-) diff --git a/icu4c/source/common/cmemory.h b/icu4c/source/common/cmemory.h index 16414a5077..4cf9ede022 100644 --- a/icu4c/source/common/cmemory.h +++ b/icu4c/source/common/cmemory.h @@ -29,15 +29,25 @@ #include - +/* #define uprv_malloc(size) U_STANDARD_CPP_NAMESPACE malloc(size) #define uprv_realloc(buffer, size) U_STANDARD_CPP_NAMESPACE realloc(buffer, size) #define uprv_free(buffer) U_STANDARD_CPP_NAMESPACE free(buffer) +*/ #define uprv_memcpy(dst, src, size) U_STANDARD_CPP_NAMESPACE memcpy(dst, src, size) #define uprv_memmove(dst, src, size) U_STANDARD_CPP_NAMESPACE memmove(dst, src, size) #define uprv_memset(buffer, mark, size) U_STANDARD_CPP_NAMESPACE memset(buffer, mark, size) #define uprv_memcmp(buffer1, buffer2, size) U_STANDARD_CPP_NAMESPACE memcmp(buffer1, buffer2,size) +U_CAPI void * U_EXPORT2 +uprv_malloc(size_t s); + +U_CAPI void * U_EXPORT2 +uprv_realloc(void *mem, size_t size); + +U_CAPI void U_EXPORT2 +uprv_free(void *mem); + /** * This should align the memory properly on any machine. * This is very useful for the safeClone functions. diff --git a/icu4c/source/common/common.dsp b/icu4c/source/common/common.dsp index 0e43190f4d..8398d997d7 100644 --- a/icu4c/source/common/common.dsp +++ b/icu4c/source/common/common.dsp @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMMON_EXPORTS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMMON_EXPORTS" /D "U_COMMON_IMPLEMENTATION" /D "UDATA_STATIC_LIB" /FR /FD /GF /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMMON_EXPORTS" /D "U_COMMON_IMPLEMENTATION" /D "UDATA_STATIC_LIB" /FR /FD /GF /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -152,14 +152,53 @@ LINK32=link.exe # Begin Source File SOURCE=.\bidi.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\brkdict.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\brkiter.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File @@ -169,7 +208,24 @@ SOURCE=.\chariter.cpp !ELSEIF "$(CFG)" == "common - Win32 Debug" -# ADD CPP /W3 +# ADD CPP /G6 /W3 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\cmemory.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 !ELSEIF "$(CFG)" == "common - Win64 Release" @@ -181,342 +237,1454 @@ SOURCE=.\chariter.cpp # Begin Source File SOURCE=.\convert.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cstring.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cwchar.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\dbbi.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\dbbi_tbl.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\digitlst.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\filestrm.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\locid.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\locmap.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\mutex.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\normlzr.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\putil.c + +!IF "$(CFG)" == "common - Win32 Release" + # ADD CPP /Ze + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 /Ze + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +# ADD CPP /Ze + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +# ADD CPP /Ze + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbbi.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbbidata.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbbinode.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbbirb.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbbiscan.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbbisetb.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbbistbl.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbbitblb.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\resbund.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\schriter.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ubidi.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ubidiln.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ubidiwrt.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ubrk.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uchar.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uchriter.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucln_cmn.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucmndata.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucmp8.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv2022.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_bld.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_cb.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_cnv.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_err.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_io.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_lmb.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_u16.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_u32.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_u7.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnv_u8.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnvbocu.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnvhz.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnvisci.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnvlat1.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnvmbcs.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucnvscsu.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\udata.c + +!IF "$(CFG)" == "common - Win32 Release" + # ADD CPP /Za + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 /Za + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +# ADD CPP /Za + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +# ADD CPP /Za + +!ENDIF + # End Source File # Begin Source File SOURCE=.\udatamem.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uenum.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uhash.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uhash_us.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uiter.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uloc.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\umapfile.c + +!IF "$(CFG)" == "common - Win32 Release" + # ADD CPP /Ze + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 /Ze + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +# ADD CPP /Ze + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +# ADD CPP /Ze + +!ENDIF + # End Source File # Begin Source File SOURCE=.\umemstrm.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\umutex.c + +!IF "$(CFG)" == "common - Win32 Release" + # ADD CPP /Ze + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 /Ze + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +# ADD CPP /Ze + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +# ADD CPP /Ze + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unames.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unicode.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unifilt.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unifunct.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uniset.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unistr.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unorm.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uobject.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uprops.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\upropset.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uresbund.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uresdata.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\usc_impl.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uscript.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uset.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\usetiter.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ushape.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ustrcase.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ustrfmt.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ustring.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ustrtrns.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\utf_impl.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\util.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\utrie.c + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uvector.cpp + +!IF "$(CFG)" == "common - Win32 Release" + +!ELSEIF "$(CFG)" == "common - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "common - Win64 Release" + +!ELSEIF "$(CFG)" == "common - Win64 Debug" + +!ENDIF + # End Source File # End Group # Begin Group "Header Files" diff --git a/icu4c/source/common/unicode/uobject.h b/icu4c/source/common/unicode/uobject.h index 7f987a9eba..d47ade8c8d 100644 --- a/icu4c/source/common/unicode/uobject.h +++ b/icu4c/source/common/unicode/uobject.h @@ -65,6 +65,8 @@ public: // (uprv_malloc(), uprv_free(), uprv_realloc()); // they or something else could be used here to implement C++ new/delete // for ICU4C C++ classes + +#define U_CPP_MEMORY_TEST #ifdef U_CPP_MEMORY_TEST void *operator new(size_t size); void *operator new[](size_t size); diff --git a/icu4c/source/extra/uconv/uconv.dsp b/icu4c/source/extra/uconv/uconv.dsp index 8e89bfe80f..29a35c93e1 100644 --- a/icu4c/source/extra/uconv/uconv.dsp +++ b/icu4c/source/extra/uconv/uconv.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UCONVMSG_STATIC" /FD /c +# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UCONVMSG_STATIC" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -82,7 +82,7 @@ SOURCE="$(InputPath)" # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UCONVMSG_STATIC" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UCONVMSG_STATIC" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/icu4c/source/extra/ustdio/ustdio.dsp b/icu4c/source/extra/ustdio/ustdio.dsp index 01636e72dd..c1ab01c7d6 100644 --- a/icu4c/source/extra/ustdio/ustdio.dsp +++ b/icu4c/source/extra/ustdio/ustdio.dsp @@ -44,8 +44,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /c -# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /FD /GF /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /FD /GF /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -71,8 +71,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /FR /FD /GF /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /FR /FD /GF /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -98,8 +98,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_WINDOWS" /D"_MBCS" /D"_USRDLL" /D"USTDIO_EXPORTS" /D"U_USTDIO_IMPLEMENTATION" /FD /GF /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GF /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -108,9 +108,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IA64 -# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:IA64 /out:"..\..\..\bin\icuio22.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\" /incremental:no -# SUBTRACT LINK32 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:IX86 /out:"..\..\..\bin\icuio22.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\" /machine:IA64 !ELSEIF "$(CFG)" == "ustdio - Win64 Debug" @@ -125,8 +124,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_WINDOWS" /D"_MBCS" /D"_USRDLL" /D"USTDIO_EXPORTS" /D"U_USTDIO_IMPLEMENTATION" /FR /FD /GF /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GF /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -135,9 +134,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /debug /machine:IA64 /out:"..\..\..\bin\icuio22d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\" /incremental:no -# SUBTRACT LINK32 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /incremental:no /debug /machine:IX86 /out:"..\..\..\bin\icuio22d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\" /machine:IA64 !ENDIF @@ -153,63 +151,263 @@ LINK32=link.exe # Begin Source File SOURCE=.\locbund.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\loccache.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\sprintf.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\sprntf_p.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\sscanf.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\sscanf_p.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ufile.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ufmt_cmn.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uprintf.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uprntf_p.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uscanf.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uscanf_p.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uscanset.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ustdio.c + +!IF "$(CFG)" == "ustdio - Win32 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ustream.cpp + +!IF "$(CFG)" == "ustdio - Win32 Release" + # ADD CPP /Ze + +!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" + +# ADD CPP /G6 /Ze + +!ELSEIF "$(CFG)" == "ustdio - Win64 Release" + +# ADD CPP /Ze + +!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" + +# ADD CPP /Ze + +!ENDIF + # End Source File # End Group # Begin Group "Header Files" diff --git a/icu4c/source/i18n/i18n.dsp b/icu4c/source/i18n/i18n.dsp index ca3c119213..e7863ba096 100644 --- a/icu4c/source/i18n/i18n.dsp +++ b/icu4c/source/i18n/i18n.dsp @@ -152,274 +152,1158 @@ LINK32=link.exe # Begin Source File SOURCE=.\anytrans.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\bocsu.c + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\calendar.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\caniter.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\choicfmt.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\coleitr.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\coll.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cpdtrans.cpp -# End Source File -# Begin Source File -SOURCE=.\ucurr.cpp +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\datefmt.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\dcfmtsym.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\decimfmt.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\dtfmtsym.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\esctrn.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\fmtable.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\format.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\funcrepl.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\gregocal.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\hextouni.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\msgfmt.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\name2uni.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\nfrs.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\nfrule.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\nfsubs.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\nortrans.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\nultrans.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\numfmt.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\quant.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbnf.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbt.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbt_data.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbt_pars.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbt_rule.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\rbt_set.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\remtrans.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\search.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\simpletz.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\smpdtfmt.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\sortkey.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\strmatch.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\strrepl.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\stsearch.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\tblcoll.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\timezone.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\titletrn.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\tolowtrn.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\toupptrn.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\translit.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\transreg.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\tridpars.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucal.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucln_in.c + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucol.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucol_bld.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucol_cnt.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucol_elm.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucol_tok.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucol_wgt.c + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucoleitr.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\ucurr.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\udat.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\umsg.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unesctrn.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uni2name.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unifltlg.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unitohex.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unum.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\usearch.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\utrans.cpp + +!IF "$(CFG)" == "i18n - Win32 Release" + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +!ENDIF + # End Source File # End Group # Begin Group "Header Files" @@ -678,53 +1562,6 @@ InputPath=.\unicode\cpdtrans.h # End Source File # Begin Source File -SOURCE=.\unicode\ucurr.h - -!IF "$(CFG)" == "i18n - Win32 Release" - -# Begin Custom Build -InputPath=.\unicode\ucurr.h - -"..\..\include\unicode\ucurr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\include\unicode - -# End Custom Build - -!ELSEIF "$(CFG)" == "i18n - Win32 Debug" - -# Begin Custom Build -InputPath=.\unicode\ucurr.h - -"..\..\include\unicode\ucurr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\include\unicode - -# End Custom Build - -!ELSEIF "$(CFG)" == "i18n - Win64 Release" - -# Begin Custom Build -InputPath=.\unicode\ucurr.h - -"..\..\include\unicode\ucurr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\include\unicode - -# End Custom Build - -!ELSEIF "$(CFG)" == "i18n - Win64 Debug" - -# Begin Custom Build -InputPath=.\unicode\ucurr.h - -"..\..\include\unicode\ucurr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\include\unicode - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\unicode\datefmt.h !IF "$(CFG)" == "i18n - Win32 Release" @@ -2012,6 +2849,53 @@ InputPath=.\unicode\ucoleitr.h # End Source File # Begin Source File +SOURCE=.\unicode\ucurr.h + +!IF "$(CFG)" == "i18n - Win32 Release" + +# Begin Custom Build +InputPath=.\unicode\ucurr.h + +"..\..\include\unicode\ucurr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode + +# End Custom Build + +!ELSEIF "$(CFG)" == "i18n - Win32 Debug" + +# Begin Custom Build +InputPath=.\unicode\ucurr.h + +"..\..\include\unicode\ucurr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode + +# End Custom Build + +!ELSEIF "$(CFG)" == "i18n - Win64 Release" + +# Begin Custom Build +InputPath=.\unicode\ucurr.h + +"..\..\include\unicode\ucurr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode + +# End Custom Build + +!ELSEIF "$(CFG)" == "i18n - Win64 Debug" + +# Begin Custom Build +InputPath=.\unicode\ucurr.h + +"..\..\include\unicode\ucurr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\unicode\udat.h !IF "$(CFG)" == "i18n - Win32 Release" diff --git a/icu4c/source/layout/layout.dsp b/icu4c/source/layout/layout.dsp index 03d7478c8c..c5acc53bce 100644 --- a/icu4c/source/layout/layout.dsp +++ b/icu4c/source/layout/layout.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\include" /I "..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /D "U_LAYOUT_IMPLEMENTATION" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\include" /I "..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /D "U_LAYOUT_IMPLEMENTATION" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -72,7 +72,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /D "U_LAYOUT_IMPLEMENTATION" /FR /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /D "U_LAYOUT_IMPLEMENTATION" /FR /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/icu4c/source/stubdata/stubdata.dsp b/icu4c/source/stubdata/stubdata.dsp index afcf23bb09..22a1b728a2 100644 --- a/icu4c/source/stubdata/stubdata.dsp +++ b/icu4c/source/stubdata/stubdata.dsp @@ -118,9 +118,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IA64 -# ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:IA64 /out:"..\..\bin\icudt22l.dll" /implib:"..\..\lib\icudata.lib" /incremental:no -# SUBTRACT LINK32 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64 +# ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:IX86 /out:"..\..\bin\icudt22l.dll" /implib:"..\..\lib\icudata.lib" /machine:IA64 # Begin Special Build Tool ProjDir=. SOURCE="$(InputPath)" @@ -150,9 +149,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:IA64 /out:"..\..\bin\icudt22l.dll" /implib:"..\..\lib\icudata.lib" /pdbtype:sept /incremental:no -# SUBTRACT LINK32 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 kernel32.lib user32.lib /nologo /dll /incremental:no /machine:IX86 /out:"..\..\bin\icudt22l.dll" /implib:"..\..\lib\icudata.lib" /pdbtype:sept /machine:IA64 # Begin Special Build Tool ProjDir=. SOURCE="$(InputPath)" diff --git a/icu4c/source/test/cintltst/capitst.c b/icu4c/source/test/cintltst/capitst.c index 100309d4c3..e0c11e7c7e 100644 --- a/icu4c/source/test/cintltst/capitst.c +++ b/icu4c/source/test/cintltst/capitst.c @@ -167,7 +167,7 @@ void TestGetDefaultRules(){ log_err("Error: ucol_getDefaultRulesArray() failed\n"); } - uprv_free(binColData); + free(binColData); ures_close(binColl); ures_close(res); ucol_close(coll); @@ -315,7 +315,7 @@ void TestProperty() doAssert( tempLength != 0, "getRules() result incorrect" ); log_verbose("getRules tests end.\n"); { - UChar *buffer = (UChar *)uprv_malloc(200000*sizeof(UChar)); + UChar *buffer = (UChar *)malloc(200000*sizeof(UChar)); int32_t bufLen = 200000; buffer[0] = '\0'; log_verbose("ucol_getRulesEx() testing ...\n"); @@ -327,7 +327,7 @@ void TestProperty() tempLength=ucol_getRulesEx(col,UCOL_FULL_RULES,buffer,bufLen ); doAssert( tempLength != 0, "getRulesEx() result incorrect" ); log_verbose("getRules tests end.\n"); - uprv_free(buffer); + free(buffer); } ucol_close(ruled); ucol_close(col); diff --git a/icu4c/source/test/cintltst/cbiapts.c b/icu4c/source/test/cintltst/cbiapts.c index f43668b81f..9f5c64e594 100644 --- a/icu4c/source/test/cintltst/cbiapts.c +++ b/icu4c/source/test/cintltst/cbiapts.c @@ -81,14 +81,14 @@ static UChar* toUChar(const char *src, void **freeHook) { &status); destSize = (numUChars+1) * sizeof(UChar) + sizeof(struct StringStruct); - dest = (StringStruct *)uprv_malloc(destSize); + dest = (StringStruct *)malloc(destSize); if (dest != NULL) { if (status == U_BUFFER_OVERFLOW_ERROR || status == U_STRING_NOT_TERMINATED_WARNING) { ucnv_toUChars(cnv, dest->str, numUChars+1, src, -1, &status); } else if (status == U_ZERO_ERROR) { u_strcpy(dest->str, stackBuf); } else { - uprv_free(dest); + free(dest); dest = NULL; } } @@ -108,7 +108,7 @@ static void freeToUCharStrings(void **hook) { StringStruct *s = *(StringStruct **)hook; while (s != NULL) { StringStruct *next = s->link; - uprv_free(s); + free(s); s = next; } } diff --git a/icu4c/source/test/cintltst/cbiditst.c b/icu4c/source/test/cintltst/cbiditst.c index 0b8134c994..b643032e35 100644 --- a/icu4c/source/test/cintltst/cbiditst.c +++ b/icu4c/source/test/cintltst/cbiditst.c @@ -244,8 +244,8 @@ static void TestReorder(){ for(;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){ int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]); int32_t destSize = srcSize*2; - UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize ); - UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize); + UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize ); + UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize); char* chars=NULL; ec = U_ZERO_ERROR; u_unescape(logicalOrder[i],src,srcSize); @@ -273,15 +273,15 @@ static void TestReorder(){ } - uprv_free(src); - uprv_free(dest); + free(src); + free(dest); } for(i=0;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){ int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]); int32_t destSize = srcSize*2; - UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize ); - UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize); + UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize ); + UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize); char* chars=NULL; ec = U_ZERO_ERROR; u_unescape(logicalOrder[i],src,srcSize); @@ -310,15 +310,15 @@ static void TestReorder(){ } - uprv_free(src); - uprv_free(dest); + free(src); + free(dest); } for(i=0;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){ int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]); int32_t destSize = srcSize*2; - UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize ); - UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize); + UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize ); + UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize); char* chars=NULL; ec = U_ZERO_ERROR; u_unescape(logicalOrder[i],src,srcSize); @@ -349,15 +349,15 @@ static void TestReorder(){ } - uprv_free(src); - uprv_free(dest); + free(src); + free(dest); } /* Max Explicit level */ for(i=0;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){ int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]); int32_t destSize = srcSize*2; - UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize ); - UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize); + UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize ); + UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize); char* chars=NULL; UBiDiLevel levels[UBIDI_MAX_EXPLICIT_LEVEL]={1,2,3,4,5,6,7,8,9,10}; ec = U_ZERO_ERROR; @@ -388,14 +388,14 @@ static void TestReorder(){ } - uprv_free(src); - uprv_free(dest); + free(src); + free(dest); } for(i=0;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){ int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]); int32_t destSize = srcSize*2; - UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize ); - UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize); + UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize ); + UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize); char* chars=NULL; UBiDiLevel levels[UBIDI_MAX_EXPLICIT_LEVEL]={1,2,3,4,5,6,7,8,9,10}; ec = U_ZERO_ERROR; @@ -425,8 +425,8 @@ static void TestReorder(){ log_err("ubidi_writeReordered() did not give expected results for UBIDI_DO_MIRRORING+UBIDI_REMOVE_BIDI_CONTROLS. Expected: %s Got: %s At Index: %d\n",visualOrder[i],chars,i); } - uprv_free(src); - uprv_free(dest); + free(src); + free(dest); } ubidi_close(bidi); } diff --git a/icu4c/source/test/cintltst/ccaltst.c b/icu4c/source/test/cintltst/ccaltst.c index 6f1fb69a28..171da58a5e 100644 --- a/icu4c/source/test/cintltst/ccaltst.c +++ b/icu4c/source/test/cintltst/ccaltst.c @@ -85,7 +85,7 @@ static void TestCalendar() /*Testing the ucal_open() function*/ log_verbose("\nTesting the ucal_open()\n"); - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "PST"); caldef=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status); if(U_FAILURE(status)){ @@ -153,7 +153,7 @@ static void TestCalendar() { status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); ucal_getTimeZoneDisplayName(caldef, UCAL_DST, "en_US", result, resultlength, &status); } if(U_FAILURE(status)) { @@ -167,7 +167,7 @@ static void TestCalendar() #define expectPDT "Pacific Daylight Time" - tzdname=(UChar*)uprv_malloc(sizeof(UChar) * (sizeof(expectPDT)+1)); + tzdname=(UChar*)malloc(sizeof(UChar) * (sizeof(expectPDT)+1)); u_uastrcpy(tzdname, expectPDT); if(u_strcmp(tzdname, result)==0){ log_verbose("PASS: got the correct time zone display name %s\n", u_austrcpy(tempMsgBuf, result) ); @@ -259,9 +259,9 @@ static void TestCalendar() ucal_close(calit); /*closing the UDateFormat used */ udat_close(datdef); - uprv_free(tzID); - uprv_free(result); - uprv_free(tzdname); + free(tzID); + free(result); + free(tzdname); } @@ -281,7 +281,7 @@ static void TestGetSetDateAPI() UChar temp[30]; log_verbose("\nOpening the calendars()\n"); - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_strcpy(tzID, fgGMTID); /*open the calendars used */ caldef=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status); @@ -451,7 +451,7 @@ static void TestGetSetDateAPI() ucal_close(caldef); ucal_close(caldef2); udat_close(datdef); - uprv_free(tzID); + free(tzID); } @@ -467,7 +467,7 @@ static void TestFieldGetSet() UDate d1; UErrorCode status=U_ZERO_ERROR; log_verbose("\nFetching pointer to UCalendar using the ucal_open()\n"); - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_strcpy(tzID, fgGMTID); /*open the calendar used */ cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status); @@ -593,7 +593,7 @@ static void TestFieldGetSet() ucal_close(cal); udat_close(datdef); - uprv_free(tzID); + free(tzID); } @@ -616,7 +616,7 @@ static void TestAddRollExtensive() log_verbose("Testing add and roll extensively\n"); - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "PST"); /*open the calendar used */ cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);; @@ -762,7 +762,7 @@ static void TestAddRollExtensive() } ucal_close(cal); - uprv_free(tzID); + free(tzID); } /*------------------------------------------------------ */ @@ -775,7 +775,7 @@ static void TestGetLimits() UErrorCode status = U_ZERO_ERROR; - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "PST"); /*open the calendar used */ cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);; @@ -854,7 +854,7 @@ static void TestGetLimits() ucal_close(cal); - uprv_free(tzID); + free(tzID); } @@ -875,7 +875,7 @@ static void TestDOWProgression() UErrorCode status = U_ZERO_ERROR; UChar* tzID = 0; char tempMsgBuf[256]; - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_strcpy(tzID, fgGMTID); /*open the calendar used */ cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);; @@ -922,7 +922,7 @@ static void TestDOWProgression() ucal_close(cal); udat_close(datfor); - uprv_free(tzID); + free(tzID); } @@ -952,7 +952,7 @@ static void testZones(int32_t yr, int32_t mo, int32_t dt, int32_t hr, int32_t mn UChar* tzID = 0; char tempMsgBuf[256]; - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_strcpy(tzID, fgGMTID); gmtcal=ucal_open(tzID, 3, "en_US", UCAL_TRADITIONAL, &status);; if (U_FAILURE(status)) { @@ -1020,7 +1020,7 @@ static void testZones(int32_t yr, int32_t mo, int32_t dt, int32_t hr, int32_t mn ucal_close(gmtcal); ucal_close(cal); udat_close(datfor); - uprv_free(tzID); + free(tzID); } /* ------------------------------------- */ diff --git a/icu4c/source/test/cintltst/ccapitst.c b/icu4c/source/test/cintltst/ccapitst.c index e1fe6f38af..903a6ce03b 100644 --- a/icu4c/source/test/cintltst/ccapitst.c +++ b/icu4c/source/test/cintltst/ccapitst.c @@ -218,7 +218,7 @@ static void TestConvert() if(U_SUCCESS(err)) { /* try to fill an array with all aliases */ const char **aliases; - aliases=(const char **)uprv_malloc(count * sizeof(const char *)); + aliases=(const char **)malloc(count * sizeof(const char *)); if(aliases != 0) { ucnv_getAliases("utf-8", aliases, &err); if(U_FAILURE(err)) { @@ -234,7 +234,7 @@ static void TestConvert() } } } - uprv_free((char **)aliases); + free((char **)aliases); } } } diff --git a/icu4c/source/test/cintltst/ccolltst.c b/icu4c/source/test/cintltst/ccolltst.c index 6da29b1199..7863facfe3 100644 --- a/icu4c/source/test/cintltst/ccolltst.c +++ b/icu4c/source/test/cintltst/ccolltst.c @@ -71,8 +71,8 @@ void reportCResult( const UChar source[], const UChar target[], UCollationResult expectedResult ) { UChar *sResult, *sExpect; - sResult=(UChar*)uprv_malloc(sizeof(UChar) * 10); - sExpect=(UChar*)uprv_malloc(sizeof(UChar) * 10); + sResult=(UChar*)malloc(sizeof(UChar) * 10); + sExpect=(UChar*)malloc(sizeof(UChar) * 10); if (expectedResult < -1 || expectedResult > 1) { log_err("***** invalid call to reportCResult ****\n"); @@ -128,8 +128,8 @@ void reportCResult( const UChar source[], const UChar target[], log_verbose("SortKey2: %s\n", dumpSk(targetKey, sk)); } - uprv_free(sExpect); - uprv_free(sResult); + free(sExpect); + free(sResult); } UChar* appendCompareResult(UCollationResult result, UChar* target) @@ -157,7 +157,8 @@ UChar* appendCompareResult(UCollationResult result, UChar* target) UChar* CharsToUChars(const char* str) { /* Might be faster to just use uprv_strlen() as the preflight len - liu */ int32_t len = u_unescape(str, 0, 0); /* preflight */ - UChar *buf = (UChar*) uprv_malloc(sizeof(UChar) * len); + /* Do NOT use malloc() - we are supposed to be acting like user code! */ + UChar *buf = (UChar*) malloc(sizeof(UChar) * len); u_unescape(str, buf, len); return buf; } diff --git a/icu4c/source/test/cintltst/cdattst.c b/icu4c/source/test/cintltst/cdattst.c index a1c5bdb7f5..0d5c80836f 100644 --- a/icu4c/source/test/cintltst/cdattst.c +++ b/icu4c/source/test/cintltst/cdattst.c @@ -127,10 +127,10 @@ static void TestDateFormat() status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; if(result != NULL) { - uprv_free(result); + free(result); result = NULL; } - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_format(def, d, result, resultlength, NULL, &status); } if(U_FAILURE(status)) @@ -147,7 +147,7 @@ static void TestDateFormat() u_uastrcpy(temp, "10 juil. 96 16 h 05 GMT-07:00"); if(result != NULL) { - uprv_free(result); + free(result); result = NULL; } result=myDateFormat(fr, d); @@ -210,7 +210,7 @@ static void TestDateFormat() { status=U_ZERO_ERROR; resultlength=resultlengthneeded + 1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_toPattern(def1, FALSE, result, resultlength, &status); } if(U_FAILURE(status)) @@ -224,7 +224,7 @@ static void TestDateFormat() log_verbose("PASS: applyPattern and toPattern work fine\n"); if(result != NULL) { - uprv_free(result); + free(result); result = NULL; } @@ -299,7 +299,7 @@ static void TestDateFormat() log_verbose("PASS: getting and setting calendar successful\n"); if(result!=NULL) { - uprv_free(result); + free(result); } /*Closing the UDateForamt */ @@ -363,7 +363,7 @@ static void TestSymbols() /*testing getSymbols*/ log_verbose("\nTesting getSymbols\n"); - pattern=(UChar*)uprv_malloc(sizeof(UChar) * 10); + pattern=(UChar*)malloc(sizeof(UChar) * 10); u_uastrcpy(pattern, "jeudi"); resultlength=0; resultlengthout=udat_getSymbols(fr, UDAT_WEEKDAYS, 5 , NULL, resultlength, &status); @@ -372,10 +372,10 @@ static void TestSymbols() status=U_ZERO_ERROR; resultlength=resultlengthout+1; if(result != NULL) { - uprv_free(result); + free(result); result = NULL; } - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(fr, UDAT_WEEKDAYS, 5, result, resultlength, &status); } @@ -408,10 +408,10 @@ static void TestSymbols() if(result != NULL) { - uprv_free(result); + free(result); result = NULL; } -uprv_free(pattern); +free(pattern); log_verbose("\nTesting setSymbols\n"); /*applying the pattern so that setSymbolss works */ @@ -421,7 +421,7 @@ uprv_free(pattern); { status=U_ZERO_ERROR; resultlength=resultlengthout + 1; - pattern=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + pattern=(UChar*)malloc(sizeof(UChar) * resultlength); udat_toPattern(fr, FALSE, pattern, resultlength, &status); } if(U_FAILURE(status)) @@ -438,10 +438,10 @@ uprv_free(pattern); status=U_ZERO_ERROR; resultlength=resultlengthout + 1; if(result != NULL) { - uprv_free(result); + free(result); result = NULL; } - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_toPattern(fr, FALSE,result, resultlength, &status); } if(U_FAILURE(status)) @@ -454,7 +454,7 @@ uprv_free(pattern); else log_err("pattern could not be applied properly\n"); -uprv_free(pattern); +free(pattern); /*testing set symbols */ resultlength=0; resultlengthout=udat_getSymbols(fr, UDAT_MONTHS, 11 , NULL, resultlength, &status); @@ -462,10 +462,10 @@ uprv_free(pattern); status=U_ZERO_ERROR; resultlength=resultlengthout+1; if(result != NULL) { - uprv_free(result); + free(result); result = NULL; } - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(fr, UDAT_MONTHS, 11, result, resultlength, &status); } @@ -486,7 +486,7 @@ uprv_free(pattern); if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; resultlength=resultlengthout+1; - value=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + value=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(def, UDAT_MONTHS, 11, value, resultlength, &status); } if(U_FAILURE(status)) @@ -525,10 +525,10 @@ uprv_free(pattern); udat_close(fr); udat_close(def); if(result != NULL) { - uprv_free(result); + free(result); result = NULL; } - uprv_free(value); + free(value); } @@ -632,7 +632,7 @@ static void VerifygetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in int32_t resultlength, resultlengthout; - pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(expected)+1)); + pattern=(UChar*)malloc(sizeof(UChar) * (strlen(expected)+1)); u_uastrcpy(pattern, expected); resultlength=0; resultlengthout=udat_getSymbols(datfor, type, index , NULL, resultlength, &status); @@ -640,7 +640,7 @@ static void VerifygetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in { status=U_ZERO_ERROR; resultlength=resultlengthout+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(datfor, type, index, result, resultlength, &status); } @@ -655,8 +655,8 @@ static void VerifygetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in log_err("FAlL: getSymbols retrieved the wrong value\n Expected %s Got %s\n", austrdup(pattern), austrdup(result) ); } - uprv_free(result); - uprv_free(pattern); + free(result); + free(pattern); } static void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, int32_t index, const char* expected) @@ -666,7 +666,7 @@ static void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in int32_t resultlength, resultlengthout; UErrorCode status = U_ZERO_ERROR; - value=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(expected) + 1)); + value=(UChar*)malloc(sizeof(UChar) * (strlen(expected) + 1)); u_uastrcpy(value, expected); udat_setSymbols(datfor, type, index, value, u_strlen(value), &status); if(U_FAILURE(status)) @@ -680,7 +680,7 @@ static void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; resultlength=resultlengthout+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(datfor, type, index, result, resultlength, &status); } if(U_FAILURE(status)){ @@ -696,8 +696,8 @@ static void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in else log_verbose("PASS: setSymbols successful\n"); - uprv_free(value); - uprv_free(result); + free(value); + free(result); } @@ -713,7 +713,7 @@ static void VerifygetsetSymbols(UDateFormat* from, UDateFormat* to, UDateFormatS if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; resultlength=resultlengthout+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(from, type, index, result, resultlength, &status); } if(U_FAILURE(status)){ @@ -734,7 +734,7 @@ static void VerifygetsetSymbols(UDateFormat* from, UDateFormat* to, UDateFormatS if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; resultlength=resultlengthout+1; - value=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + value=(UChar*)malloc(sizeof(UChar) * resultlength); udat_getSymbols(to, type, index, value, resultlength, &status); } if(U_FAILURE(status)){ @@ -750,8 +750,8 @@ static void VerifygetsetSymbols(UDateFormat* from, UDateFormat* to, UDateFormatS else log_verbose("PASS: setSymbols successful\n"); - uprv_free(value); - uprv_free(result); + free(value); + free(result); } diff --git a/icu4c/source/test/cintltst/cdtdptst.c b/icu4c/source/test/cintltst/cdtdptst.c index 3206e551f4..4b9d355b5b 100644 --- a/icu4c/source/test/cintltst/cdtdptst.c +++ b/icu4c/source/test/cintltst/cdtdptst.c @@ -50,7 +50,7 @@ void TestTwoDigitYearDSTParse() UChar *s; int32_t pos; - pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("EEE MMM dd HH:mm:ss.SSS zzz yyyy G")+1 )); + pattern=(UChar*)malloc(sizeof(UChar) * (strlen("EEE MMM dd HH:mm:ss.SSS zzz yyyy G")+1 )); u_uastrcpy(pattern, "EEE MMM dd HH:mm:ss.SSS zzz yyyy G"); fullFmt= udat_open(UDAT_IGNORE, UDAT_IGNORE,"en_US",NULL,0,pattern, u_strlen(pattern),&status); if(U_FAILURE(status)) { @@ -63,7 +63,7 @@ void TestTwoDigitYearDSTParse() fmt= udat_open(UDAT_IGNORE,UDAT_IGNORE,"en_US", NULL, 0,pattern, u_strlen(pattern), &status); - s=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("03-Apr-04 2:20:47 o'clock AM PST")+1) ); + s=(UChar*)malloc(sizeof(UChar) * (strlen("03-Apr-04 2:20:47 o'clock AM PST")+1) ); u_uastrcpy(s, "03-Apr-04 2:20:47 o'clock AM PST"); pos=0; d = udat_parse(fmt, s, u_strlen(s), &pos, &status); @@ -89,8 +89,8 @@ void TestTwoDigitYearDSTParse() udat_close(fullFmt); udat_close(fmt); - uprv_free(pattern); - uprv_free(s); + free(pattern); + free(s); } @@ -116,7 +116,7 @@ void TestPartialParse994() log_err("FAIL: ErrorCode received during test: %s\n", myErrorName(status)); return; } - s=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("01/01/1997 10:11:42 AM")+1) ); + s=(UChar*)malloc(sizeof(UChar) * (strlen("01/01/1997 10:11:42 AM")+1) ); u_uastrcpy(s, "01/01/1997 10:11:42 AM"); pos=0; d = udat_parse(f, s, u_strlen(s), &pos, &status); @@ -127,7 +127,7 @@ void TestPartialParse994() tryPat994(f, "yy/MM/dd HH:mm:ss", "97/01/01 ", null); tryPat994(f, "yy/MM/dd HH:mm:ss", "97/01/01", null); udat_close(f); - uprv_free(s); + free(s); } @@ -140,9 +140,9 @@ void tryPat994(UDateFormat* format, const char* pattern, const char* s, UDate ex UDate null=0; int32_t pos; UErrorCode status = U_ZERO_ERROR; - str=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(s) + 1) ); + str=(UChar*)malloc(sizeof(UChar) * (strlen(s) + 1) ); u_uastrcpy(str, s); - pat=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(pattern) + 1) ); + pat=(UChar*)malloc(sizeof(UChar) * (strlen(pattern) + 1) ); u_uastrcpy(pat, pattern); log_verbose("Pattern : %s ; String : %s\n", austrdup(pat), austrdup(str)); udat_applyPattern(format, FALSE, pat, u_strlen(pat)); @@ -162,8 +162,8 @@ void tryPat994(UDateFormat* format, const char* pattern, const char* s, UDate ex log_err("FAIL: Expected : %s\n", austrdup(str) ); } - uprv_free(str); - uprv_free(pat); + free(str); + free(pat); } @@ -178,7 +178,7 @@ void TestRunTogetherPattern985() UDateFormat *format; UDate date1, date2; UErrorCode status = U_ZERO_ERROR; - pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("yyyyMMddHHmmssSSS")+1) ); + pattern=(UChar*)malloc(sizeof(UChar) * (strlen("yyyyMMddHHmmssSSS")+1) ); u_uastrcpy(pattern, "yyyyMMddHHmmssSSS"); format = udat_open(UDAT_IGNORE, UDAT_IGNORE, NULL, NULL, 0,pattern, u_strlen(pattern), &status); if(U_FAILURE(status)){ @@ -196,7 +196,7 @@ void TestRunTogetherPattern985() if (!(date2 == date1)) log_err("FAIL\n"); udat_close(format); - uprv_free(pattern); + free(pattern); } @@ -225,11 +225,11 @@ void TestCzechMonths459() lneed=udat_toPattern(fmt, TRUE, NULL, lneed, &status); if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; - pattern=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) ); + pattern=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); udat_toPattern(fmt, TRUE, pattern, lneed+1, &status); } if(U_FAILURE(status)){ log_err("Error in extracting the pattern\n"); } - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "GMT"); cal=ucal_open(tzID, u_strlen(tzID), "cs", UCAL_GREGORIAN, &status); if(U_FAILURE(status)){ log_err("error in ucal_open caldef : %s\n", myErrorName(status)); } @@ -261,8 +261,8 @@ void TestCzechMonths459() udat_close(fmt); ucal_close(cal); - uprv_free(pattern); - uprv_free(tzID); + free(pattern); + free(tzID); } /** @@ -277,7 +277,7 @@ void TestQuotePattern161() UChar *dateString; UErrorCode status = U_ZERO_ERROR; const char* expStr = "04/13/1999 at 10:42:28 AM "; - pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("MM/dd/yyyy 'at' hh:mm:ss a zzz")+1) ); + pattern=(UChar*)malloc(sizeof(UChar) * (strlen("MM/dd/yyyy 'at' hh:mm:ss a zzz")+1) ); u_uastrcpy(pattern, "MM/dd/yyyy 'at' hh:mm:ss a zzz"); /* this is supposed to open default date format, but later on it treats it like it is "en_US" @@ -288,7 +288,7 @@ void TestQuotePattern161() log_err("error in udat_open: %s\n", myErrorName(status)); return; } - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "PST"); /* this is supposed to open default date format, but later on it treats it like it is "en_US" - very bad if you try to run the tests on machine where default locale is NOT "en_US" */ @@ -300,7 +300,7 @@ void TestQuotePattern161() currentTime_1 = ucal_getMillis(cal, &status); dateString = myDateFormat(format, currentTime_1); - exp=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(expStr) + 1) ); + exp=(UChar*)malloc(sizeof(UChar) * (strlen(expStr) + 1) ); u_uastrcpy(exp, expStr); log_verbose("%s\n", austrdup(dateString) ); @@ -309,8 +309,8 @@ void TestQuotePattern161() udat_close(format); ucal_close(cal); - uprv_free(exp); - uprv_free(tzID); - uprv_free(pattern); + free(exp); + free(tzID); + free(pattern); } diff --git a/icu4c/source/test/cintltst/cdtrgtst.c b/icu4c/source/test/cintltst/cdtrgtst.c index 7f17756ba8..be26521005 100644 --- a/icu4c/source/test/cintltst/cdtrgtst.c +++ b/icu4c/source/test/cintltst/cdtrgtst.c @@ -68,7 +68,7 @@ void Test4029195() { status=U_ZERO_ERROR; resultlength=resultlengthneeded + 1; - pat=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + pat=(UChar*)malloc(sizeof(UChar) * resultlength); udat_toPattern(df, TRUE, pat, resultlength, &status); } @@ -78,7 +78,7 @@ void Test4029195() fmdt = myFormatit(df, today); log_verbose("today: %s\n", austrdup(fmdt)); - temp=(UChar*)uprv_malloc(sizeof(UChar) * 10); + temp=(UChar*)malloc(sizeof(UChar) * 10); u_uastrcpy(temp, "M yyyy dd"); udat_applyPattern(df, TRUE, temp, u_strlen(temp)); @@ -102,9 +102,9 @@ void Test4029195() else log_verbose("Pass: parse and format working fine\n"); udat_close(df); - uprv_free(temp); + free(temp); if(pat != NULL) { - uprv_free(pat); + free(pat); } } @@ -133,7 +133,7 @@ void Test4056591() }; log_verbose("Testing s[get] 2 digit year start regressively\n"); - tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4); + tzID=(UChar*)malloc(sizeof(UChar) * 4); u_uastrcpy(tzID, "PST"); cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status); if(U_FAILURE(status)){ @@ -182,7 +182,7 @@ void Test4056591() udat_close(def); ucal_close(cal); - uprv_free(tzID); + free(tzID); } @@ -196,7 +196,7 @@ void Test4059917() UErrorCode status = U_ZERO_ERROR; UChar *pattern; log_verbose("Testing apply pattern and to pattern regressively\n"); - pattern=(UChar*)uprv_malloc(sizeof(UChar) * 11); + pattern=(UChar*)malloc(sizeof(UChar) * 11); u_uastrcpy(pattern, "yyyy/MM/dd"); log_verbose("%s\n", austrdup(pattern) ); def = udat_open(UDAT_IGNORE,UDAT_IGNORE,NULL,NULL,0,pattern, u_strlen(pattern),&status); @@ -205,7 +205,7 @@ void Test4059917() log_err("FAIL: error in creating the dateformat using openPattern: %s\n", myErrorName(status)); return; } - myDate=(UChar*)uprv_malloc(sizeof(UChar) * 11); + myDate=(UChar*)malloc(sizeof(UChar) * 11); u_uastrcpy(myDate, "1970/01/12"); aux917( def, myDate ); @@ -221,8 +221,8 @@ void Test4059917() u_uastrcpy(myDate, "19700112"); aux917( def, myDate ); udat_close(def); - uprv_free(pattern); - uprv_free(myDate); + free(pattern); + free(myDate); } @@ -240,7 +240,7 @@ void aux917( UDateFormat *fmt, UChar* str) { status=U_ZERO_ERROR; resultlength=resultlengthneeded + 1; - pat=(UChar*)uprv_malloc(sizeof(UChar) * (resultlength)); + pat=(UChar*)malloc(sizeof(UChar) * (resultlength)); udat_toPattern(fmt, TRUE, pat, resultlength, &status); } if(U_FAILURE(status)){ @@ -253,7 +253,7 @@ void aux917( UDateFormat *fmt, UChar* str) if( u_strcmp(formatted,str)!=0) { log_err("Fail: Want %s Got: %s\n", austrdup(str), austrdup(formatted) ); } - uprv_free(pat); + free(pat); } /** @@ -385,7 +385,7 @@ void Test4073003() for(i= 0; i < 4; i+=2) { status=U_ZERO_ERROR; - datestr=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(tests[i])+1)); + datestr=(UChar*)malloc(sizeof(UChar) * (strlen(tests[i])+1)); u_uastrcpy(datestr, tests[i]); pos=0; @@ -394,8 +394,8 @@ void Test4073003() log_err("ERROR : in test 4073003: %s\n", myErrorName(status)); } - uprv_free(datestr); - datestr=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(tests[i+1])+1)); + free(datestr); + datestr=(UChar*)malloc(sizeof(UChar) * (strlen(tests[i+1])+1)); u_uastrcpy(datestr, tests[i+1]); pos=0; @@ -404,7 +404,7 @@ void Test4073003() if(U_FAILURE(status)){ log_err("ERROR : in test 4073003: %s\n", myErrorName(status)); } - uprv_free(datestr); + free(datestr); result =myFormatit(fmt, d); result2 =myFormatit(fmt, dd); diff --git a/icu4c/source/test/cintltst/cintltst.c b/icu4c/source/test/cintltst/cintltst.c index 72005c37d3..f29cc801c8 100644 --- a/icu4c/source/test/cintltst/cintltst.c +++ b/icu4c/source/test/cintltst/cintltst.c @@ -97,8 +97,7 @@ int main(int argc, const char* const argv[]) } /* If no ICU_DATA environment was set, try to fake up one. */ - - fprintf(stdout, "u_getDataDirectory() = %s\n", u_getDataDirectory()); + /* fprintf(stderr, "u_getDataDirectory() = %s\n", u_getDataDirectory()); */ #ifdef XP_MAC_CONSOLE argc = ccommand((char***)&argv); @@ -195,7 +194,7 @@ static void ctest_appendToDataDirectory(const char *toAppend) } else { oldLen = strlen(oldPath); newLen = strlen(toAppend)+1+oldLen; - + if(newLen > 1022) { newPath = (char *)ctst_malloc(newLen); @@ -204,16 +203,16 @@ static void ctest_appendToDataDirectory(const char *toAppend) strcpy(newPath, oldPath); strcpy(newPath+oldLen, U_PATH_SEP_STRING); strcpy(newPath+oldLen+1, toAppend); - + u_setDataDirectory(newPath); - + if(newPath != newBuf) { free(newPath); } } } - + void ctest_pathnameInContext( char* fullname, int32_t maxsize, const char* relPath ) @@ -334,7 +333,7 @@ const char *ctest_dataOutDir() * tests dynamically load some data. */ void ctest_setICU_DATA() { - + /* No location for the data dir was identifiable. * Add other fallbacks for the test data location here if the need arises @@ -411,9 +410,9 @@ const char* loadTestData(UErrorCode* err){ strcat(tdpath, tdrelativepath); strcat(tdpath,"testdata"); - + test=ures_open(tdpath, "testtypes", err); - + /* Fall back did not succeed either so return */ if(U_FAILURE(*err)){ *err = U_FILE_ACCESS_ERROR; diff --git a/icu4c/source/test/cintltst/cintltst.dsp b/icu4c/source/test/cintltst/cintltst.dsp index ea86d592a0..020b32af14 100644 --- a/icu4c/source/test/cintltst/cintltst.dsp +++ b/icu4c/source/test/cintltst/cintltst.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MT /Za /W3 /GX /O2 /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 icuucd.lib icuind.lib ctestfwd.lib icutud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib\\" -# SUBTRACT LINK32 /profile +# ADD LINK32 icuucd.lib icuind.lib icutud.lib ctestfwd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib" +# SUBTRACT LINK32 /incremental:no !ELSEIF "$(CFG)" == "cintltst - Win64 Release" @@ -146,255 +146,1203 @@ LINK32=link.exe # Begin Source File SOURCE=.\bocu1tst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\callcoll.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\calltest.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\capitst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cbiapts.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cbididat.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cbiditst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cbkittst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ccaltst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ccapitst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ccolltst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cconvtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ccurrtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cdantst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cdattst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cdetst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cdtdptst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cdtrgtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cestst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cfintst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cformtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cfrtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cg7coll.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\chashtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cintltst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\citertst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cjaptst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cloctst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cmsccoll.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cmsgtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cnmdptst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cnormtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cnumtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cregrtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\crestst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\creststn.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cstrcase.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cstrtest.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ctstdep.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cturtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cucdtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\custrtrn.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\cutiltst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\dadrcoll.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\encoll.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\eurocreg.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\mstrmtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\nccbtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ncnvfbts.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ncnvtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\nucnvtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\putiltst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\stdnmtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\trietest.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucmptst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\udatatst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 /Ze + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 /Ze + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + # ADD CPP /Ze + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +# ADD CPP /Ze + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uenumtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\usettest.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\usrchdat.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\usrchtst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\utf16tst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\utf8tst.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File SOURCE=.\utransts.c + +!IF "$(CFG)" == "cintltst - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "cintltst - Win64 Release" + +!ELSEIF "$(CFG)" == "cintltst - Win64 Debug" + +!ENDIF + # End Source File # End Group # Begin Group "Header Files" diff --git a/icu4c/source/test/cintltst/citertst.c b/icu4c/source/test/cintltst/citertst.c index 6fa9377100..19c6231f4a 100644 --- a/icu4c/source/test/cintltst/citertst.c +++ b/icu4c/source/test/cintltst/citertst.c @@ -1195,9 +1195,9 @@ getSingleCEValue(char *primary, char *secondary, char *tertiary, *terend = '\0'; } - primvalue = (*primary!='\0')?strtoul(primary, &primend, 16):0; - secvalue = (*secondary!='\0')?strtoul(secondary, &secend, 16):0; - tervalue = (*tertiary!='\0')?strtoul(tertiary, &terend, 16):0; + primvalue = (*primary!='\0')?uprv_strtoul(primary, &primend, 16):0; + secvalue = (*secondary!='\0')?uprv_strtoul(secondary, &secend, 16):0; + tervalue = (*tertiary!='\0')?uprv_strtoul(tertiary, &terend, 16):0; if(primvalue <= 0xFF) { primvalue <<= 8; } @@ -1767,7 +1767,7 @@ static void TestCEValidity() rules = ucol_getRules(coll, &ruleLen); if (ruleLen > 0) { - rulesCopy = (UChar *)uprv_malloc((ruleLen + + rulesCopy = (UChar *)malloc((ruleLen + UCOL_TOK_EXTRA_RULE_SPACE_SIZE) * sizeof(UChar)); uprv_memcpy(rulesCopy, rules, ruleLen * sizeof(UChar)); src.source = src.current = rulesCopy; @@ -1791,7 +1791,7 @@ static void TestCEValidity() codepoints[chLen] = 0; checkCEValidity(coll, codepoints, chLen, 4, 85); } - uprv_free(rulesCopy); + free(rulesCopy); } ucol_close(coll); @@ -1947,7 +1947,7 @@ static void TestSortKeyValidity(void) rules = ucol_getRules(coll, &ruleLen); if (ruleLen > 0) { - rulesCopy = (UChar *)uprv_malloc((ruleLen + + rulesCopy = (UChar *)malloc((ruleLen + UCOL_TOK_EXTRA_RULE_SPACE_SIZE) * sizeof(UChar)); uprv_memcpy(rulesCopy, rules, ruleLen * sizeof(UChar)); src.source = src.current = rulesCopy; @@ -1971,7 +1971,7 @@ static void TestSortKeyValidity(void) codepoints[chLen] = 0; checkSortKeyValidity(coll, codepoints, chLen); } - uprv_free(rulesCopy); + free(rulesCopy); } ucol_close(coll); diff --git a/icu4c/source/test/cintltst/cmsccoll.c b/icu4c/source/test/cintltst/cmsccoll.c index 946b8d59f8..ed527303e3 100644 --- a/icu4c/source/test/cintltst/cmsccoll.c +++ b/icu4c/source/test/cintltst/cmsccoll.c @@ -199,7 +199,7 @@ static void IncompleteCntTest(void) break; } backAndForth(iter); - free(iter); + ucol_closeElements(iter); } } } @@ -226,7 +226,7 @@ static void IncompleteCntTest(void) break; } backAndForth(iter); - free(iter); + ucol_closeElements(iter); } } } @@ -646,7 +646,7 @@ static void testCollator(UCollator *coll, UErrorCode *status) { rules = ucol_getRules(coll, &ruleLen); if(U_SUCCESS(*status) && ruleLen > 0) { - rulesCopy = (UChar *)uprv_malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar)); + rulesCopy = (UChar *)malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar)); uprv_memcpy(rulesCopy, rules, ruleLen*sizeof(UChar)); src.source = src.current = rulesCopy; src.end = rulesCopy+ruleLen; @@ -730,7 +730,7 @@ static void testCollator(UCollator *coll, UErrorCode *status) { u_strcpy(first, second); } } - uprv_free(rulesCopy); + free(rulesCopy); } } @@ -1011,7 +1011,7 @@ static void testAgainstUCA(UCollator *coll, UCollator *UCA, const char *refName, /*printOutRules(rules);*/ if(U_SUCCESS(*status) && ruleLen > 0) { - rulesCopy = (UChar *)uprv_malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar)); + rulesCopy = (UChar *)malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar)); uprv_memcpy(rulesCopy, rules, ruleLen*sizeof(UChar)); src.source = src.current = rulesCopy; src.end = rulesCopy+ruleLen; @@ -1064,7 +1064,7 @@ static void testAgainstUCA(UCollator *coll, UCollator *UCA, const char *refName, if(Windiff == 0) { log_verbose("No immediate difference with Win32!\n"); } - uprv_free(rulesCopy); + free(rulesCopy); } } @@ -1109,7 +1109,7 @@ static void testCEs(UCollator *coll, UErrorCode *status) { ucol_initInverseUCA(status); if(U_SUCCESS(*status) && ruleLen > 0) { - rulesCopy = (UChar *)uprv_malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar)); + rulesCopy = (UChar *)malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar)); uprv_memcpy(rulesCopy, rules, ruleLen*sizeof(UChar)); src.source = src.current = rulesCopy; src.end = rulesCopy+ruleLen; @@ -1202,7 +1202,7 @@ static void testCEs(UCollator *coll, UErrorCode *status) { lastCE = currCE & 0xFFFFFF3F; lastContCE = currContCE & 0xFFFFFFBF; } - uprv_free(rulesCopy); + free(rulesCopy); } ucol_close(UCA); } @@ -1631,8 +1631,8 @@ static void TestComposeDecompose(void) { noOfLoc = uloc_countAvailable(); - t = uprv_malloc(0x30000 * sizeof(tester *)); - t[0] = (tester *)uprv_malloc(sizeof(tester)); + t = malloc(0x30000 * sizeof(tester *)); + t[0] = (tester *)malloc(sizeof(tester)); for(u = 0; u < 0x30000; u++) { len = 0; @@ -1648,7 +1648,7 @@ static void TestComposeDecompose(void) { t[noCases]->NFC[len] = 0; } noCases++; - t[noCases] = (tester *)uprv_malloc(sizeof(tester)); + t[noCases] = (tester *)malloc(sizeof(tester)); uprv_memset(t[noCases], 0, sizeof(tester)); } } @@ -1708,9 +1708,9 @@ static void TestComposeDecompose(void) { } } for(u = 0; u <= noCases; u++) { - uprv_free(t[u]); + free(t[u]); } - uprv_free(t); + free(t); } static void TestEmptyRule(void) { @@ -2151,8 +2151,8 @@ static void TestIncrementalNormalize(void) { UChar *strA; UChar *strB; - strA = uprv_malloc((maxSLen+1) * sizeof(UChar)); - strB = uprv_malloc((maxSLen+1) * sizeof(UChar)); + strA = malloc((maxSLen+1) * sizeof(UChar)); + strB = malloc((maxSLen+1) * sizeof(UChar)); coll = ucol_open("en_US", &status); ucol_setNormalization(coll, UNORM_NFD); @@ -2173,8 +2173,8 @@ static void TestIncrementalNormalize(void) { ucol_setStrength(coll, UCOL_IDENTICAL); /* Do again with the slow, general impl.*/ doTest(coll, strA, strB, UCOL_EQUAL); } - uprv_free(strA); - uprv_free(strB); + free(strA); + free(strB); } @@ -2836,7 +2836,7 @@ static void TestVariableTopSetting(void) { log_verbose("Slide variable top over UCARules\n"); rulesLen = ucol_getRulesEx(coll, UCOL_FULL_RULES, rulesCopy, 0); - rulesCopy = (UChar *)uprv_malloc((rulesLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar)); + rulesCopy = (UChar *)malloc((rulesLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar)); rulesLen = ucol_getRulesEx(coll, UCOL_FULL_RULES, rulesCopy, rulesLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE); if(U_SUCCESS(status) && rulesLen > 0) { @@ -2994,7 +2994,7 @@ static void TestVariableTopSetting(void) { if(status != U_INTERNAL_PROGRAM_ERROR) { log_err("Bad reaction to passed error!\n"); } - uprv_free(rulesCopy); + free(rulesCopy); ucol_close(coll); } @@ -3038,7 +3038,7 @@ static void TestExtremeCompression(void) { int32_t i = 0; for(i = 0; i<4; i++) { - test[i] = (char *)uprv_malloc(2048*sizeof(char)); + test[i] = (char *)malloc(2048*sizeof(char)); uprv_memset(test[i], 'a', 2046*sizeof(char)); test[i][2046] = (char)('a'+i); test[i][2047] = 0; @@ -3047,7 +3047,7 @@ static void TestExtremeCompression(void) { genericLocaleStarter("en_US", (const char **)test, 4); for(i = 0; i<4; i++) { - uprv_free(test[i]); + free(test[i]); } } @@ -3409,10 +3409,10 @@ static void TestMergeSortKeys(void) { const char* suffix = "egg"; char outBuff1[256], outBuff2[256]; - uint8_t **sortkeys = (uint8_t **)uprv_malloc(casesSize*sizeof(uint8_t *)); - uint8_t **mergedPrefixkeys = (uint8_t **)uprv_malloc(casesSize*sizeof(uint8_t *)); - uint8_t **mergedSuffixkeys = (uint8_t **)uprv_malloc(casesSize*sizeof(uint8_t *)); - uint32_t *sortKeysLen = (uint32_t *)uprv_malloc(casesSize*sizeof(uint32_t)); + uint8_t **sortkeys = (uint8_t **)malloc(casesSize*sizeof(uint8_t *)); + uint8_t **mergedPrefixkeys = (uint8_t **)malloc(casesSize*sizeof(uint8_t *)); + uint8_t **mergedSuffixkeys = (uint8_t **)malloc(casesSize*sizeof(uint8_t *)); + uint32_t *sortKeysLen = (uint32_t *)malloc(casesSize*sizeof(uint32_t)); uint8_t prefixKey[256], suffixKey[256]; uint32_t prefixKeyLen = 0, suffixKeyLen = 0, i = 0; UChar buffer[256]; @@ -3425,9 +3425,9 @@ static void TestMergeSortKeys(void) { genericLocaleStarter("en", cases, casesSize); for(i = 0; i %e\n", ppos, a); - uprv_free(str); + free(str); } for (v=0; v %e\n", ppos, a); - uprv_free(str); + free(str); } ival += val_length; ilval += lval_length; unum_close(fmt); - uprv_free(upat); + free(upat); } } @@ -335,7 +335,7 @@ static void TestCurrencySign(void) UErrorCode status = U_ZERO_ERROR; char tempBuf[256]; - pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("*#,##0.00;-*#,##0.00") + 1) ); + pattern=(UChar*)malloc(sizeof(UChar) * (strlen("*#,##0.00;-*#,##0.00") + 1) ); u_uastrcpy(pattern, "*#,##0.00;-*#,##0.00"); pattern[0]=pattern[11]=0xa4; /* insert latin-1 currency symbol */ fmt = unum_open(UNUM_IGNORE,pattern, u_strlen(pattern), "en_US",NULL, &status); @@ -346,7 +346,7 @@ static void TestCurrencySign(void) lneed=unum_formatDouble(fmt, 1234.56, NULL, lneed, NULL, &status); if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; - str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) ); + str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_formatDouble(fmt, 1234.56, str, lneed+1, NULL, &status); } if(U_FAILURE(status)) { @@ -356,37 +356,37 @@ static void TestCurrencySign(void) lneed=unum_toPattern(fmt, FALSE, NULL, lneed, &status); if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; - pat=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) ); + pat=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_formatDouble(fmt, FALSE, pat, lneed+1, NULL, &status); } log_verbose("Pattern \" %s \" \n", u_austrcpy(tempBuf, pat)); log_verbose("Format 1234.56 -> %s\n", u_austrcpy(tempBuf, str) ); - res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("$1,234.56")+1) ); + res=(UChar*)malloc(sizeof(UChar) * (strlen("$1,234.56")+1) ); u_uastrcpy(res, "$1,234.56"); if (u_strcmp(str, res) !=0) log_err("FAIL: Expected $1,234.56\n"); - uprv_free(str); - uprv_free(res); - uprv_free(pat); + free(str); + free(res); + free(pat); lneed=0; lneed=unum_formatDouble(fmt, -1234.56, NULL, lneed, NULL, &status); if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; - str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) ); + str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); unum_formatDouble(fmt, -1234.56, str, lneed+1, NULL, &status); } if(U_FAILURE(status)) { log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) ); } - res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("-$1,234.56")+1) ); + res=(UChar*)malloc(sizeof(UChar) * (strlen("-$1,234.56")+1) ); u_uastrcpy(res, "-$1,234.56"); if (u_strcmp(str, res) != 0) log_err("FAIL: Expected -$1,234.56\n"); - uprv_free(str); - uprv_free(res); + free(str); + free(res); unum_close(fmt); - uprv_free(pattern); + free(pattern); } /** @@ -415,22 +415,22 @@ static void TestCurrency(void) lneed= unum_formatDouble(currencyFmt, 1.50, NULL, lneed, NULL, &status); if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; - str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) ); + str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); pos.field = 0; unum_formatDouble(currencyFmt, 1.50, str, lneed+1, &pos, &status); } if(U_FAILURE(status)) { log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status) ); } - res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(result[i])+1) ); + res=(UChar*)malloc(sizeof(UChar) * (strlen(result[i])+1) ); u_uastrcpy(res, result[i]); u_UCharsToChars(str,cStr,u_strlen(res)); if (u_strcmp(str, res) != 0){ log_err("FAIL: Expected %s Got: %s for locale: %s\n", result[i],cStr,locale[i]); } unum_close(currencyFmt); - uprv_free(str); - uprv_free(res); + free(str); + free(res); } } /** @@ -471,14 +471,14 @@ static void TestCurrencyPreEuro(void) lneed= unum_formatDouble(currencyFmt, 1.50, NULL, lneed, NULL, &status); if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; - str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) ); + str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); pos.field = 0; unum_formatDouble(currencyFmt, 1.50, str, lneed+1, &pos, &status); } if(U_FAILURE(status)) { log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status) ); } - res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(result[i])+1) ); + res=(UChar*)malloc(sizeof(UChar) * (strlen(result[i])+1) ); u_unescape(result[i],res,(int32_t)(strlen(result[i])+1)); u_UCharsToChars(str,cStr,u_strlen(str)); if (u_strcmp(str, res) != 0){ @@ -486,8 +486,8 @@ static void TestCurrencyPreEuro(void) } unum_close(currencyFmt); - uprv_free(str); - uprv_free(res); + free(str); + free(res); } } @@ -552,14 +552,14 @@ static void TestCurrencyObject(void) lneed= unum_formatDouble(currencyFmt, 1234.56, NULL, lneed, NULL, &status); if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; - str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) ); + str=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); pos.field = 0; unum_formatDouble(currencyFmt, 1234.56, str, lneed+1, &pos, &status); } if(U_FAILURE(status)) { log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status) ); } - res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(result[i])+1) ); + res=(UChar*)malloc(sizeof(UChar) * (strlen(result[i])+1) ); u_unescape(result[i],res, (int32_t)(strlen(result[i])+1)); u_UCharsToChars(str,cStr,u_strlen(str)); if (u_strcmp(str, res) != 0){ @@ -567,8 +567,8 @@ static void TestCurrencyObject(void) } unum_close(currencyFmt); - uprv_free(str); - uprv_free(res); + free(str); + free(res); } } @@ -611,7 +611,7 @@ static void roundingTest(UNumberFormat* nf, double x, int32_t maxFractionDigits, lneed=unum_formatDouble(nf, x, NULL, lneed, NULL, &status); if(status==U_BUFFER_OVERFLOW_ERROR){ status=U_ZERO_ERROR; - out=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) ); + out=(UChar*)malloc(sizeof(UChar) * (lneed+1) ); pos.field=0; unum_formatDouble(nf, x, out, lneed+1, &pos, &status); } @@ -620,13 +620,13 @@ static void roundingTest(UNumberFormat* nf, double x, int32_t maxFractionDigits, } /*Need to use log_verbose here. Problem with the float*/ /*printf("%f format with %d fraction digits to %s\n", x, maxFractionDigits, austrdup(out) );*/ - res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(expected)+1) ); + res=(UChar*)malloc(sizeof(UChar) * (strlen(expected)+1) ); u_uastrcpy(res, expected); if (u_strcmp(out, res) != 0) log_err("FAIL: Expected: %s or %s\n", expected, austrdup(res) ); - uprv_free(res); + free(res); if(out != NULL) { - uprv_free(out); + free(out); } } diff --git a/icu4c/source/test/cintltst/cnumtst.c b/icu4c/source/test/cintltst/cnumtst.c index f4e752f863..50d2f07b1c 100644 --- a/icu4c/source/test/cintltst/cnumtst.c +++ b/icu4c/source/test/cintltst/cnumtst.c @@ -188,7 +188,7 @@ static void TestNumberFormat() { status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); /* for (i = 0; i < 100000; i++) */ { unum_format(cur_def, l, result, resultlength, &pos1, &status); @@ -209,7 +209,7 @@ static void TestNumberFormat() log_err("Fail: Error in complete number Formatting using unum_format()\nGot: b=%d end=%d\nExpected: b=1 end=12\n", pos1.beginIndex, pos1.endIndex); -uprv_free(result); +free(result); result = 0; log_verbose("\nTesting unum_formatDouble()\n"); @@ -221,7 +221,7 @@ uprv_free(result); { status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); /* for (i = 0; i < 100000; i++) */ { unum_formatDouble(cur_def, d, result, resultlength, &pos2, &status); @@ -277,7 +277,7 @@ uprv_free(result); else log_verbose("Pass: parsing successful\n"); -uprv_free(result); +free(result); u_uastrcpy(temp1, "($10,456.3E1])"); parsepos=0; @@ -297,7 +297,7 @@ uprv_free(result); { status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); /* for (i = 0; i < 100000; i++)*/ { unum_format(per_fr, l, result, resultlength, &pos1, &status); @@ -325,7 +325,7 @@ uprv_free(result); else log_verbose("Pass: parsing successful\n"); -uprv_free(result); +free(result); /* create a number format using unum_openPattern(....)*/ log_verbose("\nTesting unum_openPattern()\n"); @@ -346,7 +346,7 @@ uprv_free(result); { status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_toPattern(pattern, FALSE, result, resultlength, &status); } if(U_FAILURE(status)) @@ -359,7 +359,7 @@ uprv_free(result); log_err("FAIL: Error in extracting the pattern using unum_toPattern()\n"); else log_verbose("Pass: extracted the pattern correctly using unum_toPattern()\n"); -uprv_free(result); +free(result); } /*Testing unum_getSymbols() and unum_setSymbols()*/ @@ -371,7 +371,7 @@ uprv_free(result); { status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_toPattern(cur_def, FALSE, result, resultlength, &status); } if(U_FAILURE(status)) @@ -386,7 +386,7 @@ uprv_free(result); log_err("error in unum_openPattern(): %s\n", myErrorName(status)); } -uprv_free(result); +free(result); /*getting the symbols of cur_def */ /*set the symbols of cur_frpattern to cur_def */ @@ -407,7 +407,7 @@ uprv_free(result); { status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_format(cur_def, l, result, resultlength, &pos1, &status); } if(U_FAILURE(status)) @@ -462,7 +462,7 @@ uprv_free(result); /*----------- */ -uprv_free(result); +free(result); /* Testing unum_get/setSymbol() */ for(i = 0; i < UNUM_FORMAT_SYMBOL_COUNT; ++i) { @@ -719,7 +719,7 @@ static void TestNumberFormatPadding() { status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_toPattern(pattern, FALSE, result, resultlength, &status); } if(U_FAILURE(status)) @@ -732,7 +732,7 @@ static void TestNumberFormatPadding() log_err("FAIL: Error in extracting the padding pattern using unum_toPattern()\n"); else log_verbose("Pass: extracted the padding pattern correctly using unum_toPattern()\n"); -uprv_free(result); +free(result); } /* u_uastrcpy(temp1, "(xxxxxxx10,456.37)"); */ u_uastrcpy(temp1, "xxxxx(10,456.37)"); @@ -743,7 +743,7 @@ uprv_free(result); { status=U_ZERO_ERROR; resultlength=resultlengthneeded+1; - result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength); + result=(UChar*)malloc(sizeof(UChar) * resultlength); unum_formatDouble(pattern, d, result, resultlength, NULL, &status); } if(U_FAILURE(status)) @@ -776,7 +776,7 @@ uprv_free(result); log_err("Fail: Error in padding parsing\n"); else log_verbose("Pass: padding parsing successful\n"); -uprv_free(result); +free(result); } } diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 0fa6e63e06..41efcd0f83 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -1292,7 +1292,7 @@ static UBool testTag(const char* frag, free(base); base = NULL; } - base=(UChar*)uprv_malloc(sizeof(UChar)*(strlen(NAME[j]) + 1)); + base=(UChar*)malloc(sizeof(UChar)*(strlen(NAME[j]) + 1)); u_uastrcpy(base,NAME[j]); break; @@ -1302,7 +1302,7 @@ static UBool testTag(const char* frag, free(base); base = NULL; } - base = (UChar*) uprv_malloc(sizeof(UChar) * 1); + base = (UChar*) malloc(sizeof(UChar) * 1); *base = 0x0000; } } @@ -1323,11 +1323,11 @@ static UBool testTag(const char* frag, string=ures_getStringByKey(theBundle, tag, &len, &status); if(U_SUCCESS(status)) { - expected_string=(UChar*)uprv_malloc(sizeof(UChar)*(u_strlen(base) + 4)); + expected_string=(UChar*)malloc(sizeof(UChar)*(u_strlen(base) + 4)); u_strcpy(expected_string,base); CONFIRM_INT_EQ(len, u_strlen(expected_string)); }else{ - expected_string = (UChar*)uprv_malloc(sizeof(UChar)*(u_strlen(kERROR) + 1)); + expected_string = (UChar*)malloc(sizeof(UChar)*(u_strlen(kERROR) + 1)); u_strcpy(expected_string,kERROR); string=kERROR; } diff --git a/icu4c/source/test/cintltst/ctstdep.c b/icu4c/source/test/cintltst/ctstdep.c index 9069aa37cf..19a92f1762 100644 --- a/icu4c/source/test/cintltst/ctstdep.c +++ b/icu4c/source/test/cintltst/ctstdep.c @@ -111,7 +111,7 @@ TestDeprecatedCollationAPI(void) log_err("Creation of iterator failed\n"); break; } - free(iter); + ucol_closeElements(iter); } } } @@ -134,7 +134,7 @@ TestDeprecatedCollationAPI(void) log_err("Creation of iterator failed\n"); break; } - free(iter); + ucol_closeElements(iter); } } } diff --git a/icu4c/source/test/cintltst/cucdtst.c b/icu4c/source/test/cintltst/cucdtst.c index 8f0a213d17..548a97febe 100644 --- a/icu4c/source/test/cintltst/cucdtst.c +++ b/icu4c/source/test/cintltst/cucdtst.c @@ -18,14 +18,17 @@ #include "unicode/putil.h" #include "unicode/ustring.h" #include "unicode/uloc.h" -#include "cstring.h" -#include "cmemory.h" + #include "cintltst.h" #include "cucdtst.h" #include "uparse.h" #include "unicode/uscript.h" #include "usc_impl.h" +#include +#include +#include + /* prototypes --------------------------------------------------------------- */ static void setUpDataTable(void); @@ -422,7 +425,6 @@ static void TestMisc() } } - /* Tests for isControl(u_iscntrl()) and isPrintable(u_isprint()) */ static void TestControlPrint() { @@ -554,7 +556,7 @@ static void TestIdentifier() * Then it should check that the areas contain all the same properties except where overridden. * For this, it would have had to set a flag for which code points were listed explicitly. */ -static void U_CALLCONV +void U_CALLCONV unicodeDataLineFn(void *context, char *fields[][2], int32_t fieldCount, UErrorCode *pErrorCode) @@ -567,7 +569,7 @@ unicodeDataLineFn(void *context, int8_t type; /* get the character code, field 0 */ - c=uprv_strtoul(fields[0][0], &end, 16); + c=strtoul(fields[0][0], &end, 16); if(end<=fields[0][0] || end!=fields[0][1]) { log_err("error: syntax error in field 0 at %s\n", fields[0][0]); return; @@ -585,7 +587,7 @@ unicodeDataLineFn(void *context, } /* get canonical combining class, field 3 */ - value=uprv_strtoul(fields[3][0], &end, 10); + value=strtoul(fields[3][0], &end, 10); if(end<=fields[3][0] || end!=fields[3][1]) { log_err("error: syntax error in field 3 at code 0x%lx\n", c); return; @@ -608,7 +610,7 @@ unicodeDataLineFn(void *context, /* get ISO Comment, field 11 */ *fields[11][1]=0; i=u_getISOComment(c, buffer, sizeof(buffer), pErrorCode); - if(U_FAILURE(*pErrorCode) || 0!=uprv_strcmp(fields[11][0], buffer)) { + if(U_FAILURE(*pErrorCode) || 0!=strcmp(fields[11][0], buffer)) { log_err("error: u_getISOComment(U+%04lx) wrong (%s): \"%s\" should be \"%s\"\n", c, u_errorName(*pErrorCode), U_FAILURE(*pErrorCode) ? buffer : "[error]", @@ -617,7 +619,7 @@ unicodeDataLineFn(void *context, /* get uppercase mapping, field 12 */ if(fields[12][0]!=fields[12][1]) { - value=uprv_strtoul(fields[12][0], &end, 16); + value=strtoul(fields[12][0], &end, 16); if(end!=fields[12][1]) { log_err("error: syntax error in field 12 at code 0x%lx\n", c); return; @@ -634,7 +636,7 @@ unicodeDataLineFn(void *context, /* get lowercase mapping, field 13 */ if(fields[13][0]!=fields[13][1]) { - value=uprv_strtoul(fields[13][0], &end, 16); + value=strtoul(fields[13][0], &end, 16); if(end!=fields[13][1]) { log_err("error: syntax error in field 13 at code 0x%lx\n", c); return; @@ -651,7 +653,7 @@ unicodeDataLineFn(void *context, /* get titlecase mapping, field 14 */ if(fields[14][0]!=fields[14][1]) { - value=uprv_strtoul(fields[14][0], &end, 16); + value=strtoul(fields[14][0], &end, 16); if(end!=fields[14][1]) { log_err("error: syntax error in field 14 at code 0x%lx\n", c); return; @@ -693,7 +695,7 @@ enumTypeRange(const void *context, UChar32 start, UChar32 limit, UCharCategory t UChar32 c; int i, count; - if(0!=uprv_strcmp((const char *)context, "a1")) { + if(0!=strcmp((const char *)context, "a1")) { log_err("error: u_enumCharTypes() passes on an incorrect context pointer\n"); return FALSE; } @@ -814,9 +816,9 @@ static void TestUnicodeData() errorCode=U_ZERO_ERROR; u_parseDelimitedFile(newPath, ';', fields, 15, unicodeDataLineFn, NULL, &errorCode); - if(errorCode==U_FILE_ACCESS_ERROR) { + if(errorCode==U_FILE_ACCESS_ERROR) { errorCode=U_ZERO_ERROR; - u_parseDelimitedFile(backupPath, ';', fields, 15, unicodeDataLineFn, NULL, &errorCode); +// u_parseDelimitedFile(backupPath, ';', fields, 15, unicodeDataLineFn, NULL, &errorCode); } if(U_FAILURE(errorCode)) { log_err("error parsing UnicodeData.txt: %s\n", u_errorName(errorCode)); @@ -855,6 +857,7 @@ static void TestUnicodeData() u_enumCharTypes(enumTypeRange, "a1"); } + /*internal functions ----*/ static int32_t MakeProp(char* str) { @@ -1618,7 +1621,7 @@ enumCharNamesFn(void *context, int32_t *pCount=(int32_t *)context; int i; - if(length<=0 || length!=(int32_t)uprv_strlen(name)) { + if(length<=0 || length!=(int32_t)strlen(name)) { /* should not be called with an empty string or invalid length */ log_err("u_enumCharName(0x%lx)=%s but length=%ld\n", name, length); return TRUE; @@ -1629,17 +1632,17 @@ enumCharNamesFn(void *context, if(code==names[i].code) { switch (nameChoice) { case U_EXTENDED_CHAR_NAME: - if(0!=uprv_strcmp(name, names[i].extName)) { + if(0!=strcmp(name, names[i].extName)) { log_err("u_enumCharName(0x%lx - Extended)=%s instead of %s\n", code, name, names[i].extName); } break; case U_UNICODE_CHAR_NAME: - if(0!=uprv_strcmp(name, names[i].name)) { + if(0!=strcmp(name, names[i].name)) { log_err("u_enumCharName(0x%lx)=%s instead of %s\n", code, name, names[i].name); } break; case U_UNICODE_10_CHAR_NAME: - if(names[i].oldName[0]==0 || 0!=uprv_strcmp(name, names[i].oldName)) { + if(names[i].oldName[0]==0 || 0!=strcmp(name, names[i].oldName)) { log_err("u_enumCharName(0x%lx - 1.0)=%s instead of %s\n", code, name, names[i].oldName); } break; @@ -1696,7 +1699,7 @@ TestCharNames() { log_err("u_charName(0x%lx) error %s\n", names[i].code, u_errorName(errorCode)); return; } - if(length<0 || 0!=uprv_strcmp(name, names[i].name) || length!=(uint16_t)uprv_strlen(name)) { + if(length<0 || 0!=strcmp(name, names[i].name) || length!=(uint16_t)strlen(name)) { log_err("u_charName(0x%lx) gets: %s (length %ld) instead of: %s\n", names[i].code, name, length, names[i].name); } @@ -1718,7 +1721,7 @@ TestCharNames() { log_err("u_charName(0x%lx - 1.0) error %s\n", names[i].code, u_errorName(errorCode)); return; } - if(length<0 || (length>0 && 0!=uprv_strcmp(name, names[i].oldName)) || length!=(uint16_t)uprv_strlen(name)) { + if(length<0 || (length>0 && 0!=strcmp(name, names[i].oldName)) || length!=(uint16_t)strlen(name)) { log_err("u_charName(0x%lx - 1.0) gets %s length %ld instead of nothing or %s\n", names[i].code, name, length, names[i].oldName); } @@ -2535,7 +2538,7 @@ TestAdditionalProperties() { /* test u_charAge() */ for(i=0; iUnicode did not match.\n"); } } - uprv_free(standardForm); - uprv_free(utf8); + free(standardForm); + free(utf8); } #define MAX_UTF32_LEN 1 @@ -781,8 +781,8 @@ static void TestRegressionUTF32(){ UChar32 currCh = 0; int32_t offset32; int32_t offset16; - UChar *standardForm = (UChar*)uprv_malloc(MAX_LENGTH*sizeof(UChar)); - UChar32 *utf32 = (UChar32*)uprv_malloc(MAX_LENGTH*sizeof(UChar32)); + UChar *standardForm = (UChar*)malloc(MAX_LENGTH*sizeof(UChar)); + UChar32 *utf32 = (UChar32*)malloc(MAX_LENGTH*sizeof(UChar32)); while (currCh <= UNICODE_LIMIT) { offset16 = 0; @@ -807,8 +807,8 @@ static void TestRegressionUTF32(){ log_err("UTF32->Unicode did not match.\n"); } } - uprv_free(standardForm); - uprv_free(utf32); + free(standardForm); + free(utf32); } /*Walk through the available converters*/ diff --git a/icu4c/source/test/cintltst/nucnvtst.c b/icu4c/source/test/cintltst/nucnvtst.c index c9779ad9f7..f5fc9bb9c4 100644 --- a/icu4c/source/test/cintltst/nucnvtst.c +++ b/icu4c/source/test/cintltst/nucnvtst.c @@ -64,9 +64,9 @@ static void TestEBCDICUS4XML(void); static void TestJitterbug915(void); static void TestISCII(void); static void TestConv(const uint16_t in[], - int len, - const char* conv, - const char* lang, + int len, + const char* conv, + const char* lang, char byteArr[], int byteArrLen); static void TestRoundTrippingAllUTF(void); @@ -292,7 +292,7 @@ static UBool testConvertFromU( const UChar *source, int sourceLen, const uint8_ log_verbose("\n========= %s\n", gNuConvTestName); conv = my_ucnv_open(codepage, &status); - + if(U_FAILURE(status)) { log_err("Couldn't open converter %s\n",codepage); @@ -1058,16 +1058,16 @@ static void TestCoverageMBCS(){ #if 0 char* tdpath = NULL; - char* saveDirectory = (char*)uprv_malloc(sizeof(char) *(strlen(u_getDataDirectory())+1)); + char* saveDirectory = (char*)malloc(sizeof(char) *(strlen(u_getDataDirectory())+1)); int len = strlen(directory); char* index=NULL; - tdpath = (char*) uprv_malloc(sizeof(char) * (len * 2)); + tdpath = (char*) malloc(sizeof(char) * (len * 2)); uprv_strcpy(saveDirectory,u_getDataDirectory()); - log_verbose("Retrieved data directory %s \n",saveDirectory); - uprv_strcpy(tdpath,directory); - index=strrchr(tdpath,(char)U_FILE_SEP_CHAR); - + log_verbose("Retrieved data directory %s \n",saveDirectory); + uprv_strcpy(tdpath,directory); + index=strrchr(tdpath,(char)U_FILE_SEP_CHAR); + if((unsigned int)(index-tdpath) != (strlen(tdpath)-1)){ *(index+1)=0; } @@ -1150,11 +1150,11 @@ static void TestCoverageMBCS(){ } #if 0 - uprv_free(tdpath); + free(tdpath); /* restore the original data directory */ log_verbose("Setting the data directory to %s \n", saveDirectory); u_setDataDirectory(saveDirectory); - uprv_free(saveDirectory); + free(saveDirectory); #endif } @@ -1389,21 +1389,21 @@ static void TestAmbiguous() ucnv_close(ascii_cnv); } -static void +static void TestSignatureDetection(){ /* with null terminated strings */ { - static const char* data[] = { + static const char* data[] = { "\xFE\xFF\x00\x00", /* UTF-16BE */ "\xFF\xFE\x00\x00", /* UTF-16LE */ "\xEF\xBB\xBF\x00", /* UTF-8 */ "\x0E\xFE\xFF\x00", /* SCSU */ - + "\xFE\xFF", /* UTF-16BE */ "\xFF\xFE", /* UTF-16LE */ "\xEF\xBB\xBF", /* UTF-8 */ "\x0E\xFE\xFF", /* SCSU */ - + "\xFE\xFF\x41\x42", /* UTF-16BE */ "\xFF\xFE\x41\x41", /* UTF-16LE */ "\xEF\xBB\xBF\x41", /* UTF-8 */ @@ -1467,7 +1467,7 @@ TestSignatureDetection(){ } } { - static const char* data[] = { + static const char* data[] = { "\xFE\xFF\x00", /* UTF-16BE */ "\xFF\xFE\x00", /* UTF-16LE */ "\xEF\xBB\xBF\x00", /* UTF-8 */ @@ -2659,14 +2659,14 @@ static int TestJitterbug930(const char* enc){ int numOffWritten=0; UBool flush = 0; converter = my_ucnv_open(enc, &err); - + in[0] = 0x41; /* 0x4E00;*/ in[1] = 0x4E01; in[2] = 0x4E02; in[3] = 0x4E03; - + memset(off, '*', sizeof(off)); - + ucnv_fromUnicode (converter, &target, target+2, @@ -2675,7 +2675,7 @@ static int TestJitterbug930(const char* enc){ offsets, flush, &err); - + /* writes three bytes into the output buffer: 41 1B 24 * but offsets contains 0 1 1 */ @@ -2687,11 +2687,11 @@ static int TestJitterbug930(const char* enc){ if(numOffWritten!= (int)(target-out)){ log_err("Jitterbug 930 test for enc: %s failed. Expected: %i Got: %i",enc, (int)(target-out),numOffWritten); } - + err = U_ZERO_ERROR; - + memset(off,'*' , sizeof(off)); - + flush = 1; offsets=off; ucnv_fromUnicode (converter, @@ -2798,7 +2798,7 @@ TestHZ() { free(cBuf); } -static void +static void TestISCII(){ /* test input */ static const uint16_t in[]={ @@ -2851,7 +2851,7 @@ TestISCII(){ 0x0961 /* Vocallic LL 0xa6, 0xE9 */, 0x0963 /* Vowel Sign Vocallic LL 0xdb, 0xE9, */, 0x0950 /* OM Symbol 0xa1, 0xE9,*/, - 0x093D /* Avagraha 0xEA, 0xE9*/, + 0x093D /* Avagraha 0xEA, 0xE9*/, 0x0958, 0x0959, 0x095A, @@ -2899,33 +2899,33 @@ TestISCII(){ /* anudatta and abbreviation sign */ 0xEF, 0x42, 0xF0, 0xBF, 0xF0, 0xB8, - + 0xAA, 0xE9,/* RI + NUKTA 0x0960*/ - + 0xDF, 0xE9,/* Vowel sign RI + NUKTA 0x0944*/ - + 0xa6, 0xE9,/* Vowel I + NUKTA 0x090C*/ - + 0xdb, 0xE9,/* Vowel sign I + Nukta 0x0962*/ - + 0xa7, 0xE9,/* Vowel II + NUKTA 0x0961*/ - + 0xdc, 0xE9,/* Vowel sign II + Nukta 0x0963*/ - + 0xa1, 0xE9,/* chandrabindu + Nukta 0x0950*/ - + 0xEA, 0xE9, /* Danda + Nukta 0x093D*/ - + 0xB3, 0xE9, /* Ka + NUKTA */ - + 0xB4, 0xE9, /* Kha + NUKTA */ - + 0xB5, 0xE9, /* Ga + NUKTA */ 0xBA, 0xE9, 0xBF, 0xE9, - + 0xC0, 0xE9, 0xC9, 0xE9, @@ -3196,7 +3196,7 @@ TestFullRoundtrip(const char* cp){ nsrc[1]=usource[0]; nsrc[2]=usource[1]; nsrc[len+1]=0x5555; - TestConv(nsrc,len+2,cp,"",NULL,0); + TestConv(nsrc,len+2,cp,"",NULL,0); uprv_memset(usource,0,sizeof(UChar)*10); } } @@ -3322,16 +3322,16 @@ TestSCSU() { 0x9785, 0x9791, 0x00BD, 0x0390, 0x0385, 0x0386, 0x0388, 0x0389, 0x000D, 0x000A, 0x038E, 0x038F, 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x000D, 0x000A, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x038A, 0x038C, 0x039C, 0x000D, 0x000A, - /* test non-BMP code points */ - 0xD869, 0xDE99, 0xD869, 0xDE9C, 0xD869, 0xDE9D, 0xD869, 0xDE9E, 0xD869, 0xDE9F, - 0xD869, 0xDEA0, 0xD869, 0xDEA5, 0xD869, 0xDEA6, 0xD869, 0xDEA7, 0xD869, 0xDEA8, + /* test non-BMP code points */ + 0xD869, 0xDE99, 0xD869, 0xDE9C, 0xD869, 0xDE9D, 0xD869, 0xDE9E, 0xD869, 0xDE9F, + 0xD869, 0xDEA0, 0xD869, 0xDEA5, 0xD869, 0xDEA6, 0xD869, 0xDEA7, 0xD869, 0xDEA8, 0xD869, 0xDEAB, 0xD869, 0xDEAC, 0xD869, 0xDEAD, 0xD869, 0xDEAE, 0xD869, 0xDEAF, - 0xD869, 0xDEB0, 0xD869, 0xDEB1, 0xD869, 0xDEB3, 0xD869, 0xDEB5, 0xD869, 0xDEB6, - 0xD869, 0xDEB7, 0xD869, 0xDEB8, 0xD869, 0xDEB9, 0xD869, 0xDEBA, 0xD869, 0xDEBB, - 0xD869, 0xDEBC, 0xD869, 0xDEBD, 0xD869, 0xDEBE, 0xD869, 0xDEBF, 0xD869, 0xDEC0, - 0xD869, 0xDEC1, 0xD869, 0xDEC2, 0xD869, 0xDEC3, 0xD869, 0xDEC4, 0xD869, 0xDEC8, - 0xD869, 0xDECA, 0xD869, 0xDECB, 0xD869, 0xDECD, 0xD869, 0xDECE, 0xD869, 0xDECF, - 0xD869, 0xDED0, 0xD869, 0xDED1, 0xD869, 0xDED2, 0xD869, 0xDED3, 0xD869, 0xDED4, + 0xD869, 0xDEB0, 0xD869, 0xDEB1, 0xD869, 0xDEB3, 0xD869, 0xDEB5, 0xD869, 0xDEB6, + 0xD869, 0xDEB7, 0xD869, 0xDEB8, 0xD869, 0xDEB9, 0xD869, 0xDEBA, 0xD869, 0xDEBB, + 0xD869, 0xDEBC, 0xD869, 0xDEBD, 0xD869, 0xDEBE, 0xD869, 0xDEBF, 0xD869, 0xDEC0, + 0xD869, 0xDEC1, 0xD869, 0xDEC2, 0xD869, 0xDEC3, 0xD869, 0xDEC4, 0xD869, 0xDEC8, + 0xD869, 0xDECA, 0xD869, 0xDECB, 0xD869, 0xDECD, 0xD869, 0xDECE, 0xD869, 0xDECF, + 0xD869, 0xDED0, 0xD869, 0xDED1, 0xD869, 0xDED2, 0xD869, 0xDED3, 0xD869, 0xDED4, 0xD869, 0xDED5, 0xD800, 0xDC00, 0xD800, 0xDC00, 0xD800, 0xDC00, 0xDBFF, 0xDFFF, 0xDBFF, 0xDFFF, 0xDBFF, 0xDFFF, @@ -3351,10 +3351,10 @@ TestSCSU() { "Hello \\u9292 \\u9192 World!", "Hell\\u0429o \\u9292 \\u9192 W\\u00e4rld!", "Hell\\u0429o \\u9292 \\u9292W\\u00e4rld!", - + "\\u0648\\u06c8", /* catch missing reset*/ "\\u0648\\u06c8", - + "\\u4444\\uE001", /* lowest quotable*/ "\\u4444\\uf2FF", /* highest quotable*/ "\\u4444\\uf188\\u4444", @@ -3365,7 +3365,7 @@ TestSCSU() { "Hell\\u0429o \\u9292 \\u9292W\\u00e4rld!", "Hello World!123456", "Hello W\\u0081\\u011f\\u0082!", /* Latin 1 run*/ - + "abc\\u0301\\u0302", /* uses SQn for u301 u302*/ "abc\\u4411d", /* uses SQU*/ "abc\\u4411\\u4412d",/* uses SCU*/ @@ -3375,11 +3375,11 @@ TestSCSU() { "\\u9191\\u9191\\u3041\\u9191\\u3041\\u3041\\u3000", "\\u9999\\u3051\\u300c\\u9999\\u9999\\u3060\\u9999\\u3065\\u3065\\u3065\\u300c", "\\u3000\\u266a\\u30ea\\u30f3\\u30b4\\u53ef\\u611b\\u3044\\u3084\\u53ef\\u611b\\u3044\\u3084\\u30ea\\u30f3\\u30b4\\u3002", - + "", /* empty input*/ "\\u0000", /* smallest BMP character*/ "\\uFFFF", /* largest BMP character*/ - + /* regression tests*/ "\\u6441\\ub413\\ua733\\uf8fe\\ueedb\\u587f\\u195f\\u4899\\uf23d\\u49fd\\u0aac\\u5792\\ufc22\\ufc3c\\ufc46\\u00aa", "\\u00df\\u01df\\uf000\\udbff\\udfff\\u000d\n\\u0041\\u00df\\u0401\\u015f\\u00df\\u01df\\uf000\\udbff\\udfff", @@ -3397,11 +3397,11 @@ TestSCSU() { UChar* src; /* UConverter* cnv = ucnv_open("SCSU",&status); */ cSrcLen= srcLen = uprv_strlen(fTestCases[i]); - src = (UChar*) uprv_malloc((sizeof(UChar) * srcLen) + sizeof(UChar)); + src = (UChar*) malloc((sizeof(UChar) * srcLen) + sizeof(UChar)); srcLen=unescape(src,srcLen,cSrc,cSrcLen,&status); log_verbose("Testing roundtrip for src: %s at index :%d\n",cSrc,i); TestConv(src,srcLen,"SCSU","Coverage",NULL,0); - uprv_free(src); + free(src); } TestConv(allFeaturesUTF16,(sizeof(allFeaturesUTF16)/2),"SCSU","all features", (char *)allFeaturesSCSU,sizeof(allFeaturesSCSU)); TestConv(allFeaturesUTF16,(sizeof(allFeaturesUTF16)/2),"SCSU","all features",(char *)allFeaturesSCSU,sizeof(allFeaturesSCSU)); @@ -3892,7 +3892,7 @@ TestJIS(){ } static void TestJitterbug915(){ -/* tests for roundtripping of the below sequence +/* tests for roundtripping of the below sequence \x1b$)G\x0E#!#"###$#%#&#'#(#)#*#+ / *plane 1 * / \x1b$*H\x1bN"!\x1bN""\x1bN"#\x1bN"$\x1bN"% / *plane 2 * / \x1b$+I\x1bO"D\x1bO"E\x1bO"F\x1bO"G\x1bO"H / *plane 3 * / @@ -3975,16 +3975,16 @@ TestISO_2022_CN_EXT() { /* test input */ static const uint16_t in[]={ /* test Non-BMP code points */ - 0xD869, 0xDE99, 0xD869, 0xDE9C, 0xD869, 0xDE9D, 0xD869, 0xDE9E, 0xD869, 0xDE9F, - 0xD869, 0xDEA0, 0xD869, 0xDEA5, 0xD869, 0xDEA6, 0xD869, 0xDEA7, 0xD869, 0xDEA8, + 0xD869, 0xDE99, 0xD869, 0xDE9C, 0xD869, 0xDE9D, 0xD869, 0xDE9E, 0xD869, 0xDE9F, + 0xD869, 0xDEA0, 0xD869, 0xDEA5, 0xD869, 0xDEA6, 0xD869, 0xDEA7, 0xD869, 0xDEA8, 0xD869, 0xDEAB, 0xD869, 0xDEAC, 0xD869, 0xDEAD, 0xD869, 0xDEAE, 0xD869, 0xDEAF, - 0xD869, 0xDEB0, 0xD869, 0xDEB1, 0xD869, 0xDEB3, 0xD869, 0xDEB5, 0xD869, 0xDEB6, - 0xD869, 0xDEB7, 0xD869, 0xDEB8, 0xD869, 0xDEB9, 0xD869, 0xDEBA, 0xD869, 0xDEBB, - 0xD869, 0xDEBC, 0xD869, 0xDEBD, 0xD869, 0xDEBE, 0xD869, 0xDEBF, 0xD869, 0xDEC0, - 0xD869, 0xDEC1, 0xD869, 0xDEC2, 0xD869, 0xDEC3, 0xD869, 0xDEC4, 0xD869, 0xDEC8, - 0xD869, 0xDECA, 0xD869, 0xDECB, 0xD869, 0xDECD, 0xD869, 0xDECE, 0xD869, 0xDECF, - 0xD869, 0xDED0, 0xD869, 0xDED1, 0xD869, 0xDED2, 0xD869, 0xDED3, 0xD869, 0xDED4, - 0xD869, 0xDED5, + 0xD869, 0xDEB0, 0xD869, 0xDEB1, 0xD869, 0xDEB3, 0xD869, 0xDEB5, 0xD869, 0xDEB6, + 0xD869, 0xDEB7, 0xD869, 0xDEB8, 0xD869, 0xDEB9, 0xD869, 0xDEBA, 0xD869, 0xDEBB, + 0xD869, 0xDEBC, 0xD869, 0xDEBD, 0xD869, 0xDEBE, 0xD869, 0xDEBF, 0xD869, 0xDEC0, + 0xD869, 0xDEC1, 0xD869, 0xDEC2, 0xD869, 0xDEC3, 0xD869, 0xDEC4, 0xD869, 0xDEC8, + 0xD869, 0xDECA, 0xD869, 0xDECB, 0xD869, 0xDECD, 0xD869, 0xDECE, 0xD869, 0xDECF, + 0xD869, 0xDED0, 0xD869, 0xDED1, 0xD869, 0xDED2, 0xD869, 0xDED3, 0xD869, 0xDED4, + 0xD869, 0xDED5, 0x4DB3, 0x4DB4, 0x4DB5, 0x4E00, 0x4E00, 0x4E01, 0x4E02, 0x4E03, 0x000D, 0x000A, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x33E0, 0x33E6, 0x000D, 0x000A, @@ -4004,7 +4004,7 @@ TestISO_2022_CN_EXT() { 0x60F6, 0x60F7, 0x60F8, 0x60F9, 0x60FA, 0x60FB, 0x60FC, 0x60FD, 0x000D, 0x000A, 0x60FE, 0x60FF, 0x6100, 0x6101, 0x6102, 0x0041, 0x0042, 0x0043, 0x000D, 0x000A, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x000D, 0x000A, - + 0x33E7, 0x33E8, 0x33E9, 0x33EA, 0x000D, 0x000A }; @@ -4978,7 +4978,7 @@ static void TestJitterbug981(){ UCollator* myCollator; char buff[50000]; int numNeeded=0; - utf8cnv = ucnv_open ("utf8", &status); + utf8cnv = ucnv_open ("utf8", &status); if(U_FAILURE(status)){ log_err("Could not open UTF-8 converter. Error: %s", u_errorName(status)); } @@ -5032,5 +5032,5 @@ static void TestJitterbug1293(){ } ucnv_close(conv); } - + #endif diff --git a/icu4c/source/test/cintltst/putiltst.c b/icu4c/source/test/cintltst/putiltst.c index 41cb99aea7..7852f3c2ec 100644 --- a/icu4c/source/test/cintltst/putiltst.c +++ b/icu4c/source/test/cintltst/putiltst.c @@ -215,7 +215,7 @@ static void TestPUtilAPI(void){ /*dataDirectory=u_getDataDirectory();*/ dataDirectory="directory1"; /*no backslashes*/ - udataDir=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(dataDirectory) + 1)); + udataDir=(UChar*)malloc(sizeof(UChar) * (strlen(dataDirectory) + 1)); u_charsToUChars(dataDirectory, udataDir, (strlen(dataDirectory)+1)); u_uastrcpy(temp, dataDirectory); @@ -223,14 +223,14 @@ static void TestPUtilAPI(void){ log_err("ERROR: u_charsToUChars failed. Expected %s, Got %s\n", austrdup(temp), austrdup(udataDir)); } log_verbose("Testing UChars to chars\n"); - charvalue=(char*)uprv_malloc(sizeof(char) * (u_strlen(udataDir) + 1)); + charvalue=(char*)malloc(sizeof(char) * (u_strlen(udataDir) + 1)); u_UCharsToChars(udataDir, charvalue, (u_strlen(udataDir)+1)); if(strcmp(charvalue, dataDirectory) != 0){ log_err("ERROR: u_UCharsToChars failed. Expected %s, Got %s\n", charvalue, dataDirectory); } - uprv_free(charvalue); - uprv_free(udataDir); + free(charvalue); + free(udataDir); } log_verbose("Testing uprv_timezone()....\n"); diff --git a/icu4c/source/test/cintltst/ucmptst.c b/icu4c/source/test/cintltst/ucmptst.c index 670e571574..bc13babb01 100644 --- a/icu4c/source/test/cintltst/ucmptst.c +++ b/icu4c/source/test/cintltst/ucmptst.c @@ -165,9 +165,9 @@ openAdopt, initAdopt, openAlias, initAlias int32_t count = ucmp8_getCount(&ucmp8Array1); const uint16_t *tIndex = ucmp8_getIndex(&ucmp8Array1); const int8_t *tValues = ucmp8_getArray(&ucmp8Array1); - uint16_t *index = (uint16_t *)malloc(UCMP8_kIndexCount*sizeof(uint16_t)); + uint16_t *index = (uint16_t *)uprv_malloc(UCMP8_kIndexCount*sizeof(uint16_t)); - values = (int8_t *)malloc(count); + values = (int8_t *)uprv_malloc(count); memcpy(index, tIndex, UCMP8_kIndexCount*sizeof(uint16_t)); memcpy(values, tValues, count); @@ -180,17 +180,17 @@ openAdopt, initAdopt, openAlias, initAlias query(pAliaser); ucmp8_close(pAliaser); - ucmp8_initAdopt(&adopter, index, values, count); + ucmp8_initAdopt(&adopter, index, values, count); /* TODO: BAD API. Adopted memory MUST be allocated with uprv_malloc */ query(&adopter); ucmp8_close(&adopter); - index = (uint16_t *)malloc(UCMP8_kIndexCount*sizeof(uint16_t)); - values = (int8_t *)malloc(count); + index = (uint16_t *)uprv_malloc(UCMP8_kIndexCount*sizeof(uint16_t)); + values = (int8_t *)uprv_malloc(count); memcpy(index, tIndex, UCMP8_kIndexCount*sizeof(uint16_t)); memcpy(values, tValues, count); - pAdopter = ucmp8_openAdopt(index, values, count); + pAdopter = ucmp8_openAdopt(index, values, count); /* TODO: BAD API */ query(pAdopter); ucmp8_close(pAdopter); diff --git a/icu4c/source/test/cintltst/uenumtst.c b/icu4c/source/test/cintltst/uenumtst.c index 93e8814681..a4ef28e3d8 100644 --- a/icu4c/source/test/cintltst/uenumtst.c +++ b/icu4c/source/test/cintltst/uenumtst.c @@ -41,9 +41,9 @@ typedef struct chArrayContext chArrayContext; static void U_CALLCONV chArrayClose(UEnumeration *en) { if(cont->currUChar != NULL) { - uprv_free(cont->currUChar); + free(cont->currUChar); } - uprv_free(en); + free(en); } static int32_t U_CALLCONV @@ -58,7 +58,7 @@ chArrayUNext(UEnumeration *en, int32_t *resultLength, UErrorCode *status) { } if(cont->currUChar == NULL) { - cont->currUChar = (UChar *)uprv_malloc(1024*sizeof(UChar)); + cont->currUChar = (UChar *)malloc(1024*sizeof(UChar)); } cont->currChar = (cont->array)[cont->currIndex]; @@ -101,7 +101,7 @@ UEnumeration chEnum = { }; static UEnumeration *getchArrayEnum(const char** source, int32_t size) { - UEnumeration *en = (UEnumeration *)uprv_malloc(sizeof(UEnumeration)); + UEnumeration *en = (UEnumeration *)malloc(sizeof(UEnumeration)); memcpy(en, &chEnum, sizeof(UEnumeration)); cont->array = (char **)source; cont->maxIndex = size; diff --git a/icu4c/source/test/cintltst/utransts.c b/icu4c/source/test/cintltst/utransts.c index 6db5d3436a..3c961b1f39 100644 --- a/icu4c/source/test/cintltst/utransts.c +++ b/icu4c/source/test/cintltst/utransts.c @@ -54,13 +54,13 @@ typedef struct XReplaceable { } XReplaceable; static void InitXReplaceable(XReplaceable* rep, const char* cstring) { - rep->text = uprv_malloc(sizeof(UChar) * (uprv_strlen(cstring)+1)); + rep->text = malloc(sizeof(UChar) * (uprv_strlen(cstring)+1)); u_uastrcpy(rep->text, cstring); } static void FreeXReplaceable(XReplaceable* rep) { if (rep->text != NULL) { - uprv_free(rep->text); + free(rep->text); rep->text = NULL; } } @@ -88,11 +88,11 @@ static void Xreplace(UReplaceable* rep, int32_t start, int32_t limit, const UChar* text, int32_t textLength) { XReplaceable* x = (XReplaceable*)rep; int32_t newLen = Xlength(rep) + limit - start + textLength; - UChar* newText = (UChar*) uprv_malloc(sizeof(UChar) * (newLen+1)); + UChar* newText = (UChar*) malloc(sizeof(UChar) * (newLen+1)); u_strncpy(newText, x->text, start); u_strncpy(newText + start, text, textLength); u_strcpy(newText + start + textLength, x->text + limit); - uprv_free(x->text); + free(x->text); x->text = newText; } @@ -100,11 +100,11 @@ static void Xreplace(UReplaceable* rep, int32_t start, int32_t limit, static void Xcopy(UReplaceable* rep, int32_t start, int32_t limit, int32_t dest) { XReplaceable* x = (XReplaceable*)rep; int32_t newLen = Xlength(rep) + limit - start; - UChar* newText = (UChar*) uprv_malloc(sizeof(UChar) * (newLen+1)); + UChar* newText = (UChar*) malloc(sizeof(UChar) * (newLen+1)); u_strncpy(newText, x->text, dest); u_strncpy(newText + dest, x->text + start, limit - start); u_strcpy(newText + dest + limit - start, x->text + dest); - uprv_free(x->text); + free(x->text); x->text = newText; } diff --git a/icu4c/source/test/collperf/collperf.dsp b/icu4c/source/test/collperf/collperf.dsp index 086e59f7c9..29a5897ad1 100644 --- a/icu4c/source/test/collperf/collperf.dsp +++ b/icu4c/source/test/collperf/collperf.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD CPP /nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 icuuc.lib icuin.lib ctestfw.lib icutu.lib kernel32.lib user32.lib advapi32.lib shell32.lib winmm.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\lib\\" +# ADD LINK32 icuuc.lib icuin.lib ctestfw.lib icutu.lib kernel32.lib user32.lib advapi32.lib shell32.lib winmm.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\lib\\" !ELSEIF "$(CFG)" == "collperf - Win32 Debug" @@ -68,8 +69,9 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -77,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 icuucd.lib icuind.lib icutud.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib\\" +# ADD LINK32 icuucd.lib icuind.lib icutud.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib\\" !ELSEIF "$(CFG)" == "collperf - Win64 Release" @@ -92,8 +94,9 @@ LINK32=link.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /W3 /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -101,8 +104,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icuin.lib ctestfw.lib icutu.lib kernel32.lib user32.lib advapi32.lib shell32.lib winmm.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib\\" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icuin.lib ctestfw.lib icutu.lib kernel32.lib user32.lib advapi32.lib shell32.lib winmm.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib\\" /machine:IA64 !ELSEIF "$(CFG)" == "collperf - Win64 Debug" @@ -117,16 +120,17 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Op /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icuind.lib icutud.lib winmm.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib\\" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icuind.lib icutud.lib winmm.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib\\" /machine:IA64 !ENDIF diff --git a/icu4c/source/test/ieeetest/ieeetest.dsp b/icu4c/source/test/ieeetest/ieeetest.dsp index 8ba2f6cc00..a230d2b2be 100644 --- a/icu4c/source/test/ieeetest/ieeetest.dsp +++ b/icu4c/source/test/ieeetest/ieeetest.dsp @@ -42,8 +42,9 @@ RSC=rc.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MT /Za /W3 /GX /O2 /I "..\..\include" /I "..\..\source\common" /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\include" /I "..\..\source\common" /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -65,8 +66,9 @@ LINK32=link.exe # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -88,16 +90,17 @@ LINK32=link.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MT /Za /W3 /I "..\..\include" /I "..\..\source\common" /I "..\..\..\include" /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MT /Za /W3 /GX /Zi /O2 /I "..\..\include" /I "..\..\source\common" /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64 !ELSEIF "$(CFG)" == "ieeetest - Win64 Debug" @@ -111,16 +114,17 @@ LINK32=link.exe # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MTd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64 !ENDIF diff --git a/icu4c/source/test/intltest/apicoll.cpp b/icu4c/source/test/intltest/apicoll.cpp index 0130b85a7b..8ae6c1ea8b 100644 --- a/icu4c/source/test/intltest/apicoll.cpp +++ b/icu4c/source/test/intltest/apicoll.cpp @@ -324,7 +324,10 @@ CollationAPITest::TestRuleBasedColl() return; } - free(clonedrule4); + // free(clonedrule4); BAD API!!!! + uprv_free(clonedrule4); + + delete col1; delete col2; delete col3; diff --git a/icu4c/source/test/intltest/calregts.cpp b/icu4c/source/test/intltest/calregts.cpp index 9b29699cb8..ccfcaf7393 100644 --- a/icu4c/source/test/intltest/calregts.cpp +++ b/icu4c/source/test/intltest/calregts.cpp @@ -9,6 +9,7 @@ #include "unicode/gregocal.h" #include "unicode/simpletz.h" #include "unicode/smpdtfmt.h" +#include "cmemory.h" #include @@ -207,7 +208,8 @@ CalendarRegressionTest::test4031502() } if (bad) errln("TimeZone problems with GC"); - delete [] ids; + // delete [] ids; // TODO: bad APIs + uprv_free(ids); } /** @@ -267,7 +269,8 @@ CalendarRegressionTest::test4031502() errln(UnicodeString("Fail: Calendar::add misbehaves")); delete calendar; - delete ids; + uprv_free(ids); + // delete ids; // TODO: BAD API } /** diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp index bb61731364..be75e7cccb 100644 --- a/icu4c/source/test/intltest/dtfmttst.cpp +++ b/icu4c/source/test/intltest/dtfmttst.cpp @@ -10,6 +10,7 @@ #include "unicode/smpdtfmt.h" #include "unicode/datefmt.h" #include "unicode/simpletz.h" +#include "cmemory.h" // ***************************************************************************** // class DateFormatTest @@ -130,7 +131,8 @@ void DateFormatTest::TestWallyWedel() delete fmtDstOffset; } delete cal; - delete ids; + // delete ids; // TODO: BAD API + uprv_free(ids); delete sdf; delete tz; } diff --git a/icu4c/source/test/intltest/intltest.dsp b/icu4c/source/test/intltest/intltest.dsp index 4022b03cc3..43e0e68771 100644 --- a/icu4c/source/test/intltest/intltest.dsp +++ b/icu4c/source/test/intltest/intltest.dsp @@ -45,7 +45,7 @@ RSC=rc.exe # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /Zi /Ox /Ob0 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\..\..\source\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MT /Za /W3 /GX /Zi /Ox /Ob0 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\..\..\source\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 icuuc.lib icuin.lib icutu.lib /nologo /subsystem:console /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib" +# ADD LINK32 /nologo /subsystem:console /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "intltest - Win32 Debug" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\..\..\source\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UDATA_MAP_DLL" /FR /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\..\..\source\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UDATA_MAP_DLL" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -79,7 +79,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib\\" +# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib" /warn:3 +# SUBTRACT LINK32 /pdb:none /map !ELSEIF "$(CFG)" == "intltest - Win64 Release" @@ -129,7 +130,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 -# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib\\" /machine:IA64 +# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib\\" /libpath:"..\..\..\lib" /machine:IA64 !ENDIF @@ -149,6 +150,19 @@ SOURCE=.\allcoll.cpp # Begin Source File SOURCE=.\apicoll.cpp + +!IF "$(CFG)" == "intltest - Win32 Release" + +!ELSEIF "$(CFG)" == "intltest - Win32 Debug" + +# ADD CPP /MTd + +!ELSEIF "$(CFG)" == "intltest - Win64 Release" + +!ELSEIF "$(CFG)" == "intltest - Win64 Debug" + +!ENDIF + # End Source File # Begin Source File diff --git a/icu4c/source/test/intltest/tzregts.cpp b/icu4c/source/test/intltest/tzregts.cpp index 6834ed46a4..dcdc02286b 100644 --- a/icu4c/source/test/intltest/tzregts.cpp +++ b/icu4c/source/test/intltest/tzregts.cpp @@ -8,6 +8,7 @@ #include "unicode/smpdtfmt.h" #include "tzregts.h" #include "calregts.h" +#include "cmemory.h" // ***************************************************************************** // class TimeZoneRegressionTest @@ -471,7 +472,8 @@ void TimeZoneRegressionTest:: Test4151406() { max = count; logln(hname + ' ' + count + ((count > 0) ? (" e.g. " + *ids[0]) : UnicodeString(""))); - delete [] ids; + // delete [] ids; + uprv_free(ids); /*} catch (Exception e) { errln(hname + ' ' + "Fail: " + e); }*/ diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 90b2369ba6..995a366489 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -10,6 +10,7 @@ #include "unicode/gregocal.h" #include "unicode/resbund.h" #include "tztest.h" +#include "cmemory.h" #define CASE(id,test) case id: \ name = #test; \ @@ -312,7 +313,8 @@ TimeZoneTest::TestGetAvailableIDs913() } delete z; } - delete [] s; + // delete [] s; ****BAD API *** + uprv_free(s); buf->truncate(0); *buf += "TimeZone.getAvailableIDs(GMT+02:00) = { "; @@ -343,8 +345,8 @@ TimeZoneTest::TestGetAvailableIDs913() delete tz; delete buf; - delete [] s; - + // delete [] s; // BAD API !!!! + uprv_free(s); } @@ -1005,7 +1007,8 @@ void TimeZoneTest::TestCountries() { errln("FAIL: " + laZone + " in US = " + la); errln("FAIL: " + tokyoZone + " in US = " + tokyo); } - delete[] s; + // delete[] s; // TODO: BAD API + uprv_free(s); s = TimeZone::createAvailableIDs("JP", n); la = FALSE; tokyo = FALSE; @@ -1022,5 +1025,6 @@ void TimeZoneTest::TestCountries() { errln("FAIL: " + laZone + " in JP = " + la); errln("FAIL: " + tokyoZone + " in JP = " + tokyo); } - delete[] s; + // delete[] s; // TODO: bad API + uprv_free(s); } diff --git a/icu4c/source/test/utfperf/utfperf.dsp b/icu4c/source/test/utfperf/utfperf.dsp index 94086520c2..0b1ba5961a 100644 --- a/icu4c/source/test/utfperf/utfperf.dsp +++ b/icu4c/source/test/utfperf/utfperf.dsp @@ -43,15 +43,16 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 icuuc.lib kernel32.lib user32.lib gdi32.lib winmm.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\lib" !ELSEIF "$(CFG)" == "utfperf - Win32 Debug" @@ -67,15 +68,16 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 icuucd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib" !ELSEIF "$(CFG)" == "utfperf - Win64 Release" @@ -91,16 +93,17 @@ LINK32=link.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /W3 /I "..\..\..\include" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /I "..\..\..\include" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib kernel32.lib user32.lib gdi32.lib winmm.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib kernel32.lib user32.lib gdi32.lib winmm.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64 !ELSEIF "$(CFG)" == "utfperf - Win64 Debug" @@ -115,16 +118,17 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /I "..\..\..\include" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Op /I "..\..\..\include" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64 !ENDIF diff --git a/icu4c/source/tools/ctestfw/ctestfw.dsp b/icu4c/source/tools/ctestfw/ctestfw.dsp index f4a42083e8..55a79101a3 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.dsp +++ b/icu4c/source/tools/ctestfw/ctestfw.dsp @@ -44,8 +44,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -70,8 +70,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /FR /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /FR /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -96,8 +96,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /D"WIN64" /D"NDEBUG" /D"_WINDOWS" /D"_MBCS" /D"_USRDLL" /D"CTESTFW_EXPORTS" /D"T_CTEST_IMPLEMENTATION" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -106,8 +106,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IA64 -# ADD LINK32 /nologo /dll /machine:IA64 /out:"..\..\..\bin\ctestfw.dll" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64 +# ADD LINK32 /nologo /dll /machine:IX86 /out:"..\..\..\bin\ctestfw.dll" /machine:IA64 !ELSEIF "$(CFG)" == "ctestfw - Win64 Debug" @@ -122,8 +122,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /D"WIN64" /D"_DEBUG" /D"_WINDOWS" /D"_MBCS" /D"_USRDLL" /D"CTESTFW_EXPORTS" /D"T_CTEST_IMPLEMENTATION" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -132,8 +132,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:IA64 /out:"..\..\..\bin\ctestfwd.dll" /pdbtype:sept /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 /nologo /dll /incremental:no /debug /machine:IX86 /out:"..\..\..\bin\ctestfwd.dll" /pdbtype:sept /machine:IA64 !ENDIF @@ -149,6 +149,19 @@ LINK32=link.exe # Begin Source File SOURCE=.\ctest.c + +!IF "$(CFG)" == "ctestfw - Win32 Release" + +!ELSEIF "$(CFG)" == "ctestfw - Win32 Debug" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "ctestfw - Win64 Release" + +!ELSEIF "$(CFG)" == "ctestfw - Win64 Debug" + +!ENDIF + # End Source File # End Group # Begin Group "Header Files" diff --git a/icu4c/source/tools/genccode/genccode.dsp b/icu4c/source/tools/genccode/genccode.dsp index 9750b9342f..15927507cf 100644 --- a/icu4c/source/tools/genccode/genccode.dsp +++ b/icu4c/source/tools/genccode/genccode.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -110,16 +112,17 @@ SOURCE="$(InputPath)" # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\genccode.exe InputPath=.\Release\genccode.exe @@ -144,16 +147,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Op /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\genccode.exe InputPath=.\Debug\genccode.exe diff --git a/icu4c/source/tools/gencmn/decmn.dsp b/icu4c/source/tools/gencmn/decmn.dsp index 482fb33ba1..eb1e3dd4af 100644 --- a/icu4c/source/tools/gencmn/decmn.dsp +++ b/icu4c/source/tools/gencmn/decmn.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /G6 /MD /Za /W4 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W4 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /G6 /MDd /Za /W4 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W4 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -110,16 +112,17 @@ SOURCE="$(InputPath)" # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W4 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W4 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\decmn.exe InputPath=.\Release\decmn.exe @@ -144,16 +147,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W4 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W4 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib kernel32.lib user32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib kernel32.lib user32.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\decmn.exe InputPath=.\Debug\decmn.exe diff --git a/icu4c/source/tools/gencmn/gencmn.dsp b/icu4c/source/tools/gencmn/gencmn.dsp index d242782961..52da680dbb 100644 --- a/icu4c/source/tools/gencmn/gencmn.dsp +++ b/icu4c/source/tools/gencmn/gencmn.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\gencmn.exe InputPath=.\Release\gencmn.exe @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\gencmn.exe InputPath=.\Debug\gencmn.exe diff --git a/icu4c/source/tools/gencnval/gencnval.dsp b/icu4c/source/tools/gencnval/gencnval.dsp index c3c8f8fd4a..d8a7d09da7 100644 --- a/icu4c/source/tools/gencnval/gencnval.dsp +++ b/icu4c/source/tools/gencnval/gencnval.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -60,7 +61,7 @@ InputName=gencnval SOURCE="$(InputPath)" "..\..\..\bin\$(InputName).exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) ..\..\..\bin + copy $(TargetPath) ..\..\..\bin # End Custom Build @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -94,7 +96,7 @@ InputName=gencnval SOURCE="$(InputPath)" "..\..\..\bin\$(InputName).exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) ..\..\..\bin + copy $(TargetPath) ..\..\..\bin # End Custom Build @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\gencnval.exe InputPath=.\Release\gencnval.exe @@ -128,7 +131,7 @@ InputName=gencnval SOURCE="$(InputPath)" "..\..\..\bin\$(InputName).exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) ..\..\..\bin + copy $(TargetPath) ..\..\..\bin # End Custom Build @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\gencnval.exe InputPath=.\Debug\gencnval.exe @@ -162,7 +166,7 @@ InputName=gencnval SOURCE="$(InputPath)" "..\..\..\bin\$(InputName).exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) ..\..\..\bin + copy $(TargetPath) ..\..\..\bin # End Custom Build diff --git a/icu4c/source/tools/gennames/gennames.dsp b/icu4c/source/tools/gennames/gennames.dsp index 544eca4b5d..2f56f750b5 100644 --- a/icu4c/source/tools/gennames/gennames.dsp +++ b/icu4c/source/tools/gennames/gennames.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\gennames.exe InputPath=.\Release\gennames.exe @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\gennames.exe InputPath=.\Debug\gennames.exe diff --git a/icu4c/source/tools/gennorm/gennorm.dsp b/icu4c/source/tools/gennorm/gennorm.dsp index 430e20103a..b0053b2c09 100644 --- a/icu4c/source/tools/gennorm/gennorm.dsp +++ b/icu4c/source/tools/gennorm/gennorm.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\toolutil" /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\toolutil" /I "..\..\common" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\gennorm.exe InputPath=.\Release\gennorm.exe @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\toolutil" /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\toolutil" /I "..\..\common" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\gennorm.exe InputPath=.\Debug\gennorm.exe diff --git a/icu4c/source/tools/genprops/genprops.dsp b/icu4c/source/tools/genprops/genprops.dsp index 5bd59d4392..f7e8576a2d 100644 --- a/icu4c/source/tools/genprops/genprops.dsp +++ b/icu4c/source/tools/genprops/genprops.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\toolutil" /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\toolutil" /I "..\..\common" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\genprops.exe InputPath=.\Release\genprops.exe @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\toolutil" /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\toolutil" /I "..\..\common" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\genprops.exe InputPath=.\Debug\genprops.exe diff --git a/icu4c/source/tools/genrb/derb.dsp b/icu4c/source/tools/genrb/derb.dsp index 05d1645d8d..94a9c7b6da 100644 --- a/icu4c/source/tools/genrb/derb.dsp +++ b/icu4c/source/tools/genrb/derb.dsp @@ -46,8 +46,8 @@ RSC=rc.exe MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -83,8 +83,8 @@ SOURCE="$(InputPath)" MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -120,16 +120,16 @@ SOURCE="$(InputPath)" MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64 -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_WINDOWS" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\derb_Win64_Release\derb.exe InputPath=.\derb_Win64_Release\derb.exe @@ -157,16 +157,16 @@ SOURCE="$(InputPath)" MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64 -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_WINDOWS" /D"_MBCS" /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\derb_Win64_Debug\derb.exe InputPath=.\derb_Win64_Debug\derb.exe diff --git a/icu4c/source/tools/genrb/genrb.dsp b/icu4c/source/tools/genrb/genrb.dsp index a462870383..97027b4771 100644 --- a/icu4c/source/tools/genrb/genrb.dsp +++ b/icu4c/source/tools/genrb/genrb.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\genrb.exe InputPath=.\Release\genrb.exe @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuind.lib icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuind.lib icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\genrb.exe InputPath=.\Debug\genrb.exe diff --git a/icu4c/source/tools/gentest/gentest.dsp b/icu4c/source/tools/gentest/gentest.dsp index bb1f89fa5a..cd16afdd16 100644 --- a/icu4c/source/tools/gentest/gentest.dsp +++ b/icu4c/source/tools/gentest/gentest.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\gentest.exe InputPath=.\Release\gentest.exe @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\debug\\" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\debug\\" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\gentest.exe InputPath=.\Debug\gentest.exe diff --git a/icu4c/source/tools/gentz/gentz.dsp b/icu4c/source/tools/gentz/gentz.dsp index 1600bcb0ab..b3f1583f34 100644 --- a/icu4c/source/tools/gentz/gentz.dsp +++ b/icu4c/source/tools/gentz/gentz.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\gentz.exe InputPath=.\Release\gentz.exe @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\gentz.exe InputPath=.\Debug\gentz.exe diff --git a/icu4c/source/tools/genuca/genuca.dsp b/icu4c/source/tools/genuca/genuca.dsp index 6ba1e273a6..ed6d55f41f 100644 --- a/icu4c/source/tools/genuca/genuca.dsp +++ b/icu4c/source/tools/genuca/genuca.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -60,7 +61,7 @@ InputName=genuca SOURCE="$(InputPath)" "..\..\..\bin\$(InputName).exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) ..\..\..\bin + copy $(TargetPath) ..\..\..\bin # End Custom Build @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -86,7 +88,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" +# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib" # SUBTRACT LINK32 /nodefaultlib # Begin Custom Build TargetPath=.\Debug\genuca.exe @@ -95,7 +97,7 @@ InputName=genuca SOURCE="$(InputPath)" "..\..\..\bin\$(InputName).exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) ..\..\..\bin + copy $(TargetPath) ..\..\..\bin # End Custom Build @@ -112,16 +114,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\genuca.exe InputPath=.\Release\genuca.exe @@ -129,7 +132,7 @@ InputName=genuca SOURCE="$(InputPath)" "..\..\..\bin\$(InputName).exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) ..\..\..\bin + copy $(TargetPath) ..\..\..\bin # End Custom Build @@ -146,16 +149,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" +MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64 # SUBTRACT LINK32 /nodefaultlib # Begin Custom Build TargetPath=.\Debug\genuca.exe @@ -164,7 +168,7 @@ InputName=genuca SOURCE="$(InputPath)" "..\..\..\bin\$(InputName).exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) ..\..\..\bin + copy $(TargetPath) ..\..\..\bin # End Custom Build diff --git a/icu4c/source/tools/makeconv/makeconv.dsp b/icu4c/source/tools/makeconv/makeconv.dsp index 8e38b4ca14..c1506d20a9 100644 --- a/icu4c/source/tools/makeconv/makeconv.dsp +++ b/icu4c/source/tools/makeconv/makeconv.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\makeconv.exe InputPath=.\Release\makeconv.exe @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\makeconv.exe InputPath=.\Debug\makeconv.exe diff --git a/icu4c/source/tools/pkgdata/pkgdata.dsp b/icu4c/source/tools/pkgdata/pkgdata.dsp index 4102207fc6..ae5c250cbc 100644 --- a/icu4c/source/tools/pkgdata/pkgdata.dsp +++ b/icu4c/source/tools/pkgdata/pkgdata.dsp @@ -43,8 +43,9 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x411 /d "NDEBUG" # ADD RSC /l 0x411 /d "NDEBUG" BSC32=bscmake.exe @@ -77,8 +78,9 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x411 /d "_DEBUG" # ADD RSC /l 0x411 /d "_DEBUG" BSC32=bscmake.exe @@ -111,16 +113,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "../../../include" /I "../../common" /I "../toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x411 /d "NDEBUG" # ADD RSC /l 0x411 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 -# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"../../../lib/release" /libpath:"../toolutil/release" /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64 +# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"../../../lib/release" /libpath:"../toolutil/release" /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Release\pkgdata.exe InputPath=.\Release\pkgdata.exe @@ -145,16 +148,17 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "../../../include" /I "../../common" /I "../toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 +MTL=midl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c # ADD BASE RSC /l 0x411 /d "_DEBUG" # ADD RSC /l 0x411 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept -# ADD LINK32 icuind.lib icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"../../../lib/debug" /libpath:"../toolutil/debug" /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64 +# ADD LINK32 icuind.lib icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib/debug" /libpath:"../toolutil/debug" /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64 # Begin Custom Build TargetPath=.\Debug\pkgdata.exe InputPath=.\Debug\pkgdata.exe diff --git a/icu4c/source/tools/toolutil/toolutil.c b/icu4c/source/tools/toolutil/toolutil.c index bb135e7080..8b773d849a 100644 --- a/icu4c/source/tools/toolutil/toolutil.c +++ b/icu4c/source/tools/toolutil/toolutil.c @@ -32,7 +32,7 @@ #include "cstring.h" #include "toolutil.h" -U_CFUNC const char * +U_CAPI const char * U_EXPORT2 getLongPathname(const char *pathname) { #ifdef WIN32 /* anticipate problems with "short" pathnames */ @@ -55,7 +55,7 @@ getLongPathname(const char *pathname) { return pathname; } -U_CFUNC const char * +U_CAPI const char * U_EXPORT2 findBasename(const char *filename) { const char *basename=uprv_strrchr(filename, U_FILE_SEP_CHAR); if(basename!=NULL) { diff --git a/icu4c/source/tools/toolutil/toolutil.dsp b/icu4c/source/tools/toolutil/toolutil.dsp index 4c188cf854..45f4c9aba6 100644 --- a/icu4c/source/tools/toolutil/toolutil.dsp +++ b/icu4c/source/tools/toolutil/toolutil.dsp @@ -2,7 +2,7 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Static Library" 0x0104 +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=toolutil - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, @@ -17,10 +17,8 @@ CFG=toolutil - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "toolutil - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "toolutil - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "toolutil - Win64 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "toolutil - Win64 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "toolutil - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "toolutil - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -28,6 +26,7 @@ CFG=toolutil - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "toolutil - Win32 Release" @@ -41,17 +40,22 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib" # PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TOOLUTIL_EXPORTS" /YX /FD /c +# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "..\..\common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\lib\icutu.lib" +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\icutu22.dll" /implib:"..\..\..\lib/icutu.lib" /libpath:"..\..\..\lib" +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "toolutil - Win32 Debug" @@ -64,63 +68,22 @@ LIB32=link.exe -lib # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib" # PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TOOLUTIL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\common" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\lib\icutud.lib" - -!ELSEIF "$(CFG)" == "toolutil - Win64 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\lib" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c -# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_MBCS" /D"_LIB" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\lib\icutu.lib" - -!ELSEIF "$(CFG)" == "toolutil - Win64 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\lib" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_MBCS" /D"_LIB" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\lib\icutud.lib" +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\icutu22d.dll" /implib:"..\..\..\lib/icutud.lib" /pdbtype:sept /libpath:"..\..\..\lib" +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -128,35 +91,98 @@ LIB32=link.exe -lib # Name "toolutil - Win32 Release" # Name "toolutil - Win32 Debug" -# Name "toolutil - Win64 Release" -# Name "toolutil - Win64 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\toolutil.c -# ADD CPP /Ze + +!IF "$(CFG)" == "toolutil - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "toolutil - Win32 Debug" + +# ADD CPP /G6 /MDd + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucbuf.c + +!IF "$(CFG)" == "toolutil - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "toolutil - Win32 Debug" + +# ADD CPP /G6 /MDd + +!ENDIF + # End Source File # Begin Source File SOURCE=.\ucmpwrit.c + +!IF "$(CFG)" == "toolutil - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "toolutil - Win32 Debug" + +# ADD CPP /G6 /MDd + +!ENDIF + # End Source File # Begin Source File SOURCE=.\unewdata.c + +!IF "$(CFG)" == "toolutil - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "toolutil - Win32 Debug" + +# ADD CPP /G6 /MDd + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uoptions.c + +!IF "$(CFG)" == "toolutil - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "toolutil - Win32 Debug" + +# ADD CPP /G6 /MDd + +!ENDIF + # End Source File # Begin Source File SOURCE=.\uparse.c + +!IF "$(CFG)" == "toolutil - Win32 Release" + +# ADD CPP /G6 + +!ELSEIF "$(CFG)" == "toolutil - Win32 Debug" + +# ADD CPP /G6 /MDd + +!ENDIF + # End Source File # End Group # Begin Group "Header Files" @@ -187,5 +213,9 @@ SOURCE=.\uoptions.h SOURCE=.\uparse.h # End Source File # End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group # End Target # End Project diff --git a/icu4c/source/tools/toolutil/toolutil.h b/icu4c/source/tools/toolutil/toolutil.h index 5599e6e3be..2326339668 100644 --- a/icu4c/source/tools/toolutil/toolutil.h +++ b/icu4c/source/tools/toolutil/toolutil.h @@ -21,6 +21,8 @@ #include "unicode/utypes.h" + + /* * For Windows, a path/filename may be the short (8.3) version * of the "real", long one. In this case, the short one @@ -36,7 +38,7 @@ * This function is especially useful in tools that are called * by a batch file for loop, which yields short pathnames on Win9x. */ -U_CFUNC const char * +U_CAPI const char * U_EXPORT2 getLongPathname(const char *pathname); /* @@ -46,7 +48,7 @@ getLongPathname(const char *pathname); * If the pathname only contains a basename and no file separator, * then the pathname pointer itself is returned. */ -U_CFUNC const char * +U_CAPI const char * U_EXPORT2 findBasename(const char *filename); #endif