AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-3734 Use the base address when needed on Windows.

Browse Source 
X-SVN-Rev: 15173
This commit is contained in:
George Rhoten 2004-05-06 05:56:22 +00:00
parent 21b87f6765
commit 4e2017ef10
11 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
icu4c/source/common/Makefile.in
View File

@ -51,6 +51,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
LDFLAGS += $(LDFLAGSICUUC)
CPPFLAGS += -I. -I$(srcdir) -I$(srcdir)/../i18n $(LIBCPPFLAGS) CPPFLAGS += -I. -I$(srcdir) -I$(srcdir)/../i18n $(LIBCPPFLAGS)
DEFS += -DU_COMMON_IMPLEMENTATION DEFS += -DU_COMMON_IMPLEMENTATION

16
icu4c/source/config/mh-cygwin-msvc
View File

@ -55,8 +55,8 @@ LINK.c= LINK.EXE /subsystem:console $(LDFLAGS)
LINK.cc= LINK.EXE /subsystem:console $(LDFLAGS) LINK.cc= LINK.EXE /subsystem:console $(LDFLAGS)
## Commands to make a shared library ## Commands to make a shared library
SHLIB.c= LINK.EXE /DLL $(LDFLAGS) SHLIB.c= LINK.EXE /subsystem:console /DLL $(LDFLAGS)
SHLIB.cc= LINK.EXE /DLL $(LDFLAGS) SHLIB.cc= LINK.EXE /subsystem:console /DLL $(LDFLAGS)
## Compiler switch to embed a runtime search path ## Compiler switch to embed a runtime search path
LD_RPATH= LD_RPATH=
@ -93,9 +93,19 @@ LIBICUUC= $(LIBDIR)/$(LIBICU)$(COMMON_STUBNAME)$(ICULIBSUFFIX).lib $(LIBICUDT)
LIBICUI18N= $(LIBDIR)/$(LIBICU)$(I18N_STUBNAME)$(ICULIBSUFFIX).lib LIBICUI18N= $(LIBDIR)/$(LIBICU)$(I18N_STUBNAME)$(ICULIBSUFFIX).lib
LIBICULE= $(LIBDIR)/$(LIBICU)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX).lib LIBICULE= $(LIBDIR)/$(LIBICU)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX).lib
LIBICULX= $(LIBDIR)/$(LIBICU)$(LAYOUTEX_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 LIBCTESTFW= $(top_builddir)/tools/ctestfw/$(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX).lib
LIBICUTOOLUTIL= $(LIBDIR)/$(LIBICU)$(TOOLUTIL_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 ## If we can't use the shared libraries, use the static libraries
ifneq ($(ENABLE_SHARED),YES) ifneq ($(ENABLE_SHARED),YES)

1
icu4c/source/i18n/Makefile.in
View File

@ -52,6 +52,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
LDFLAGS += $(LDFLAGSICUI18N)
CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS)
DEFS += -DU_I18N_IMPLEMENTATION DEFS += -DU_I18N_IMPLEMENTATION
LIBS = $(LIBICUUC) $(DEFAULT_LIBS) LIBS = $(LIBICUUC) $(DEFAULT_LIBS)

1
icu4c/source/io/Makefile.in
View File

@ -51,6 +51,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
LDFLAGS += $(LDFLAGSICUIO)
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS)
DEFS += -DU_IO_IMPLEMENTATION DEFS += -DU_IO_IMPLEMENTATION
LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS) LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS)

1
icu4c/source/layout/Makefile.in
View File

@ -45,6 +45,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
LDFLAGS += $(LDFLAGSICULE)
CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/unicode -I$(srcdir)/.. $(LIBCPPFLAGS) CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/unicode -I$(srcdir)/.. $(LIBCPPFLAGS)
DEFS += -DU_LAYOUT_IMPLEMENTATION DEFS += -DU_LAYOUT_IMPLEMENTATION
LIBS = $(LIBICUUC) $(DEFAULT_LIBS) LIBS = $(LIBICUUC) $(DEFAULT_LIBS)

1
icu4c/source/layoutex/Makefile.in
View File

@ -45,6 +45,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
LDFLAGS += $(LDFLAGSICULX)
CPPFLAGS += -I$(srcdir) -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) CPPFLAGS += -I$(srcdir) -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS)
DEFS += -DU_LAYOUTEX_IMPLEMENTATION DEFS += -DU_LAYOUTEX_IMPLEMENTATION
LIBS = $(LIBICUUC) $(LIBICULE) $(DEFAULT_LIBS) LIBS = $(LIBICUUC) $(LIBICULE) $(DEFAULT_LIBS)

2
icu4c/source/layoutex/layoutex.vcproj
View File

@ -42,6 +42,7 @@
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib/iculx30.pdb" ProgramDatabaseFile=".\..\..\lib/iculx30.pdb"
BaseAddress="0x4ac80000"
ImportLibrary="..\..\lib\iculx.lib"/> ImportLibrary="..\..\lib\iculx.lib"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
@ -104,6 +105,7 @@
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\..\..\lib/iculx30d.pdb" ProgramDatabaseFile=".\..\..\lib/iculx30d.pdb"
BaseAddress="0x4ac80000"
ImportLibrary="..\..\lib\iculxd.lib"/> ImportLibrary="..\..\lib\iculxd.lib"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"

1
icu4c/source/stubdata/Makefile.in
View File

@ -41,6 +41,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
LDFLAGS += $(LDFLAGSICUDT)
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS)
OBJECTS = stubdata.o OBJECTS = stubdata.o

1
icu4c/source/tools/ctestfw/Makefile.in
View File

@ -38,6 +38,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
LDFLAGS += $(LDFLAGSCTESTFW)
LIBS = $(LIBICUUC) $(DEFAULT_LIBS) LIBS = $(LIBICUUC) $(DEFAULT_LIBS)
OBJECTS = ctest.o tstdtmod.o testdata.o datamap.o OBJECTS = ctest.o tstdtmod.o testdata.o datamap.o

1
icu4c/source/tools/toolutil/Makefile.in
View File

@ -37,6 +37,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
LDFLAGS += $(LDFLAGSICUTOOLUTIL)
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw $(LIBCPPFLAGS) CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw $(LIBCPPFLAGS)
LIBS = $(LIBICUUC) $(DEFAULT_LIBS) LIBS = $(LIBICUUC) $(DEFAULT_LIBS)

2
icu4c/source/tools/toolutil/toolutil.vcproj
View File

@ -44,6 +44,7 @@
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\lib" AdditionalLibraryDirectories="..\..\..\lib"
ProgramDatabaseFile=".\..\..\..\lib/icutu30.pdb" ProgramDatabaseFile=".\..\..\..\lib/icutu30.pdb"
BaseAddress="0x4ac00000"
ImportLibrary="..\..\..\lib/icutu.lib"/> ImportLibrary="..\..\..\lib/icutu.lib"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
@ -108,6 +109,7 @@
AdditionalLibraryDirectories="..\..\..\lib" AdditionalLibraryDirectories="..\..\..\lib"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\..\..\..\lib/icutu30d.pdb" ProgramDatabaseFile=".\..\..\..\lib/icutu30d.pdb"
BaseAddress="0x4ac00000"
ImportLibrary="..\..\..\lib/icutud.lib"/> ImportLibrary="..\..\..\lib/icutud.lib"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"