From 5936f2692d67a37e472b80cdf59f7d46988d8e56 Mon Sep 17 00:00:00 2001 From: David Hadka Date: Wed, 1 Jan 2025 18:11:21 -0700 Subject: [PATCH] Revert "Use C11 standard" This reverts commit 5e22cdab06490055f7959f92b43f4d1ffc8aeefc. --- native/HBV/Makefile | 4 ++-- native/LRGV/Makefile | 2 +- native/LakeProblem/Makefile | 2 +- native/Radar/Makefile | 2 +- native/WDS/Makefile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/native/HBV/Makefile b/native/HBV/Makefile index 8b7df57..758998f 100644 --- a/native/HBV/Makefile +++ b/native/HBV/Makefile @@ -29,8 +29,8 @@ SRC_DIR = src CC_SERIAL = g++ #If profiling, add the -pg flag in the last line of these as well -C_FLAGS = -O3 -DOUT_TO_SCREEN -DHBVMOD -DRANGER_MEMORY_TRICK -DSERIAL -lm -std=c++11 -C_FLAGS_DEBUG = -g -O0 -DOUT_TO_SCREEN -DHBVMOD -DRANGER_MEMORY_TRICK -DSERIAL -lm -std=c++11 +C_FLAGS = -O3 -DOUT_TO_SCREEN -DHBVMOD -DRANGER_MEMORY_TRICK -DSERIAL -lm +C_FLAGS_DEBUG = -g -O0 -DOUT_TO_SCREEN -DHBVMOD -DRANGER_MEMORY_TRICK -DSERIAL -lm ifeq ($(OS),Windows_NT) C_FLAGS += -static diff --git a/native/LRGV/Makefile b/native/LRGV/Makefile index 7403ade..b355465 100644 --- a/native/LRGV/Makefile +++ b/native/LRGV/Makefile @@ -2,7 +2,7 @@ CC = g++ TARGET = lrgv SRC_DIR = src SHARED_DIR = ../shared -CFLAGS = -O3 -I$(SRC_DIR) -I$(SHARED_DIR) -std=c++11 +CFLAGS = -O3 -I$(SRC_DIR) -I$(SHARED_DIR) LIBS = ifeq ($(OS),Windows_NT) diff --git a/native/LakeProblem/Makefile b/native/LakeProblem/Makefile index c720595..55eaa03 100644 --- a/native/LakeProblem/Makefile +++ b/native/LakeProblem/Makefile @@ -2,7 +2,7 @@ CC = g++ SRC_DIR = src SHARED_DIR = ../shared TARGET = lake -CFLAGS = -O3 -Wno-unused-local-typedefs -I$(SRC_DIR) -I$(SHARED_DIR) -I$(SRC_DIR)/boost_1_56_0 -std=c++11 +CFLAGS = -O3 -Wno-unused-local-typedefs -I$(SRC_DIR) -I$(SHARED_DIR) -I$(SRC_DIR)/boost_1_56_0 SOURCE = $(SRC_DIR)/main-lake.cpp $(SHARED_DIR)/moeaframework.c LIBS = diff --git a/native/Radar/Makefile b/native/Radar/Makefile index b1d204e..a8ea1e7 100644 --- a/native/Radar/Makefile +++ b/native/Radar/Makefile @@ -1,6 +1,6 @@ CC = gcc SHARED_DIR = ../shared -CFLAGS = -Wall -O3 -fPIC -std=c11 +CFLAGS = -Wall -O3 -fPIC LIBS = ifeq ($(OS),Windows_NT) diff --git a/native/WDS/Makefile b/native/WDS/Makefile index b551470..a362705 100644 --- a/native/WDS/Makefile +++ b/native/WDS/Makefile @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = src SHARED_DIR = ../shared SOURCE = $(SRC_DIR)/main.c $(SRC_DIR)/models.c $(SHARED_DIR)/moeaframework.c -CFLAGS = -I$(SRC_DIR)/epanet2 -I$(SHARED_DIR) -Lbin -lm -lepanet2 -Wl,-R,\. -std=c11 +CFLAGS = -I$(SRC_DIR)/epanet2 -I$(SHARED_DIR) -Lbin -lm -lepanet2 -Wl,-R,\. LIBS = ifeq ($(OS),Windows_NT)