From 4e2017ef10e5f3188a3f215b46c96ea9f97e4f72 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 6 May 2004 05:56:22 +0000 Subject: [PATCH] ICU-3734 Use the base address when needed on Windows. X-SVN-Rev: 15173 --- icu4c/source/common/Makefile.in | 1 + icu4c/source/config/mh-cygwin-msvc | 16 +++++++++++++--- icu4c/source/i18n/Makefile.in | 1 + icu4c/source/io/Makefile.in | 1 + icu4c/source/layout/Makefile.in | 1 + icu4c/source/layoutex/Makefile.in | 1 + icu4c/source/layoutex/layoutex.vcproj | 2 ++ icu4c/source/stubdata/Makefile.in | 1 + icu4c/source/tools/ctestfw/Makefile.in | 1 + icu4c/source/tools/toolutil/Makefile.in | 1 + icu4c/source/tools/toolutil/toolutil.vcproj | 2 ++ 11 files changed, 25 insertions(+), 3 deletions(-) diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in index 0ece85780d..38fc238257 100644 --- a/icu4c/source/common/Makefile.in +++ b/icu4c/source/common/Makefile.in @@ -51,6 +51,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) +LDFLAGS += $(LDFLAGSICUUC) CPPFLAGS += -I. -I$(srcdir) -I$(srcdir)/../i18n $(LIBCPPFLAGS) DEFS += -DU_COMMON_IMPLEMENTATION diff --git a/icu4c/source/config/mh-cygwin-msvc b/icu4c/source/config/mh-cygwin-msvc index 6e626d7dfa..b999cfea80 100644 --- a/icu4c/source/config/mh-cygwin-msvc +++ b/icu4c/source/config/mh-cygwin-msvc @@ -55,8 +55,8 @@ LINK.c= LINK.EXE /subsystem:console $(LDFLAGS) LINK.cc= LINK.EXE /subsystem:console $(LDFLAGS) ## Commands to make a shared library -SHLIB.c= LINK.EXE /DLL $(LDFLAGS) -SHLIB.cc= LINK.EXE /DLL $(LDFLAGS) +SHLIB.c= LINK.EXE /subsystem:console /DLL $(LDFLAGS) +SHLIB.cc= LINK.EXE /subsystem:console /DLL $(LDFLAGS) ## Compiler switch to embed a runtime search path LD_RPATH= @@ -93,9 +93,19 @@ LIBICUUC= $(LIBDIR)/$(LIBICU)$(COMMON_STUBNAME)$(ICULIBSUFFIX).lib $(LIBICUDT) LIBICUI18N= $(LIBDIR)/$(LIBICU)$(I18N_STUBNAME)$(ICULIBSUFFIX).lib LIBICULE= $(LIBDIR)/$(LIBICU)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX).lib LIBICULX= $(LIBDIR)/$(LIBICU)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX).lib +LIBICUIO= $(LIBDIR)/$(LIBICU)$(IO_STUBNAME)$(ICULIBSUFFIX).lib LIBCTESTFW= $(top_builddir)/tools/ctestfw/$(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX).lib LIBICUTOOLUTIL= $(LIBDIR)/$(LIBICU)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX).lib -LIBICUIO= $(LIBDIR)/$(LIBICU)$(IO_STUBNAME)$(ICULIBSUFFIX).lib + +## These are the library specific LDFLAGS +LDFLAGSICUDT= # Unused for now. +LDFLAGSICUUC= /base:"0x4a800000"# in-uc = 1MB +LDFLAGSICUI18N= /base:"0x4a900000"# io-in = 2MB +LDFLAGSICUIO= /base:"0x4ab00000"# le-io = 1MB +LDFLAGSICULE= /base:"0x4ac00000"# lx-le = 512KB +LDFLAGSICULX= /base:"0x4ac80000" +LDFLAGSCTESTFW= # Unused for now. +LDFLAGSICUTOOLUTIL= /base:"0x4ac00000"# Same as layout. Layout and tools probably won't mix. ## If we can't use the shared libraries, use the static libraries ifneq ($(ENABLE_SHARED),YES) diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index fd91e9b4f2..35f815f9d2 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -52,6 +52,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) +LDFLAGS += $(LDFLAGSICUI18N) CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) DEFS += -DU_I18N_IMPLEMENTATION LIBS = $(LIBICUUC) $(DEFAULT_LIBS) diff --git a/icu4c/source/io/Makefile.in b/icu4c/source/io/Makefile.in index c42777e0bb..08c9ddbea7 100644 --- a/icu4c/source/io/Makefile.in +++ b/icu4c/source/io/Makefile.in @@ -51,6 +51,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) +LDFLAGS += $(LDFLAGSICUIO) CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) DEFS += -DU_IO_IMPLEMENTATION LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS) diff --git a/icu4c/source/layout/Makefile.in b/icu4c/source/layout/Makefile.in index 817a7bed09..7fd57de61c 100644 --- a/icu4c/source/layout/Makefile.in +++ b/icu4c/source/layout/Makefile.in @@ -45,6 +45,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) +LDFLAGS += $(LDFLAGSICULE) CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/unicode -I$(srcdir)/.. $(LIBCPPFLAGS) DEFS += -DU_LAYOUT_IMPLEMENTATION LIBS = $(LIBICUUC) $(DEFAULT_LIBS) diff --git a/icu4c/source/layoutex/Makefile.in b/icu4c/source/layoutex/Makefile.in index ed96cd7cb5..79826aa0ff 100644 --- a/icu4c/source/layoutex/Makefile.in +++ b/icu4c/source/layoutex/Makefile.in @@ -45,6 +45,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) +LDFLAGS += $(LDFLAGSICULX) CPPFLAGS += -I$(srcdir) -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) DEFS += -DU_LAYOUTEX_IMPLEMENTATION LIBS = $(LIBICUUC) $(LIBICULE) $(DEFAULT_LIBS) diff --git a/icu4c/source/layoutex/layoutex.vcproj b/icu4c/source/layoutex/layoutex.vcproj index dfea055dff..c6d21d9d1a 100644 --- a/icu4c/source/layoutex/layoutex.vcproj +++ b/icu4c/source/layoutex/layoutex.vcproj @@ -42,6 +42,7 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" ProgramDatabaseFile=".\..\..\lib/iculx30.pdb" + BaseAddress="0x4ac80000" ImportLibrary="..\..\lib\iculx.lib"/>