Kaydet (Commit) 476fd8ac authored tarafından Kay Schenk's avatar Kay Schenk

#i126118# more changes to fix null second op in ifndef statements.

üst 51e9a26e
...@@ -191,13 +191,13 @@ $(eval $(call gb_Library_set_defs,vcl,\ ...@@ -191,13 +191,13 @@ $(eval $(call gb_Library_set_defs,vcl,\
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
)) ))
## handle fontconfig ## handle fontconfig
ifneq ($(ENABLE_FONTCONFIG),) ifeq ($(ENABLE_FONTCONFIG),TRUE)
$(eval $(call gb_Library_set_defs,vcl,\ $(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \ $$(DEFS) \
-DENABLE_FONTCONFIG \ -DENABLE_FONTCONFIG \
)) ))
## handle CUPS ## handle CUPS
ifneq ($(ENABLE_CUPS),) ifeq ($(ENABLE_CUPS),TRUE)
$(eval $(call gb_Library_set_defs,vcl,\ $(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \ $$(DEFS) \
-DENABLE_CUPS \ -DENABLE_CUPS \
...@@ -522,6 +522,7 @@ $(eval $(call gb_Library_set_ldflags,vcl,\ ...@@ -522,6 +522,7 @@ $(eval $(call gb_Library_set_ldflags,vcl,\
-framework Carbon \ -framework Carbon \
-framework CoreFoundation \ -framework CoreFoundation \
)) ))
# ??? what about this
ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7) ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
$(eval $(call gb_Library_set_ldflags,vcl, $$(LDFLAGS) -framework QuickTime )) $(eval $(call gb_Library_set_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment