From cb3085c1d3296788087c3a22c57c8403a962c8e5 Mon Sep 17 00:00:00 2001
From: Steveice10 <Steveice10@gmail.com>
Date: Sat, 7 Jan 2017 12:09:46 -0800
Subject: [PATCH] Add support for separate C and C++ build flags.

---
 make_base | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/make_base b/make_base
index 6878065..6f4ca09 100644
--- a/make_base
+++ b/make_base
@@ -380,8 +380,16 @@ endif
 
 # FINAL COMMON SETUP #
 
-CC_FLAGS := $(COMMON_CC_FLAGS) -std=gnu99
-CXX_FLAGS := $(COMMON_CC_FLAGS) -std=gnu++11
+CC_FLAGS := $(COMMON_CC_FLAGS) $(BUILD_FLAGS_CC)
+CXX_FLAGS := $(COMMON_CC_FLAGS) $(BUILD_FLAGS_CXX)
+
+ifeq ($(findstring -std,$(BUILD_FLAGS_CC)),)
+	CC_FLAGS += -std=gnu99
+endif
+
+ifeq ($(findstring -std,$(BUILD_FLAGS_CXX)),)
+	CXX_FLAGS += -std=gnu++11
+endif
 
 ifneq ($(EXTRA_OUTPUT_FILES),)
     EXTRA_OUTPUT_COPY_CMD := cp -r $(EXTRA_OUTPUT_FILES) $(OUTPUT_DIR)