Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-22 05:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update makefiles

Browse source
This commit is contained in:
SpinDizzy 2020-07-03 09:08:03 +00:00
parent f7d75b783d
commit 12081a9ff7
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefiles/Makefile.UNIX
View file

@ -58,7 +58,7 @@ SDL2_LIBS = `sdl2-config --libs`
# #
PLATFORM_CFLAGS = $(SDL2_CFLAGS) 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
############################################################################### ###############################################################################

4
Makefiles/Makefile.Win32
View file

@ -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_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_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 # Toolchain
@ -76,7 +78,7 @@ endif
# #
# SDL2 # 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 = SDL2_CFLAGS =
# #

7
Makefiles/Makefile.inc
View file

@ -153,9 +153,8 @@ SRC_FILES = \
ifeq ($(strip $(NET_BOARD)),1) ifeq ($(strip $(NET_BOARD)),1)
SRC_FILES += \ SRC_FILES += \
Src/Network/UDPReceive.cpp \ Src/Network/TCPReceive.cpp \
Src/Network/UDPSend.cpp \ Src/Network/TCPSend.cpp \
Src/Network/WinSockWrap.cpp \
Src/Network/NetBoard.cpp Src/Network/NetBoard.cpp
endif endif
@ -211,7 +210,7 @@ BUILD_CFLAGS =
OPT = -O3 OPT = -O3
WARN = -Wall WARN = -Wall
CSTD = -std=iso9899:2011 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 COMMON_CFLAGS = -c $(ARCH) $(OPT) $(WARN) $(addprefix -I,$(sort $(INCLUDE_DIRS))) -DGLEW_STATIC