ICU-3576 Improve building and using static libraries
X-SVN-Rev: 15082
This commit is contained in:
parent
3f6a9fdd2f
commit
d0426c2053
@ -88,11 +88,6 @@ LIBCTESTFW= $(top_builddir)/tools/ctestfw/$(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSU
|
||||
LIBICUTOOLUTIL= $(LIBDIR)/$(LIBICU)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX).lib
|
||||
LIBICUIO= $(LIBDIR)/$(LIBICU)$(IO_STUBNAME)$(ICULIBSUFFIX).lib
|
||||
|
||||
## 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 -wma .)
|
||||
# Current full path directory for use in source code in a -D compiler option.
|
||||
|
@ -152,7 +152,13 @@ MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR)
|
||||
# Prefix for the ICU library names
|
||||
ICUPREFIX = icu
|
||||
LIBPREFIX = lib
|
||||
|
||||
## If we can't use the shared libraries, use the static libraries
|
||||
ifneq ($(ENABLE_SHARED),YES)
|
||||
LIBICU = $(LIBSICU)
|
||||
else
|
||||
LIBICU = $(LIBPREFIX)$(ICUPREFIX)
|
||||
endif
|
||||
|
||||
# Static library prefix and file extension
|
||||
STATIC_PREFIX = s
|
||||
|
Loading…
Reference in New Issue
Block a user