diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-06 12:28:36 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-06 12:36:21 +0100 |
| commit | 0b27253aff771e104a9fd5d17595b205b2fc39fd (patch) | |
| tree | 56992237ca5e5f3dd774b880cd86c8392e9b4311 /solenv | |
| parent | 69f0c5f03e40576272312609a9e6225638e91c83 (diff) | |
Add apr and serf externals for alternative webdav implementation.
Change-Id: I5e93bb6fb53537b889c6ba9888f0f32a0d6f8050
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalProject.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 10 |
3 files changed, 12 insertions, 0 deletions
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 0495340f33a6..f57649f10d3d 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -212,6 +212,7 @@ $(if $(findstring YES,$(UNPACKED_IS_BIN_TARBALL)),\ touch $@, $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) && \ $(if $(WRAPPERS),export $(WRAPPERS) &&) \ + $(if $(NMAKE),INCLUDE="$(gb_ExternalProject_INCLUDE)" LIB="$(ILIB)" MAKEFLAGS=) \ $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if $(4),$(4),$(1).log)) ) endef diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index df582ca803fb..3c109fea83be 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -187,6 +187,7 @@ endef # ExternalProject class gb_ExternalProject_use_autoconf := +gb_ExternalProject_use_nmake := # StaticLibrary class diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index eeb0fa001173..fb617ac9e85b 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -492,6 +492,13 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Executable_ge $(call gb_ExternalProject_get_state_target,$(1),$(2)): WRAPPERS := $(gb_AUTOCONF_WRAPPERS) endef +# Set INCLUDE and LIB variables and unset MAKEFLAGS when using nmake +# +# gb_ExternalProject_use_nmake project state_target +define gb_ExternalProject_use_nmake +$(call gb_ExternalProject_get_state_target,$(1),$(2)): NMAKE := $(true) +endef + # if ccache is enabled, then split it and use lastword as REAL_FOO # /opt/lo/bin/ccache /cygdrive/c/PROGRA~2/MICROS~2.0/VC/bin/cl.exe @@ -502,6 +509,9 @@ gb_AUTOCONF_WRAPPERS = \ CXX="$(call gb_Executable_get_target,g++-wrapper)" \ LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo" +gb_ExternalProject_INCLUDE := \ + $(subst -I,,$(subst $(WHITESPACE),;,$(subst -I. , ,$(SOLARINC)))) + # InstallScript class gb_InstallScript_EXT := .inf |