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))