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

ICU-3855 Improve static libraries

Browse Source 
X-SVN-Rev: 16305
This commit is contained in:
George Rhoten 2004-09-12 22:30:29 +00:00
parent c7b731f94b
commit 6fe68cb5ba
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/config/mh-cygwin
View File

@ -7,8 +7,14 @@
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
## Flags to create a static library
## Flags to create/use a static library
ifneq ($(ENABLE_SHARED),YES)
## Make sure that the static libraries can be built and used
CPPFLAGS += -DU_STATIC_IMPLEMENTATION
else
## Make sure that the static libraries can be built
STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION
endif
## Flags for position independent code
SHAREDLIBCFLAGS =

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

@ -13,8 +13,14 @@ GEN_DEPS.cc= :
#GEN_DEPS.c= $(COMPILE.c) /E
#GEN_DEPS.cc= $(COMPILE.cc) /E
## Flags to create a static library
## Flags to create/use a static library
ifneq ($(ENABLE_SHARED),YES)
## Make sure that the static libraries can be built and used
CPPFLAGS += -DU_STATIC_IMPLEMENTATION
else
## Make sure that the static libraries can be built
STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION
endif
## Flags for position independent code
SHAREDLIBCFLAGS =
@ -91,6 +97,7 @@ DEFAULT_LIBS = advapi32.lib
# This is also for backwards compatibility.
DATA_STUBNAME = dt
I18N_STUBNAME = in
LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
## Link commands to link to ICU libs
LIBICUDT= $(top_builddir)/stubdata/$(LIBICU)$(DATA_STUBNAME)$(ICULIBSUFFIX).lib
@ -112,11 +119,6 @@ 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)
LIBICU=$(LIBSICU)
endif
# Current full path directory.
CURR_FULL_DIR=$(shell cygpath -dma .)
# Current full path directory for use in source code in a -D compiler option.

2
icu4c/source/test/iotest/Makefile.in
View File

@ -26,7 +26,7 @@ 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
DEFS += -DU_TOPSRCDIR=\"$(top_srcdir)/\" -DU_TOPBUILDDIR=\"$(BUILDDIR)\"
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUIO) $(DEFAULT_LIBS) $(LIB_M)
LIBS = $(LIBCTESTFW) $(LIBICUIO) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = iotest.o strtst.o filetst.o