[Libreoffice-commits] core.git: 2 commits - libodfgen/ExternalProject_libodfgen.mk libvisio/ExternalProject_libvisio.mk

[Tor Lillqvist]

 libodfgen/ExternalProject_libodfgen.mk |    1 +
 libvisio/ExternalProject_libvisio.mk   |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit a94dc2203539a1593b99778be16b2c664fd46daa
Author: Tor Lillqvist <tlillqv...@suse.com>
Date:   Wed May 15 12:12:20 2013 +0300

    Also AWK needed here
    
    Change-Id: Ifc47c1422f035cb23a9a148510230c8dd2cf42cd

diff --git a/libvisio/ExternalProject_libvisio.mk 
b/libvisio/ExternalProject_libvisio.mk
index 3a5ce50..66c6a919 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -41,6 +41,7 @@ $(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)) \
        )
 
commit 3baa1c8c9baf6bb35f9d2ff5e002a5403d2d4af4
Author: Tor Lillqvist <tlillqv...@suse.com>
Date:   Wed May 15 12:07:16 2013 +0300

    I almost sense a pattern, except that AR is not needed here for some reason
    
    Change-Id: I260304559eec7b92add33a758623bc039c2e2d3a

diff --git a/libodfgen/ExternalProject_libodfgen.mk 
b/libodfgen/ExternalProject_libodfgen.mk
index 3b0ce21..3c9d479 100644
--- a/libodfgen/ExternalProject_libodfgen.mk
+++ b/libodfgen/ExternalProject_libodfgen.mk
@@ -33,6 +33,7 @@ $(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)) \
        )
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits