Skip to content

Commit f9d9375

Browse files
committed
Added support for ADDON_DEFINES from addon_config.mk for make files
1 parent fcc4fba commit f9d9375

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ define parse_addon
108108
$(eval ADDON_PKG_CONFIG_LIBRARIES= ) \
109109
$(eval ADDON_FRAMEWORKS= ) \
110110
$(eval ADDON_LIBS_EXCLUDE= ) \
111+
$(eval ADDON_DEFINES= ) \
111112
$(eval ADDON_SOURCES_EXCLUDE= ) \
112113
$(call parse_addons_includes, $(addon)) \
113114
$(eval ADDON_INCLUDES=$(PARSED_ADDONS_INCLUDES)) \
@@ -159,6 +160,7 @@ define parse_addon
159160
$(eval TMP_PROJECT_ADDONS_LDFLAGS += $(ADDON_LDFLAGS)) \
160161
$(eval TMP_PROJECT_ADDONS_PKG_CONFIG_LIBRARIES += $(ADDON_PKG_CONFIG_LIBRARIES)) \
161162
$(eval TMP_PROJECT_ADDONS_FRAMEWORKS += $(ADDON_FRAMEWORKS)) \
163+
$(eval TMP_PROJECT_ADDONS_DEFINES += $(ADDON_DEFINES)) \
162164
$(eval PROJECT_AFTER += $(ADDON_AFTER)) \
163165
$(if $(strip $(ADDON_SOURCES)), \
164166
$(info ADDON_SOURCES_EXCLUDE: $(ADDON_SOURCES_EXCLUDE)) \
@@ -227,7 +229,7 @@ define parse_addon
227229
$(eval PROJECT_ADDONS += $(addon_dep)) \
228230
$(call parse_addon,$(addon_dep)) \
229231
) \
230-
)
232+
)
231233
endef
232234

233235

@@ -254,6 +256,7 @@ PROJECT_ADDONS_FRAMEWORKS = $(call uniq,$(TMP_PROJECT_ADDONS_FRAMEWORKS))
254256
PROJECT_ADDONS_SOURCE_FILES = $(call uniq,$(TMP_PROJECT_ADDONS_SOURCE_FILES))
255257
PROJECT_ADDONS_OBJ_FILES = $(call uniq,$(TMP_PROJECT_ADDONS_OBJ_FILES))
256258
PROJECT_ADDONS_DATA = $(call uniq,$(TMP_PROJECT_ADDONS_DATA))
259+
PROJECT_ADDONS_DEFINES = $(call uniq,$(TMP_PROJECT_ADDONS_DEFINES))
257260
VPATH += $(call uniq, $(ADDON_PATHS))
258261

259262

0 commit comments

Comments
 (0)