diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-10 15:08:29 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-10 15:08:29 +0100 |
| commit | 1413b6a4fd6cd0909115566c94882bbc82f43b39 (patch) | |
| tree | c7e7012e9fd28e7ccbacdb07904eb4a03ec805fd /external/libgltf/ExternalProject_libgltf.mk | |
| parent | 8b172f7e847aa28d612e6730c37b9d8c513853b0 (diff) | |
external: fortunately boost no longer requires config_host.mk
Change-Id: I8f2176500bf620cd5e4cdf434e6122b6163b3e0f
Diffstat (limited to 'external/libgltf/ExternalProject_libgltf.mk')
| -rw-r--r-- | external/libgltf/ExternalProject_libgltf.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk index e38e597d5f95..4fd3809b83bc 100644 --- a/external/libgltf/ExternalProject_libgltf.mk +++ b/external/libgltf/ExternalProject_libgltf.mk @@ -28,7 +28,6 @@ libgltf_AdditionalIncludes := ifeq ($(SYSTEM_BOOST),) libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,boost)" -libgltf_AdditionalIncludes += "$(BUILDDIR)/config_$(gb_Side)" endif ifeq ($(SYSTEM_GLEW),) @@ -68,7 +67,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) : --with-pic \ $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ - BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) -I$(BUILDDIR)/config_$(gb_Side)" \ + BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ GLEW_CFLAGS="$(if $(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glew)/include)" \ GLM_CFLAGS="$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glm))" \ $(if $(libgltf_CPPFLAGS),CPPFLAGS='$(libgltf_CPPFLAGS)') \ |