[Libreoffice-commits] core.git: Branch 'feature/glyphy' - 3 commits - external/glyphy

[Tor Lillqvist]

 external/glyphy/ExternalPackage_glyphy.mk |    2 ++
 external/glyphy/ExternalProject_glyphy.mk |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 984232f059ad973b3202ad0bae912ce32af86d4e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Nov 2 22:29:23 2015 +0200

    The glyphy configury takes no --enable/disable-debug option
    
    Change-Id: Id098945656c0d97a0fc11efb42a0d09efb3e5557

diff --git a/external/glyphy/ExternalProject_glyphy.mk b/external/glyphy/ExternalProject_glyphy.mk
index 463cb81..6243187 100644
--- a/external/glyphy/ExternalProject_glyphy.mk
+++ b/external/glyphy/ExternalProject_glyphy.mk
@@ -29,7 +29,6 @@ $(call gb_ExternalProject_get_state_target,glyphy,build) :
 			, \
 				--enable-shared --disable-static \
 			) \
-			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(if $(verbose),V=1) \
commit ae5507496a1c892fceb72a3b1a22d0ebdaedb500
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Nov 2 22:28:29 2015 +0200

    We (unintentionally?) build a static archive with MSVC
    
    Change-Id: Ief0ccec4b63e2ac767285f4c19175fa000eaad6c

diff --git a/external/glyphy/ExternalPackage_glyphy.mk b/external/glyphy/ExternalPackage_glyphy.mk
index cbae840..b4a32fc 100644
--- a/external/glyphy/ExternalPackage_glyphy.mk
+++ b/external/glyphy/ExternalPackage_glyphy.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_ExternalPackage_use_external_project,glyphy,glyphy))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.dylib,src/.libs/libglyphy.dylib))
+else ifeq ($(OS),WNT)
+# We build a static archive with MSVC, so nothing to add
 else ifeq ($(DISABLE_DYNLOADING),)
 $(eval $(call gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.so.0,src/.libs/libglyphy.so.0.0.0))
 endif
commit 67614e59651fd870fd0e7fd8791cdd4585c730ce
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Nov 2 22:27:24 2015 +0200

    Need _USE_MATH_DEFINES with MSVC for M_PI_2
    
    Change-Id: Ieb7671480b88304a94066965d10d455865915090

diff --git a/external/glyphy/ExternalProject_glyphy.mk b/external/glyphy/ExternalProject_glyphy.mk
index 1eda015..463cb81 100644
--- a/external/glyphy/ExternalProject_glyphy.mk
+++ b/external/glyphy/ExternalProject_glyphy.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,glyphy, \
 
 $(call gb_ExternalProject_get_state_target,glyphy,build) :
 	$(call gb_ExternalProject_run,build,\
+	    $(if $(filter MSC,$(COM)),CPPFLAGS=-D_USE_MATH_DEFINES) \
 		MAKE=$(MAKE) ./configure \
 			--with-pic \
 			$(if $(DISABLE_DYNLOADING), \