Skip to content

Commit fa964b2

Browse files
committed
Use newest CXXXFLAGS
Appending addon CXXXFLAGS highest wins
1 parent 21c0bb7 commit fa964b2

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,16 @@ OF_PROJECT_CFLAGS += $(PROJECT_CFLAGS)
365365
OF_PROJECT_CFLAGS += $(PROJECT_ADDONS_CFLAGS)
366366
OF_PROJECT_CFLAGS += $(USER_CFLAGS) # legacy
367367
OF_PROJECT_CFLAGS += $(OF_PROJECT_DEFINES_CFLAGS)
368-
OF_PROJECT_CXXFLAGS = $(OF_CORE_BASE_CXXFLAGS)
368+
_addon_std_flags := $(filter -std=%,$(PROJECT_ADDONS_CFLAGS))
369+
ifneq ($(_addon_std_flags),)
370+
# Forward addon -std=* into CXXFLAGS (ADDON_CFLAGS only land in CFLAGS today).
371+
OF_PROJECT_CFLAGS := $(filter-out -std=%,$(OF_PROJECT_CFLAGS))
372+
OF_PROJECT_CFLAGS += $(lastword $(_addon_std_flags))
373+
OF_PROJECT_CXXFLAGS := $(filter-out -std=%,$(OF_CORE_BASE_CXXFLAGS))
374+
OF_PROJECT_CXXFLAGS += $(lastword $(_addon_std_flags))
375+
else
376+
OF_PROJECT_CXXFLAGS = $(OF_CORE_BASE_CXXFLAGS)
377+
endif
369378

370379

371380
################################################################################

0 commit comments

Comments
 (0)