RepositoryExternal.mk | 11 ++++++++++-
slideshow/Library_OGLTrans.mk | 1 -
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 2f86601db1ff8f198666a07f4b25d113760c879c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 6 16:45:18 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 6 21:04:40 2020 +0100
always define GLM_FORCE_CTOR_INIT when using glm
Change-Id: I2a4ed756c6d18937d2c720243652df7a2d629959
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88121
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 405ad054510e..1f36dda8f202 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -90,12 +90,21 @@ endif # SYSTEM_MDDS
ifneq ($(SYSTEM_GLM),)
-gb_LinkTarget__use_glm_headers :=
+define gb_LinkTarget__use_glm_headers
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DGLM_FORCE_CTOR_INIT \
+)
+
+endef
+
gb_ExternalProject__use_glm_headers :=
else
define gb_LinkTarget__use_glm_headers
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DGLM_FORCE_CTOR_INIT \
+)
$(call gb_LinkTarget_use_unpacked,$(1),glm)
$(call gb_LinkTarget_set_include,$(1),\
$(GLM_CFLAGS) \
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 9b64181d6a46..4eca2a1ecaa3 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -17,7 +17,6 @@ endif
$(eval $(call gb_Library_add_defs,OGLTrans,\
-DGLM_FORCE_RADIANS \
- -DGLM_FORCE_CTOR_INIT \
))
$(eval $(call gb_Library_use_sdk_api,OGLTrans))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
