File tree Expand file tree Collapse file tree
libs/openFrameworksCompiled/project/makefileCommon Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -365,7 +365,16 @@ OF_PROJECT_CFLAGS += $(PROJECT_CFLAGS)
365365OF_PROJECT_CFLAGS += $(PROJECT_ADDONS_CFLAGS )
366366OF_PROJECT_CFLAGS += $(USER_CFLAGS ) # legacy
367367OF_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# ###############################################################################
You can’t perform that action at this time.
0 commit comments