Mercurial > mxe-octave

comparison src/icu4c.mk @ 4945:76828d146a8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
icu4c.mk: Don't link with msvcr100 or force --std=gnu++0x. Set CPPFLAGS, not CFLAGS.
author John W. Eaton <jwe@octave.org>
date Tue, 29 Jan 2019 12:41:34 -0500
parents a60cc99e743b
children 1896847270bf
comparison
equal deleted inserted replaced
4944:46e04d53b955 4945:76828d146a8d
27 $(ENABLE_SHARED_OR_STATIC) \ 27 $(ENABLE_SHARED_OR_STATIC) \
28 --prefix='$(HOST_PREFIX)' \ 28 --prefix='$(HOST_PREFIX)' \
29 --with-cross-build='$(1).native' \ 29 --with-cross-build='$(1).native' \
30 PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 30 PKG_CONFIG='$(MXE_PKG_CONFIG)' \
31 PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \ 31 PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \
32 CFLAGS='-DU_USING_ICU_NAMESPACE=0' \ 32 CPPFLAGS='-DU_USING_ICU_NAMESPACE=0'
33 CXXFLAGS='--std=gnu++0x' LIBS=-lmsvcr100
34 33
35 $(MAKE) -C '$(1).cross' -j '$(JOBS)' $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) 34 $(MAKE) -C '$(1).cross' -j '$(JOBS)' $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS)
36 $(MAKE) -C '$(1).cross' -j 1 install $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) DESTDIR='$(3)' 35 $(MAKE) -C '$(1).cross' -j 1 install $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) DESTDIR='$(3)'
37 $(INSTALL) -d '$(3)$(HOST_BINDIR)' 36 $(INSTALL) -d '$(3)$(HOST_BINDIR)'
38 mv -fv $(3)$(HOST_LIBDIR)/icu*.dll '$(3)$(HOST_BINDIR)/' 37 mv -fv $(3)$(HOST_LIBDIR)/icu*.dll '$(3)$(HOST_BINDIR)/'