Skip to content

Forward addon -std=* from ADDON_CFLAGS into CXXFLAGS #8515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GitBruno wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Forward addon -std=* from ADDON_CFLAGS into CXXFLAGS #8515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion libs/openFrameworksCompiled/project/makefileCommon/config.project.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


################################################################################
Expand Down
Loading