From fa964b2b18f9d425ed1a1ad9ed1a21534ad407dd Mon Sep 17 00:00:00 2001 From: Bruno Herfst Date: Thu, 21 May 2026 14:19:17 +1000 Subject: [PATCH] Use newest CXXXFLAGS Appending addon CXXXFLAGS highest wins --- .../project/makefileCommon/config.project.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.project.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.project.mk index 0708396611c..094ad477364 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.project.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.project.mk @@ -365,7 +365,16 @@ OF_PROJECT_CFLAGS += $(PROJECT_CFLAGS) OF_PROJECT_CFLAGS += $(PROJECT_ADDONS_CFLAGS) OF_PROJECT_CFLAGS += $(USER_CFLAGS) # legacy OF_PROJECT_CFLAGS += $(OF_PROJECT_DEFINES_CFLAGS) -OF_PROJECT_CXXFLAGS = $(OF_CORE_BASE_CXXFLAGS) +_addon_std_flags := $(filter -std=%,$(PROJECT_ADDONS_CFLAGS)) +ifneq ($(_addon_std_flags),) + # Forward addon -std=* into CXXFLAGS (ADDON_CFLAGS only land in CFLAGS today). + OF_PROJECT_CFLAGS := $(filter-out -std=%,$(OF_PROJECT_CFLAGS)) + OF_PROJECT_CFLAGS += $(lastword $(_addon_std_flags)) + OF_PROJECT_CXXFLAGS := $(filter-out -std=%,$(OF_CORE_BASE_CXXFLAGS)) + OF_PROJECT_CXXFLAGS += $(lastword $(_addon_std_flags)) +else + OF_PROJECT_CXXFLAGS = $(OF_CORE_BASE_CXXFLAGS) +endif ################################################################################