Kaydet (Commit) e78d3245 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Revert changes that are now unnecessary and pointless

This reverts commit a94dc220.
This reverts commit 3baa1c8c.
This reverts commit 4e312f0c.
This reverts commit 050a51b6.
This reverts commit 9c2a1cb4.
üst 07976ee1
......@@ -32,7 +32,6 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
--disable-werror \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
......
......@@ -33,7 +33,6 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--disable-weffc \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MSC,$(COM)),SED=sed.exe) \
&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \
)
......
......@@ -41,7 +41,6 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \
$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MSC,$(COM)),AR=lib.exe AWK=awk.exe SED=sed.exe) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
......
......@@ -30,7 +30,6 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
--disable-debug \
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
......
......@@ -32,7 +32,6 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
--disable-werror \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment