Add Winsock dependency (#6)

* Update shared lib and require winsock libs on Windows * Remove break
MOEAFramework · May 7, 2024 · e006852 · e006852
1 parent d991c71
commit e006852
Show file tree

Hide file tree

Showing 6 changed files with 870 additions and 667 deletions.
diff --git a/native/LRGV/Makefile b/native/LRGV/Makefile
@@ -1,13 +1,15 @@
-CC=g++
-TARGET=lrgv
+CC = g++
+TARGET = lrgv
 SRC_DIR = src
 SHARED_DIR = ../shared
-C_FLAGS=-O3 -I$(SRC_DIR) -I$(SHARED_DIR)
+CFLAGS = -O3 -I$(SRC_DIR) -I$(SHARED_DIR)
+LIBS =
 
 ifeq ($(OS),Windows_NT)
- C_FLAGS += -static
+ CFLAGS += -static
+ LIBS += -lwsock32 -lWs2_32
 else
- C_FLAGS += -DLINUX
+ CFLAGS += -DLINUX
 endif
 
 SOURCE = $(SRC_DIR)/lrgv_main.cpp \
@@ -22,5 +24,5 @@ SOURCE = $(SRC_DIR)/lrgv_main.cpp \
  $(SRC_DIR)/rand.cpp
 
 all:
- $(CC) $(C_FLAGS) -o bin/$(TARGET) $(SOURCE)
+ $(CC) $(CFLAGS) -o bin/$(TARGET) $(SOURCE) $(LIBS)
 
diff --git a/native/LakeProblem/Makefile b/native/LakeProblem/Makefile
@@ -2,14 +2,16 @@ CC = g++
 SRC_DIR = src
 SHARED_DIR = ../shared
 TARGET = lake
-C_FLAGS = -O3 -Wno-unused-local-typedefs -I$(SRC_DIR) -I$(SHARED_DIR) -I$(SRC_DIR)/boost_1_56_0
+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 =
 
 ifeq ($(OS),Windows_NT)
- C_FLAGS += -static
+ CFLAGS += -static
+ LIBS += -lwsock32 -lWs2_32
 endif
 
 all:
  mkdir -p bin
- $(CC) $(C_FLAGS) -o bin/$(TARGET) $(SOURCE) 
+ $(CC) $(CFLAGS) -o bin/$(TARGET) $(SOURCE) $(LIBS)
 
diff --git a/native/Radar/Makefile b/native/Radar/Makefile
@@ -1,13 +1,15 @@
 CC = gcc
 SHARED_DIR = ../shared
-C_FLAGS = -Wall -O3 -fPIC
+CFLAGS = -Wall -O3 -fPIC
+LIBS =
 
 ifeq ($(OS),Windows_NT)
- LIB_NAME = moeaframework.dll
+ TARGET = moeaframework.dll
+ LIBS += -lwsock32 -lWs2_32
 else
- LIB_NAME = libmoeaframework.so
+ TARGET = libmoeaframework.so
 endif
 
 all:
- $(CC) $(C_FLAGS) -shared -o bin/$(LIB_NAME) $(SHARED_DIR)/moeaframework.c
+ $(CC) $(CFLAGS) -shared -o bin/$(TARGET) $(SHARED_DIR)/moeaframework.c $(LIBS)
 
diff --git a/native/WDS/Makefile b/native/WDS/Makefile
@@ -2,24 +2,26 @@ CC = gcc
 SRC_DIR = src
 SHARED_DIR = ../shared
 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,\.
+CFLAGS = -I$(SRC_DIR)/epanet2 -I$(SHARED_DIR) -Lbin -lm -lepanet2 -Wl,-R,\.
+LIBS =
 
 ifeq ($(OS),Windows_NT)
- C_FLAGS += -static
+ CFLAGS += -static
+ LIBS += -lwsock32 -lWs2_32
 endif
 
 all:
  $(MAKE) -C $(SRC_DIR)/epanet2
- $(CC) -o bin/TRN -DTRN $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/TLN -DTLN $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/BAK -DBAK $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/NYT -DNYT $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/BLA -DBLA $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/HAN -DHAN $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/GOY -DGOY $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/FOS -DFOS $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/PES -DPES $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/MOD -DMOD $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/BIN -DBIN $(SOURCE) $(C_FLAGS)
- $(CC) -o bin/EXN -DEXN $(SOURCE) $(C_FLAGS)
+ $(CC) -o bin/TRN -DTRN $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/TLN -DTLN $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/BAK -DBAK $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/NYT -DNYT $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/BLA -DBLA $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/HAN -DHAN $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/GOY -DGOY $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/FOS -DFOS $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/PES -DPES $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/MOD -DMOD $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/BIN -DBIN $(SOURCE) $(CFLAGS) $(LIBS)
+ $(CC) -o bin/EXN -DEXN $(SOURCE) $(CFLAGS) $(LIBS)