From 12081a9ff7983725bba8022e43eb69ceb95fa6df Mon Sep 17 00:00:00 2001 From: SpinDizzy Date: Fri, 3 Jul 2020 09:08:03 +0000 Subject: [PATCH] Update makefiles --- Makefiles/Makefile.UNIX | 2 +- Makefiles/Makefile.Win32 | 4 +++- Makefiles/Makefile.inc | 7 +++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefiles/Makefile.UNIX b/Makefiles/Makefile.UNIX index 6781dc2..dc78b5a 100644 --- a/Makefiles/Makefile.UNIX +++ b/Makefiles/Makefile.UNIX @@ -58,7 +58,7 @@ SDL2_LIBS = `sdl2-config --libs` # PLATFORM_CFLAGS = $(SDL2_CFLAGS) -PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ +PLATFORM_LDFLAGS = $(SDL2_LIBS) -lGL -lGLU -lz -lm -lstdc++ -lpthread -lSDL2_net ############################################################################### diff --git a/Makefiles/Makefile.Win32 b/Makefiles/Makefile.Win32 index 9ac7cc1..9e864e0 100644 --- a/Makefiles/Makefile.Win32 +++ b/Makefiles/Makefile.Win32 @@ -46,6 +46,8 @@ BITS = 64 # SDL2_INCLUDE_DIR = c:/mingw-w64/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/SDL2 SDL2_LIB_DIR = c:/mingw-w64/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/lib/gcc/x86_64-w64-mingw32/8.1.0/lib +#SDL2_INCLUDE_DIR = $(MINGW)/include/SDL2 +#SDL2_LIB_DIR = $(MINGW)/lib # # Toolchain @@ -76,7 +78,7 @@ endif # # SDL2 # -SDL2_LIBS = -lmingw32 -lSDL2main -lSDL2 -luser32 -lgdi32 -lwinmm -limm32 -lversion -lsetupapi +SDL2_LIBS = -lmingw32 -lSDL2main -lSDL2 -luser32 -lgdi32 -lwinmm -limm32 -lversion -lsetupapi -lsdl2_net -liphlpapi SDL2_CFLAGS = # diff --git a/Makefiles/Makefile.inc b/Makefiles/Makefile.inc index 4d48287..7df9817 100644 --- a/Makefiles/Makefile.inc +++ b/Makefiles/Makefile.inc @@ -153,9 +153,8 @@ SRC_FILES = \ ifeq ($(strip $(NET_BOARD)),1) SRC_FILES += \ - Src/Network/UDPReceive.cpp \ - Src/Network/UDPSend.cpp \ - Src/Network/WinSockWrap.cpp \ + Src/Network/TCPReceive.cpp \ + Src/Network/TCPSend.cpp \ Src/Network/NetBoard.cpp endif @@ -211,7 +210,7 @@ BUILD_CFLAGS = OPT = -O3 WARN = -Wall CSTD = -std=iso9899:2011 -CXXSTD = -std=c++11 +CXXSTD = -std=c++14 COMMON_CFLAGS = -c $(ARCH) $(OPT) $(WARN) $(addprefix -I,$(sort $(INCLUDE_DIRS))) -DGLEW_STATIC