diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-05-30 17:49:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-05-30 20:19:22 +0200 |
| commit | 656c8754abc6678e5efcaa1fec1dcac0a01ca54c (patch) | |
| tree | d354c4187eba324c97332c96db4570889751f36a /external/poppler | |
| parent | 48801417688bf69aaac00c4b448f7779db13e895 (diff) | |
sal,external: remove checks for obsolete VCVER=120
Change-Id: I4d32b7c4b2e545a8d979bc516f64cfcbf66ecd07
Diffstat (limited to 'external/poppler')
| -rw-r--r-- | external/poppler/ExternalProject_poppler.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk index 83d51b9ea9e7..61cc10e62d06 100644 --- a/external/poppler/ExternalProject_poppler.mk +++ b/external/poppler/ExternalProject_poppler.mk @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,poppler,\ $(call gb_ExternalProject_get_state_target,poppler,build) : $(call gb_ExternalProject_run,build,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)",$(if $(filter MSC-120,$(COM)-$(VCVER)),CXXFLAGS="$(CXXFLAGS) -I$(SRCDIR)/include")) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \ MAKE=$(MAKE) PKG_CONFIG="" ./configure \ --with-pic \ --enable-static \ |