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 <caolanm@redhat.com>
This commit is contained in:
parent
f58074edfc
commit
2f86601db1
@ -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) \
|
||||
|
@ -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))
|
||||
|
Loading…
x
Reference in New Issue
Block a user