Update makefiles

MOEAFramework · Nov 30, 2023 · ea9cda7 · ea9cda7
1 parent 89efdb8
commit ea9cda7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/native/HBV/Makefile b/native/HBV/Makefile
@@ -33,8 +33,8 @@ 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-libgcc -static-libstdc++
-    C_FLAGS_DEBUG += -static-libgcc -static-libstdc++
+    C_FLAGS += -static
+    C_FLAGS_DEBUG += -static
 else
     C_FLAGS += -DLINUX
     C_FLAGS_DEBUG += -DLINUX

diff --git a/native/LRGV/Makefile b/native/LRGV/Makefile
@@ -5,7 +5,7 @@ SHARED_DIR = ../shared
 C_FLAGS=-O3 -I$(SRC_DIR) -I$(SHARED_DIR)
 
 ifeq ($(OS),Windows_NT)
-	C_FLAGS += -static-libgcc -static-libstdc++
+	C_FLAGS += -static
 else
     C_FLAGS += -DLINUX
 endif

diff --git a/native/LakeProblem/Makefile b/native/LakeProblem/Makefile
@@ -6,7 +6,7 @@ C_FLAGS = -O3 -Wno-unused-local-typedefs -I$(SRC_DIR) -I$(SHARED_DIR) -I$(SRC_DI
 SOURCE = $(SRC_DIR)/main-lake.cpp $(SHARED_DIR)/moeaframework.c
 
 ifeq ($(OS),Windows_NT)
-	C_FLAGS += -static-libgcc -static-libstdc++
+	C_FLAGS += -static
 endif
 
 all:

diff --git a/native/Radar/Makefile b/native/Radar/Makefile
@@ -2,11 +2,11 @@ CC = gcc
 SHARED_DIR = ../shared
 C_FLAGS = -Wall -O3 -fPIC
 
-PLATFORM := $(shell uname)
-ifeq  ($(PLATFORM),Linux)
-    EXT = so
+ifeq ($(OS),Windows_NT)
+	C_FLAGS += -static
+	EXT = dll
 else
-    EXT = dll
+	EXT = so
 endif
 
 all:

diff --git a/native/WDS/Makefile b/native/WDS/Makefile
@@ -5,7 +5,7 @@ SOURCE = $(SRC_DIR)/main.c $(SRC_DIR)/models.c $(SHARED_DIR)/moeaframework.c
 C_FLAGS = -I$(SRC_DIR)/epanet2 -I$(SHARED_DIR) -Lbin -lm -lepanet2 -Wl,-R,\.
 
 ifeq ($(OS),Windows_NT)
-	C_FLAGS += -static-libgcc -static-libstdc++
+	C_FLAGS += -static
 endif
 
 all: