ICU-4420 Make ICU work with Cygwin and MSVC 6 on Windows 98.

X-SVN-Rev: 17371
This commit is contained in:
George Rhoten 2005-03-22 03:37:06 +00:00
parent 9f89ff2961
commit 7dc1243a75
5 changed files with 8 additions and 8 deletions

View file

@ -123,7 +123,7 @@ LDFLAGSICUTOOLUTIL= /base:"0x4ac00000"# Same as layout. Layout and tools probabl
# Current full path directory.
CURR_FULL_DIR=$(subst \,/,$(shell cygpath -da .))#M# -m isn't used because it doesn't work on Win98
# Current full path directory for use in source code in a -D compiler option.
CURR_SRCCODE_FULL_DIR=$(subst \,\\\\,$(shell cygpath -da .))#M#
CURR_SRCCODE_FULL_DIR=$(subst \,\\,$(shell cygpath -da .))#M#
ifeq ($(srcdir),.)
SOURCE_FILE=$<

View file

@ -72,7 +72,7 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
# Current full path directory.
CURR_FULL_DIR=$(shell pwd -W)#M#
# Current full path directory for use in source code in a -D compiler option.
CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M#
CURR_SRCCODE_FULL_DIR=$(subst /,\\,$(shell pwd -W))#M#
## Compilation rules
%.$(STATIC_O): $(srcdir)/%.c

View file

@ -33,9 +33,9 @@ BUILDDIR := $(CURR_SRCCODE_FULL_DIR)/../../
# Simplify the path for Unix
BUILDDIR := $(BUILDDIR:test/cintltst/../../=)
# Simplify the path for Windows
BUILDDIR := $(BUILDDIR:test\\\\cintltst/../../=)
BUILDDIR := $(BUILDDIR:test\\cintltst/../../=)
# Simplify the path for Windows 98
BUILDDIR := $(BUILDDIR:TEST\\\\CINTLTST/../../=)
BUILDDIR := $(BUILDDIR:TEST\\CINTLTST/../../=)
# we define ICU_UNICODE_VERSION so we can test it
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil

View file

@ -23,9 +23,9 @@ BUILDDIR := $(CURR_SRCCODE_FULL_DIR)/../../
# Simplify the path for Unix
BUILDDIR := $(BUILDDIR:test/intltest/../../=)
# Simplify the path for Windows
BUILDDIR := $(BUILDDIR:test\\\\intltest/../../=)
BUILDDIR := $(BUILDDIR:test\\intltest/../../=)
# Simplify the path for Windows 98
BUILDDIR := $(BUILDDIR:TEST\\\\INTLTEST/../../=)
BUILDDIR := $(BUILDDIR:TEST\\INTLTEST/../../=)
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw
DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'

View file

@ -23,9 +23,9 @@ BUILDDIR := $(CURR_SRCCODE_FULL_DIR)/../../
# Simplify the path for Unix
BUILDDIR := $(BUILDDIR:test/iotest/../../=)
# Simplify the path for Windows
BUILDDIR := $(BUILDDIR:test\\\\iotest/../../=)
BUILDDIR := $(BUILDDIR:test\\iotest/../../=)
# Simplify the path for Windows 98
BUILDDIR := $(BUILDDIR:TEST\\\\IOTEST/../../=)
BUILDDIR := $(BUILDDIR:TEST\\IOTEST/../../=)
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n \
-I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/io