diff --git a/src/Makefile b/src/Makefile
index ea4a61352..61e9905d6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,825 +1,826 @@
-
-# GNU Make makefile for SRB2
-#############################################################################
-# Copyright (C) 1998-2000 by DooM Legacy Team.
-# Copyright (C) 2003-2018 by Sonic Team Junior.
-#
-# This program is free software distributed under the
-# terms of the GNU General Public License, version 2.
-# See the 'LICENSE' file for more details.
-#
-# -DLINUX -> use for the GNU/Linux specific
-# -DHAVE_SDL -> use for the SDL interface
-#
-# Sets:
-# Compile the Mingw version with 'make MINGW=1'
-# Compile the SDL/Mingw version with 'make MINGW=1 SDL=1'
-# Compile the SDL/Linux version with 'make LINUX=1'
-# Compile the SDL/Solaris version with 'make SOLARIS=1'
-# Compile the SDL/FreeBSD version with 'gmake FREEBSD=1'
-# Compile the SDL/Cygwin version with 'make CYGWIN32=1'
-# Compile the SDL/other version try with 'make SDL=1'
-#
-# 'Targets':
-# clean
-# Remove all object files
-# cleandep
-# Remove depend.dep
-# dll
-# compile primary HW render DLL/SO
-# all_dll
-# compile all HW render and 3D sound DLLs for the set
-# opengl_dll
-# Pure Mingw only, compile OpenGL HW render DLL
-# minigl_dll
-# Pure Mingw only, compile MiniGL HW render DLL
-# ds3d_dll
-# Pure Mingw only, compile DirectX DirectSound HW sound DLL
-# fmod_dll
-# Pure Mingw only, compile FMOD HW sound DLL
-# openal_dll
-# Pure Mingw only, compile OpenAL HW sound DLL
-# fmod_so
-# Non-Mingw, compile FMOD HW sound SO
-# openal_so
-# Non-Mingw, compile OpenAL HW sound SO
-#
-#
-# Addon:
-# To Cross-Compile, CC=gcc-version make * PREFIX=
-# Compile with GCC 2.97 version, add 'GCC29=1'
-# Compile with GCC 4.0x version, add 'GCC40=1'
-# Compile with GCC 4.1x version, add 'GCC41=1'
-# Compile with GCC 4.2x version, add 'GCC42=1'
-# Compile with GCC 4.3x version, add 'GCC43=1'
-# Compile with GCC 4.4x version, add 'GCC44=1'
-# Compile with GCC 4.5x version, add 'GCC45=1'
-# Compile with GCC 4.6x version, add 'GCC46=1'
-# Compile a profile version, add 'PROFILEMODE=1'
-# Compile a debug version, add 'DEBUGMODE=1'
-# Compile with less warnings, add 'RELAXWARNINGS=1'
-# Generate compiler errors for most compiler warnings, add 'ERRORMODE=1'
-# Compile without 3D hardware support, add 'NOHW=1'
-# Compile with GDBstubs, add 'RDB=1'
-# Compile without PNG, add 'NOPNG=1'
-# Compile without zlib, add 'NOZLIB=1'
-#
-# Addon for SDL:
-# To Cross-Compile, add 'SDL_CONFIG=/usr/*/bin/sdl-config'
-# Compile without SDL_Mixer, add 'NOMIXER=1'
-# Compile without BSD API, add 'NONET=1'
-# Compile without IPX/SPX, add 'NOIPX=1'
-# Compile Mingw/SDL with S_DS3S, add 'DS3D=1'
-# Compile without libopenmpt, add 'NOOPENMPT=1'
-# Compile with S_FMOD3D, add 'FMOD=1' (WIP)
-# Compile with S_OPENAL, add 'OPENAL=1' (WIP)
-# To link with the whole SDL_Image lib to load Icons, add 'SDL_IMAGE=1' but it isn't not realy needed
-# To link with SDLMain to hide console or make on a console-less binary, add 'SDLMAIN=1'
-#
-#############################################################################
-
-ALL_SYSTEMS=\
- PANDORA\
- LINUX64\
- MINGW64\
- HAIKU\
- DUMMY\
- MINGW\
- UNIX\
- LINUX\
- SOLARIS\
- FREEBSD\
- MACOSX\
- SDL\
-
-# check for user specified system
-ifeq (,$(filter $(ALL_SYSTEMS),$(.VARIABLES)))
-ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
-
- $(info Detected a Windows system, compiling for 32-bit MinGW SDL2...)
-
- # go for a 32-bit sdl mingw exe by default
- MINGW=1
- SDL=1
- WINDOWSHELL=1
- HAVE_DISCORDRPC=0
-
-else # if you on the *nix
-
- system:=$(shell uname -s)
-
- ifeq ($(system),Linux)
- new_system=LINUX
- else
-
- $(error \
- Could not automatically detect your system,\
- try specifying a system manually)
-
- endif
-
- ifeq ($(shell getconf LONG_BIT),64)
- system+=64-bit
- new_system:=$(new_system)64
- endif
-
- $(info Detected $(system) ($(new_system))...)
- $(new_system)=1
-
-endif
-endif
-
-
-# SRB2 data files
-D_DIR?=../bin/Resources
-D_FILES=$(D_DIR)/srb2.srb \
- $(D_DIR)/patch.dta \
- #$(D_DIR)/music.dta \
- $(D_DIR)/gfx.kart \
- $(D_DIR)/textures.kart \
- $(D_DIR)/chars.kart \
- $(D_DIR)/maps.kart \
- $(D_DIR)/sounds.kart \
- $(D_DIR)/patch.kart \
- $(D_DIR)/music.kart \
-
-PKG_CONFIG?=pkg-config
-
-ifdef PANDORA
-LINUX=1
-endif
-
-ifdef LINUX64
-LINUX=1
-NONX86=1
-# LINUX64 does not imply X86_64=1; could mean ARM64 or Itanium
-endif
-
-ifdef MINGW64
-MINGW=1
-NONX86=1
-# MINGW64 should not necessarily imply X86_64=1, but we make that assumption elsewhere
-# Once that changes, remove this
-X86_64=1
-endif #ifdef MINGW64
-
-ifdef HAIKU
-SDL=1
-endif
-
-include Makefile.cfg
-
-ifdef DUMMY
-NOPNG=1
-NOZLIB=1
-NONET=1
-NOHW=1
-NOIPX=1
-EXENAME?=srb2dummy
-OBJS=$(OBJDIR)/i_video.o
-LIBS=-lm
-endif
-
-ifdef HAIKU
-NOIPX=1
-ifndef NONET
-LIBS=-lnetwork
-endif
-CFLAGS+=-DUNIXCOMMON
-PNG_CFLAGS?=
-PNG_LDFLAGS?=-lpng
-endif
-
-ifdef PANDORA
-NONX86=1
-NOHW=1
-endif
-
-ifndef NOOPENMPT
-HAVE_OPENMPT=1
-endif
-
-ifdef MINGW
-include win32/Makefile.cfg
-endif #ifdef MINGW
-
-ifdef UNIX
-UNIXCOMMON=1
-endif
-
-ifdef LINUX
-UNIXCOMMON=1
-ifndef NOGME
-HAVE_LIBGME=1
-endif
-endif
-
-ifdef SOLARIS
-UNIXCOMMON=1
-endif
-
-ifdef FREEBSD
-UNIXCOMMON=1
-endif
-
-ifdef MACOSX
-UNIXCOMMON=1
-endif
-
-ifdef SDL
- include sdl/Makefile.cfg
-endif #ifdef SDL
-
-ifdef DISTCC
- CC:=distcc $(CC)
-endif
-
-ifdef CCACHE
- CC:=ccache $(CC)
-endif
-
-MSGFMT?=msgfmt
-
-ifndef ECHO
- REMOVE:=@$(REMOVE)
- CC:=@$(CC)
- CXX:=@$(CXX)
- OBJCOPY:=@$(OBJCOPY)
- OBJDUMP:=@$(OBJDUMP)
- STRIP:=@$(STRIP)
- WINDRES:=@$(WINDRES)
- CP:=@$(CP)
- MKDIR:=@$(MKDIR)
- MKISOFS:=@$(MKISOFS)
- DD:=@$(DD)
- NDSTOOL:=@$(NDSTOOL)
- GZIP:=@$(GZIP)
- MSGFMT:=@$(MSGFMT)
- UPX:=@$(UPX)
- UPX_OPTS+=-q
-endif
-
-ifdef NONET
- OPTS+=-DNONET
- NOCURL=1
-else
-ifdef NO_IPV6
- OPTS+=-DNO_IPV6
-endif
-endif
-
-ifdef NOHW
- OPTS+=-DNOHW
-else
- #Hurdler: not really supported and not tested recently
- #OPTS+=-DUSE_PALETTED_TEXTURE
- OPTS+=-DHWRENDER
- OBJS+=$(OBJDIR)/hw_bsp.o $(OBJDIR)/hw_draw.o $(OBJDIR)/hw_light.o \
- $(OBJDIR)/hw_main.o $(OBJDIR)/hw_clip.o $(OBJDIR)/hw_md2.o $(OBJDIR)/hw_cache.o $(OBJDIR)/hw_trick.o \
- $(OBJDIR)/hw_md2load.o $(OBJDIR)/hw_md3load.o $(OBJDIR)/hw_model.o $(OBJDIR)/u_list.o
-endif
-
-OPTS += -DCOMPVERSION
-
-ifndef NONX86
-ifndef GCC29
- ARCHOPTS?=-msse3 -mfpmath=sse
-else
- ARCHOPTS?=-mpentium
-endif
-else
-ifdef X86_64
- ARCHOPTS?=-march=native -O3 -mfpmath=both -funroll-loops -finline-functions -funswitch-loops -fpeel-loops -fipa-pta -fprefetch-loop-arrays -ftree-loop-linear -ftree-vectorize -floop-strip-mine -fgraphite-identity -falign-functions -falign-loops -ftree-loop-distribution -floop-nest-optimize
-endif
-endif
-
-
-ifndef NOPNG
-OPTS+=-DHAVE_PNG
-
-ifdef PNG_PKGCONFIG
-PNG_CFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --cflags)
-PNG_LDFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --libs)
-else
-ifdef PREFIX
-PNG_CONFIG?=$(PREFIX)-libpng-config
-else
-PNG_CONFIG?=libpng-config
-endif
-
-ifdef PNG_STATIC
-PNG_CFLAGS?=$(shell $(PNG_CONFIG) --static --cflags)
-PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --static --ldflags)
-else
-PNG_CFLAGS?=$(shell $(PNG_CONFIG) --cflags)
-PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --ldflags)
-endif
-endif
-
-ifdef LINUX
-PNG_CFLAGS+=-D_LARGEFILE64_SOURCE
-endif
-
-LIBS+=$(PNG_LDFLAGS)
-CFLAGS+=$(PNG_CFLAGS)
-
-OBJS+=$(OBJDIR)/apng.o
-endif
-
-ifdef HAVE_LIBGME
-OPTS+=-DHAVE_LIBGME
-
-LIBGME_PKGCONFIG?=libgme
-LIBGME_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --cflags)
-LIBGME_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --libs)
-
-LIBS+=$(LIBGME_LDFLAGS)
-CFLAGS+=$(LIBGME_CFLAGS)
-endif
-
-ifdef HAVE_OPENMPT
-OPTS+=-DHAVE_OPENMPT
-
-LIBOPENMPT_PKGCONFIG?=libopenmpt
-LIBOPENMPT_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBOPENMPT_PKGCONFIG) --cflags)
-LIBOPENMPT_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBOPENMPT_PKGCONFIG) --libs)
-
-LIBS+=$(LIBOPENMPT_LDFLAGS)
-CFLAGS+=$(LIBOPENMPT_CFLAGS)
-endif
-
-ifndef NOZLIB
-OPTS+=-DHAVE_ZLIB
-ZLIB_PKGCONFIG?=zlib
-ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
-ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
-
-LIBS+=$(ZLIB_LDFLAGS)
-CFLAGS+=$(ZLIB_CFLAGS)
-else
-NOPNG=1
-endif
-
-ifndef NOCURL
-OPTS+=-DHAVE_CURL
-CURLCONFIG?=curl-config
-CURL_CFLAGS?=$(shell $(CURLCONFIG) --cflags)
-CURL_LDFLAGS?=$(shell $(CURLCONFIG) --libs)
-
-LIBS+=$(CURL_LDFLAGS)
-CFLAGS+=$(CURL_CFLAGS)
-endif
-
-ifdef STATIC
-LIBS:=-static $(LIBS)
-endif
-
-ifdef HAVE_MINIUPNPC
-ifdef NONET
-HAVE_MINIUPNPC=''
-else
-LIBS+=-lminiupnpc
-ifdef MINGW
-LIBS+=-lws2_32 -liphlpapi
-endif
-CFLAGS+=-DHAVE_MINIUPNPC
-endif
-endif
-
-ifdef HAVE_DISCORDRPC
-LIBS+=-ldiscord-rpc
-CFLAGS+=-DHAVE_DISCORDRPC -DUSE_STUN
-OBJS+=$(OBJDIR)/discord.o $(OBJDIR)/stun.o
-endif
-
-ifndef NO_LUA
- include blua/Makefile.cfg
-endif
-
-ifdef NOMD5
- OPTS+=-DNOMD5
-else
- OBJS:=$(OBJDIR)/md5.o $(OBJS)
-endif
-
-ifdef NOPOSTPROCESSING
- OPTS+=-DNOPOSTPROCESSING
-endif
-
- OPTS:=-fno-exceptions $(OPTS)
-
-ifdef MOBJCONSISTANCY
- OPTS+=-DMOBJCONSISTANCY
-endif
-
-ifdef PACKETDROP
- OPTS+=-DPACKETDROP
-endif
-
-ifdef DEBUGMODE
-
- # build with debugging information
- WINDRESFLAGS = -D_DEBUG
-ifdef GCC48
- CFLAGS+=-Og
-else
- CFLAGS+=-O0
-endif
- CFLAGS+= -Wall -DPARANOIA -DRANGECHECK -DPACKETDROP -DMOBJCONSISTANCY
-else
-
-
- # build a normal optimised version
- WINDRESFLAGS = -DNDEBUG
- CFLAGS+=-O3
-endif
- CFLAGS+=-g $(OPTS) $(ARCHOPTS) $(WINDRESFLAGS)
-
-ifdef PROFILEMODE
- # build with profiling information
- CFLAGS+=-pg
- LDFLAGS+=-pg
-endif
-
-ifdef ZDEBUG
- CPPFLAGS+=-DZDEBUG
-endif
-
-ifdef DUMPCONSISTENCY
- CPPFLAGS+=-DDUMPCONSISTENCY
-endif
-
-ifdef DEVELOP
- CPPFLAGS+=-DDEVELOP
-endif
-
-OPTS+=$(CPPFLAGS)
-
-# default EXENAME if all else fails
-EXENAME?=srb2
-DBGNAME?=$(EXENAME).debug
-
-# $(OBJDIR)/dstrings.o \
-
-# not too sophisticated dependency
-# SRB2kart kart.o on line 433 below
-OBJS:=$(i_main_o) \
- $(OBJDIR)/comptime.o \
- $(OBJDIR)/string.o \
- $(OBJDIR)/d_async.o \
- $(OBJDIR)/d_main.o \
- $(OBJDIR)/d_protocol.o \
- $(OBJDIR)/d_clisrv.o \
- $(OBJDIR)/d_net.o \
- $(OBJDIR)/d_netfil.o \
- $(OBJDIR)/d_netcmd.o \
- $(OBJDIR)/dehacked.o \
- $(OBJDIR)/z_zone.o \
- $(OBJDIR)/f_finale.o \
- $(OBJDIR)/f_wipe.o \
- $(OBJDIR)/g_game.o \
- $(OBJDIR)/g_input.o \
- $(OBJDIR)/am_map.o \
- $(OBJDIR)/command.o \
- $(OBJDIR)/console.o \
- $(OBJDIR)/hu_stuff.o \
- $(OBJDIR)/y_inter.o \
- $(OBJDIR)/st_stuff.o \
- $(OBJDIR)/k_kart.o \
- $(OBJDIR)/m_aatree.o \
- $(OBJDIR)/m_anigif.o \
- $(OBJDIR)/m_argv.o \
- $(OBJDIR)/m_bbox.o \
- $(OBJDIR)/m_cheat.o \
- $(OBJDIR)/m_cond.o \
- $(OBJDIR)/m_fixed.o \
- $(OBJDIR)/m_menu.o \
- $(OBJDIR)/m_misc.o \
- $(OBJDIR)/m_perfstats.o \
- $(OBJDIR)/m_random.o \
- $(OBJDIR)/m_queue.o \
- $(OBJDIR)/info.o \
- $(OBJDIR)/p_ceilng.o \
- $(OBJDIR)/p_enemy.o \
- $(OBJDIR)/p_floor.o \
- $(OBJDIR)/p_inter.o \
- $(OBJDIR)/p_lights.o \
- $(OBJDIR)/p_map.o \
- $(OBJDIR)/p_maputl.o \
- $(OBJDIR)/p_mobj.o \
- $(OBJDIR)/p_polyobj.o\
- $(OBJDIR)/p_saveg.o \
- $(OBJDIR)/p_setup.o \
- $(OBJDIR)/p_sight.o \
- $(OBJDIR)/p_spec.o \
- $(OBJDIR)/p_telept.o \
- $(OBJDIR)/p_tick.o \
- $(OBJDIR)/p_user.o \
- $(OBJDIR)/p_slopes.o \
- $(OBJDIR)/tables.o \
- $(OBJDIR)/r_bsp.o \
- $(OBJDIR)/r_data.o \
- $(OBJDIR)/r_draw.o \
- $(OBJDIR)/r_fps.o \
- $(OBJDIR)/r_main.o \
- $(OBJDIR)/r_plane.o \
- $(OBJDIR)/r_segs.o \
- $(OBJDIR)/r_sky.o \
- $(OBJDIR)/r_splats.o \
- $(OBJDIR)/r_patch.o \
- $(OBJDIR)/r_things.o \
- $(OBJDIR)/screen.o \
- $(OBJDIR)/v_video.o \
- $(OBJDIR)/s_sound.o \
- $(OBJDIR)/sounds.o \
- $(OBJDIR)/w_wad.o \
- $(OBJDIR)/filesrch.o \
- $(OBJDIR)/mserv.o \
- $(OBJDIR)/http-mserv.o\
- $(OBJDIR)/i_tcp.o \
- $(OBJDIR)/i_time.o \
- $(OBJDIR)/lzf.o \
- $(OBJDIR)/b_bot.o \
- $(i_net_o) \
- $(i_system_o) \
- $(i_sound_o) \
- $(OBJS)
-
-# List of languages to compile.
-# For reference, this is the command I use to build a srb2.pot file from the source code.
-# (The listed source files are the ones containing translated strings).
-# FILES=""; for file in `find ./ | grep "\.c" | grep -v svn`; do [ "`grep "M_GetText(" $file`" ] && FILES="$FILES $file"; done; xgettext -d srb2 -o locale/srb2.pot -kM_GetText -F --no-wrap $FILES
-ifdef GETTEXT
-POS:=$(BIN)/en.mo
-
-OPTS+=-DGETTEXT
-endif
-
-ifdef PANDORA
-all: pre-build $(BIN)/$(PNDNAME)
-endif
-
-ifdef MINGW
-ifndef SDL
-all: pre-build $(BIN)/$(EXENAME) dll
-endif
-endif
-
-ifdef SDL
-all: pre-build $(BIN)/$(EXENAME)
-endif
-
-ifdef DUMMY
-all: $(BIN)/$(EXENAME)
-endif
-
-cleandep:
- $(REMOVE) $(OBJDIR)/depend.dep
- $(REMOVE) comptime.h
-
-pre-build:
-ifdef WINDOWSHELL
- -$(.)..\comptime.bat .
-else
- -$(.)../comptime.sh .
-endif
-
-clean:
- $(REMOVE) *~ *.flc
- $(REMOVE) $(OBJDIR)/*.o
-
-ifdef MINGW
- $(REMOVE) $(OBJDIR)/*.res
-endif
-
-ifdef CYGWIN32
- $(REMOVE) $(OBJDIR)/*.res
-endif
-
-
-# executable
-
-$(BIN)/$(EXENAME): $(POS) $(OBJS)
- -$(MKDIR) $(BIN)
- @echo Linking $(EXENAME)...
- $(LD) $(LDFLAGS) $(OBJS) -o $(BIN)/$(EXENAME) $(LIBS)
-ifndef VALGRIND
-ifndef NOOBJDUMP
- @echo Dumping debugging info
- $(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(EXENAME) > $(BIN)/$(DBGNAME).txt
- -$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
-ifndef WINDOWSHELL
- -$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
-endif
-endif
-
-# mac os x lsdlsrb2 does not like objcopy
-ifndef MACOSX
- $(OBJCOPY) $(BIN)/$(EXENAME) $(BIN)/$(DBGNAME)
- $(OBJCOPY) --strip-debug $(BIN)/$(EXENAME)
- -$(OBJCOPY) --add-gnu-debuglink=$(BIN)/$(DBGNAME) $(BIN)/$(EXENAME)
-endif
-ifndef NOUPX
- -$(UPX) $(UPX_OPTS) $(BIN)/$(EXENAME)
-endif
-endif
- @echo Build is done, please look for $(EXENAME) in $(BIN), \(checking for post steps\)
-
-reobjdump:
- @echo Redumping debugging info
- $(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(DBGNAME) > $(BIN)/$(DBGNAME).txt
- -$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
-ifndef WINDOWSHELL
- -$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
-endif
-
-$(OBJDIR):
- -$(MKDIR) $(OBJDIR)
-
-ifndef SDL
-ifdef NOHW
-dll :
-else
-dll : opengl_dll
-endif
-ifdef MINGW
-all_dll: opengl_dll ds3d_dll fmod_dll openal_dll
-
-opengl_dll: $(BIN)/r_opengl.dll
-$(BIN)/r_opengl.dll: $(OBJDIR)/ogl_win.o $(OBJDIR)/r_opengl.o
- -$(MKDIR) $(BIN)
- @echo Linking R_OpenGL.dll...
- $(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -lgdi32 -static-libgcc
-ifndef NOUPX
- -$(UPX) $(UPX_OPTS) $@
-endif
-
-ds3d_dll: $(BIN)/s_ds3d.dll
-$(BIN)/s_ds3d.dll: $(OBJDIR)/s_ds3d.o
- @echo Linking S_DS3d.dll...
- $(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -ldsound -luuid
-
-fmod_dll: $(BIN)/s_fmod.dll
-$(BIN)/s_fmod.dll: $(OBJDIR)/s_fmod.o
- -$(MKDIR) $(BIN)
- @echo Linking S_FMOD.dll...
- $(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -lfmod
-
-openal_dll: $(BIN)/s_openal.dll
-$(BIN)/s_openal.dll: $(OBJDIR)/s_openal.o
- -$(MKDIR) $(BIN)
- @echo Linking S_OpenAL.dll...
- $(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -lopenal32
-else
-all_dll: fmod_so openal_so
-
-fmod_so: $(BIN)/s_fmod.so
-$(BIN)/s_fmod.so: $(OBJDIR)/s_fmod.o
- -$(MKDIR) $(BIN)
- @echo Linking S_FMOD.so...
- $(CC) --shared $^ -o $@ -g --nostartfiles -lm -lfmod
-
-openal_so: $(BIN)/s_openal.so
-$(BIN)/s_openal.so: $(OBJDIR)/s_openal.o
- -$(MKDIR) $(BIN)
- @echo Linking S_OpenAL.so...
- $(CC) --shared $^ -o $@ -g --nostartfiles -lm -lopenal
-endif
-
-else
-ifdef SDL
-ifdef MINGW
-$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
- doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
- command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \
- hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
- hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
- am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
- p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-else
-$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
- doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
- command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \
- hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
- hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
- am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
- p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
- $(CC) $(CFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
-endif
-endif
-
-endif
-
-#dependecy made by gcc itself !
-$(OBJS):
-ifndef DUMMY
--include $(OBJDIR)/depend.dep
-endif
-
-$(OBJDIR)/depend.dep:
- @echo "Creating dependency file, depend.dep"
- @echo > comptime.h
- -$(MKDIR) $(OBJDIR)
- $(CC) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
- $(CC) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
-ifndef NOHW
- $(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
-endif
-ifndef NO_LUA
- $(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
-endif
- @sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
- $(REMOVE) $(OBJDIR)/depend.ped
- @echo "Created dependency file, depend.dep"
-
-ifdef VALGRIND
-$(OBJDIR)/z_zone.o: z_zone.c
- $(CC) $(CFLAGS) $(WFLAGS) -DHAVE_VALGRIND $(VALGRIND_CFLAGS) -c $< -o $@
-endif
-
-$(OBJDIR)/comptime.o: comptime.c pre-build
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(BIN)/%.mo: locale/%.po
- -$(MKDIR) $(BIN)
- $(MSGFMT) -f -o $@ $<
-
-$(OBJDIR)/%.o: %.c
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: $(INTERFACE)/%.c
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-ifdef MACOSX
-$(OBJDIR)/%.o: sdl/macosx/%.c
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-endif
-
-$(OBJDIR)/%.o: hardware/%.c
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: blua/%.c
- $(CC) $(CFLAGS) $(LUA_CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: %.s
- $(CC) $(OPTS) -x assembler-with-cpp -c $< -o $@
-
-$(OBJDIR)/SRB2.res: win32/Srb2win.rc win32/afxres.h win32/resource.h
- $(WINDRES) -i $< -O rc $(WINDRESFLAGS) --include-dir=win32 -o $@ -O coff
-
-ifdef SDL
-
-ifdef MINGW
-$(OBJDIR)/win_dbg.o: win32/win_dbg.c
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-endif
-
-ifdef STATICHS
-$(OBJDIR)/s_openal.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/s_fmod.o: hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-ifdef MINGW
-$(OBJDIR)/s_ds3d.o: hardware/s_ds3d/s_ds3d.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-endif
-else
-
-$(OBJDIR)/s_fmod.o: hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
- $(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_fmod.o -DHW3SOUND -DUNIXCOMMON -shared -nostartfiles -c hardware/s_fmod/s_fmod.c
-
-$(OBJDIR)/s_openal.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
- $(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_openal.o -DHW3SOUND -DUNIXCOMMON -shared -nostartfiles -c hardware/s_openal/s_openal.c
-endif
-
-ifdef FILTERS
-$(OBJDIR)/%.o: $(INTERFACE)/filter/%.c
- @echo $< needs deps
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/filters.o: $(INTERFACE)/filter/filters.c $(INTERFACE)/filter/filters.c \
- $(INTERFACE)/filter/filters.h
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/hq2x.o: $(INTERFACE)/filter/hq2x.c $(INTERFACE)/filter/hq2x.c \
- $(INTERFACE)/filter/filters.h
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/lq2x.o: $(INTERFACE)/filter/lq2x.c $(INTERFACE)/filter/lq2x.c \
- $(INTERFACE)/filter/filters.h $(INTERFACE)/filter/interp.h \
- $(INTERFACE)/filter/hq2x.h $(INTERFACE)/filter/lq2x.h
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-endif
-endif
-
-#############################################################
-#
-#############################################################
+
+# GNU Make makefile for SRB2
+#############################################################################
+# Copyright (C) 1998-2000 by DooM Legacy Team.
+# Copyright (C) 2003-2018 by Sonic Team Junior.
+#
+# This program is free software distributed under the
+# terms of the GNU General Public License, version 2.
+# See the 'LICENSE' file for more details.
+#
+# -DLINUX -> use for the GNU/Linux specific
+# -DHAVE_SDL -> use for the SDL interface
+#
+# Sets:
+# Compile the Mingw version with 'make MINGW=1'
+# Compile the SDL/Mingw version with 'make MINGW=1 SDL=1'
+# Compile the SDL/Linux version with 'make LINUX=1'
+# Compile the SDL/Solaris version with 'make SOLARIS=1'
+# Compile the SDL/FreeBSD version with 'gmake FREEBSD=1'
+# Compile the SDL/Cygwin version with 'make CYGWIN32=1'
+# Compile the SDL/other version try with 'make SDL=1'
+#
+# 'Targets':
+# clean
+# Remove all object files
+# cleandep
+# Remove depend.dep
+# dll
+# compile primary HW render DLL/SO
+# all_dll
+# compile all HW render and 3D sound DLLs for the set
+# opengl_dll
+# Pure Mingw only, compile OpenGL HW render DLL
+# minigl_dll
+# Pure Mingw only, compile MiniGL HW render DLL
+# ds3d_dll
+# Pure Mingw only, compile DirectX DirectSound HW sound DLL
+# fmod_dll
+# Pure Mingw only, compile FMOD HW sound DLL
+# openal_dll
+# Pure Mingw only, compile OpenAL HW sound DLL
+# fmod_so
+# Non-Mingw, compile FMOD HW sound SO
+# openal_so
+# Non-Mingw, compile OpenAL HW sound SO
+#
+#
+# Addon:
+# To Cross-Compile, CC=gcc-version make * PREFIX=
+# Compile with GCC 2.97 version, add 'GCC29=1'
+# Compile with GCC 4.0x version, add 'GCC40=1'
+# Compile with GCC 4.1x version, add 'GCC41=1'
+# Compile with GCC 4.2x version, add 'GCC42=1'
+# Compile with GCC 4.3x version, add 'GCC43=1'
+# Compile with GCC 4.4x version, add 'GCC44=1'
+# Compile with GCC 4.5x version, add 'GCC45=1'
+# Compile with GCC 4.6x version, add 'GCC46=1'
+# Compile a profile version, add 'PROFILEMODE=1'
+# Compile a debug version, add 'DEBUGMODE=1'
+# Compile with less warnings, add 'RELAXWARNINGS=1'
+# Generate compiler errors for most compiler warnings, add 'ERRORMODE=1'
+# Compile without 3D hardware support, add 'NOHW=1'
+# Compile with GDBstubs, add 'RDB=1'
+# Compile without PNG, add 'NOPNG=1'
+# Compile without zlib, add 'NOZLIB=1'
+#
+# Addon for SDL:
+# To Cross-Compile, add 'SDL_CONFIG=/usr/*/bin/sdl-config'
+# Compile without SDL_Mixer, add 'NOMIXER=1'
+# Compile without BSD API, add 'NONET=1'
+# Compile without IPX/SPX, add 'NOIPX=1'
+# Compile Mingw/SDL with S_DS3S, add 'DS3D=1'
+# Compile without libopenmpt, add 'NOOPENMPT=1'
+# Compile with S_FMOD3D, add 'FMOD=1' (WIP)
+# Compile with S_OPENAL, add 'OPENAL=1' (WIP)
+# To link with the whole SDL_Image lib to load Icons, add 'SDL_IMAGE=1' but it isn't not realy needed
+# To link with SDLMain to hide console or make on a console-less binary, add 'SDLMAIN=1'
+#
+#############################################################################
+
+ALL_SYSTEMS=\
+ PANDORA\
+ LINUX64\
+ MINGW64\
+ HAIKU\
+ DUMMY\
+ MINGW\
+ UNIX\
+ LINUX\
+ SOLARIS\
+ FREEBSD\
+ MACOSX\
+ SDL\
+
+# check for user specified system
+ifeq (,$(filter $(ALL_SYSTEMS),$(.VARIABLES)))
+ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
+
+ $(info Detected a Windows system, compiling for 32-bit MinGW SDL2...)
+
+ # go for a 32-bit sdl mingw exe by default
+ MINGW=1
+ SDL=1
+ WINDOWSHELL=1
+ HAVE_DISCORDRPC=0
+ NOUPX=1
+
+else # if you on the *nix
+
+ system:=$(shell uname -s)
+
+ ifeq ($(system),Linux)
+ new_system=LINUX
+ else
+
+ $(error \
+ Could not automatically detect your system,\
+ try specifying a system manually)
+
+ endif
+
+ ifeq ($(shell getconf LONG_BIT),64)
+ system+=64-bit
+ new_system:=$(new_system)64
+ endif
+
+ $(info Detected $(system) ($(new_system))...)
+ $(new_system)=1
+
+endif
+endif
+
+
+# SRB2 data files
+D_DIR?=../bin/Resources
+D_FILES=$(D_DIR)/srb2.srb \
+ $(D_DIR)/patch.dta \
+ #$(D_DIR)/music.dta \
+ $(D_DIR)/gfx.kart \
+ $(D_DIR)/textures.kart \
+ $(D_DIR)/chars.kart \
+ $(D_DIR)/maps.kart \
+ $(D_DIR)/sounds.kart \
+ $(D_DIR)/patch.kart \
+ $(D_DIR)/music.kart \
+
+PKG_CONFIG?=pkg-config
+
+ifdef PANDORA
+LINUX=1
+endif
+
+ifdef LINUX64
+LINUX=1
+NONX86=1
+# LINUX64 does not imply X86_64=1; could mean ARM64 or Itanium
+endif
+
+ifdef MINGW64
+MINGW=1
+NONX86=1
+# MINGW64 should not necessarily imply X86_64=1, but we make that assumption elsewhere
+# Once that changes, remove this
+X86_64=1
+endif #ifdef MINGW64
+
+ifdef HAIKU
+SDL=1
+endif
+
+include Makefile.cfg
+
+ifdef DUMMY
+NOPNG=1
+NOZLIB=1
+NONET=1
+NOHW=1
+NOIPX=1
+EXENAME?=srb2dummy
+OBJS=$(OBJDIR)/i_video.o
+LIBS=-lm
+endif
+
+ifdef HAIKU
+NOIPX=1
+ifndef NONET
+LIBS=-lnetwork
+endif
+CFLAGS+=-DUNIXCOMMON
+PNG_CFLAGS?=
+PNG_LDFLAGS?=-lpng
+endif
+
+ifdef PANDORA
+NONX86=1
+NOHW=1
+endif
+
+ifndef NOOPENMPT
+HAVE_OPENMPT=1
+endif
+
+ifdef MINGW
+include win32/Makefile.cfg
+endif #ifdef MINGW
+
+ifdef UNIX
+UNIXCOMMON=1
+endif
+
+ifdef LINUX
+UNIXCOMMON=1
+ifndef NOGME
+HAVE_LIBGME=1
+endif
+endif
+
+ifdef SOLARIS
+UNIXCOMMON=1
+endif
+
+ifdef FREEBSD
+UNIXCOMMON=1
+endif
+
+ifdef MACOSX
+UNIXCOMMON=1
+endif
+
+ifdef SDL
+ include sdl/Makefile.cfg
+endif #ifdef SDL
+
+ifdef DISTCC
+ CC:=distcc $(CC)
+endif
+
+ifdef CCACHE
+ CC:=ccache $(CC)
+endif
+
+MSGFMT?=msgfmt
+
+ifndef ECHO
+ REMOVE:=@$(REMOVE)
+ CC:=@$(CC)
+ CXX:=@$(CXX)
+ OBJCOPY:=@$(OBJCOPY)
+ OBJDUMP:=@$(OBJDUMP)
+ STRIP:=@$(STRIP)
+ WINDRES:=@$(WINDRES)
+ CP:=@$(CP)
+ MKDIR:=@$(MKDIR)
+ MKISOFS:=@$(MKISOFS)
+ DD:=@$(DD)
+ NDSTOOL:=@$(NDSTOOL)
+ GZIP:=@$(GZIP)
+ MSGFMT:=@$(MSGFMT)
+ UPX:=@$(UPX)
+ UPX_OPTS+=-q
+endif
+
+ifdef NONET
+ OPTS+=-DNONET
+ NOCURL=1
+else
+ifdef NO_IPV6
+ OPTS+=-DNO_IPV6
+endif
+endif
+
+ifdef NOHW
+ OPTS+=-DNOHW
+else
+ #Hurdler: not really supported and not tested recently
+ #OPTS+=-DUSE_PALETTED_TEXTURE
+ OPTS+=-DHWRENDER
+ OBJS+=$(OBJDIR)/hw_bsp.o $(OBJDIR)/hw_draw.o $(OBJDIR)/hw_light.o \
+ $(OBJDIR)/hw_main.o $(OBJDIR)/hw_clip.o $(OBJDIR)/hw_md2.o $(OBJDIR)/hw_cache.o $(OBJDIR)/hw_trick.o \
+ $(OBJDIR)/hw_md2load.o $(OBJDIR)/hw_md3load.o $(OBJDIR)/hw_model.o $(OBJDIR)/u_list.o
+endif
+
+OPTS += -DCOMPVERSION
+
+ifndef NONX86
+ifndef GCC29
+ ARCHOPTS?=-msse3 -mfpmath=sse
+else
+ ARCHOPTS?=-mpentium
+endif
+else
+ifdef X86_64
+ ARCHOPTS?=-march=native -O3 -mfpmath=both -funroll-loops -finline-functions -funswitch-loops -fpeel-loops -fipa-pta -fprefetch-loop-arrays -ftree-loop-linear -ftree-vectorize -floop-strip-mine -fgraphite-identity -falign-functions -falign-loops -ftree-loop-distribution -floop-nest-optimize
+endif
+endif
+
+
+ifndef NOPNG
+OPTS+=-DHAVE_PNG
+
+ifdef PNG_PKGCONFIG
+PNG_CFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --cflags)
+PNG_LDFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --libs)
+else
+ifdef PREFIX
+PNG_CONFIG?=$(PREFIX)-libpng-config
+else
+PNG_CONFIG?=libpng-config
+endif
+
+ifdef PNG_STATIC
+PNG_CFLAGS?=$(shell $(PNG_CONFIG) --static --cflags)
+PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --static --ldflags)
+else
+PNG_CFLAGS?=$(shell $(PNG_CONFIG) --cflags)
+PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --ldflags)
+endif
+endif
+
+ifdef LINUX
+PNG_CFLAGS+=-D_LARGEFILE64_SOURCE
+endif
+
+LIBS+=$(PNG_LDFLAGS)
+CFLAGS+=$(PNG_CFLAGS)
+
+OBJS+=$(OBJDIR)/apng.o
+endif
+
+ifdef HAVE_LIBGME
+OPTS+=-DHAVE_LIBGME
+
+LIBGME_PKGCONFIG?=libgme
+LIBGME_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --cflags)
+LIBGME_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --libs)
+
+LIBS+=$(LIBGME_LDFLAGS)
+CFLAGS+=$(LIBGME_CFLAGS)
+endif
+
+ifdef HAVE_OPENMPT
+OPTS+=-DHAVE_OPENMPT
+
+LIBOPENMPT_PKGCONFIG?=libopenmpt
+LIBOPENMPT_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBOPENMPT_PKGCONFIG) --cflags)
+LIBOPENMPT_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBOPENMPT_PKGCONFIG) --libs)
+
+LIBS+=$(LIBOPENMPT_LDFLAGS)
+CFLAGS+=$(LIBOPENMPT_CFLAGS)
+endif
+
+ifndef NOZLIB
+OPTS+=-DHAVE_ZLIB
+ZLIB_PKGCONFIG?=zlib
+ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
+ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
+
+LIBS+=$(ZLIB_LDFLAGS)
+CFLAGS+=$(ZLIB_CFLAGS)
+else
+NOPNG=1
+endif
+
+ifndef NOCURL
+OPTS+=-DHAVE_CURL
+CURLCONFIG?=curl-config
+CURL_CFLAGS?=$(shell $(CURLCONFIG) --cflags)
+CURL_LDFLAGS?=$(shell $(CURLCONFIG) --libs)
+
+LIBS+=$(CURL_LDFLAGS)
+CFLAGS+=$(CURL_CFLAGS)
+endif
+
+ifdef STATIC
+LIBS:=-static $(LIBS)
+endif
+
+ifdef HAVE_MINIUPNPC
+ifdef NONET
+HAVE_MINIUPNPC=''
+else
+LIBS+=-lminiupnpc
+ifdef MINGW
+LIBS+=-lws2_32 -liphlpapi
+endif
+CFLAGS+=-DHAVE_MINIUPNPC
+endif
+endif
+
+ifdef HAVE_DISCORDRPC
+LIBS+=-ldiscord-rpc
+CFLAGS+=-DHAVE_DISCORDRPC -DUSE_STUN
+OBJS+=$(OBJDIR)/discord.o $(OBJDIR)/stun.o
+endif
+
+ifndef NO_LUA
+ include blua/Makefile.cfg
+endif
+
+ifdef NOMD5
+ OPTS+=-DNOMD5
+else
+ OBJS:=$(OBJDIR)/md5.o $(OBJS)
+endif
+
+ifdef NOPOSTPROCESSING
+ OPTS+=-DNOPOSTPROCESSING
+endif
+
+ OPTS:=-fno-exceptions $(OPTS)
+
+ifdef MOBJCONSISTANCY
+ OPTS+=-DMOBJCONSISTANCY
+endif
+
+ifdef PACKETDROP
+ OPTS+=-DPACKETDROP
+endif
+
+ifdef DEBUGMODE
+
+ # build with debugging information
+ WINDRESFLAGS = -D_DEBUG
+ifdef GCC48
+ CFLAGS+=-Og
+else
+ CFLAGS+=-O0
+endif
+ CFLAGS+= -Wall -DPARANOIA -DRANGECHECK -DPACKETDROP -DMOBJCONSISTANCY
+else
+
+
+ # build a normal optimised version
+ WINDRESFLAGS = -DNDEBUG
+ CFLAGS+=-O3
+endif
+ CFLAGS+=-g $(OPTS) $(ARCHOPTS) $(WINDRESFLAGS)
+
+ifdef PROFILEMODE
+ # build with profiling information
+ CFLAGS+=-pg
+ LDFLAGS+=-pg
+endif
+
+ifdef ZDEBUG
+ CPPFLAGS+=-DZDEBUG
+endif
+
+ifdef DUMPCONSISTENCY
+ CPPFLAGS+=-DDUMPCONSISTENCY
+endif
+
+ifdef DEVELOP
+ CPPFLAGS+=-DDEVELOP
+endif
+
+OPTS+=$(CPPFLAGS)
+
+# default EXENAME if all else fails
+EXENAME?=srb2
+DBGNAME?=$(EXENAME).debug
+
+# $(OBJDIR)/dstrings.o \
+
+# not too sophisticated dependency
+# SRB2kart kart.o on line 433 below
+OBJS:=$(i_main_o) \
+ $(OBJDIR)/comptime.o \
+ $(OBJDIR)/string.o \
+ $(OBJDIR)/d_async.o \
+ $(OBJDIR)/d_main.o \
+ $(OBJDIR)/d_protocol.o \
+ $(OBJDIR)/d_clisrv.o \
+ $(OBJDIR)/d_net.o \
+ $(OBJDIR)/d_netfil.o \
+ $(OBJDIR)/d_netcmd.o \
+ $(OBJDIR)/dehacked.o \
+ $(OBJDIR)/z_zone.o \
+ $(OBJDIR)/f_finale.o \
+ $(OBJDIR)/f_wipe.o \
+ $(OBJDIR)/g_game.o \
+ $(OBJDIR)/g_input.o \
+ $(OBJDIR)/am_map.o \
+ $(OBJDIR)/command.o \
+ $(OBJDIR)/console.o \
+ $(OBJDIR)/hu_stuff.o \
+ $(OBJDIR)/y_inter.o \
+ $(OBJDIR)/st_stuff.o \
+ $(OBJDIR)/k_kart.o \
+ $(OBJDIR)/m_aatree.o \
+ $(OBJDIR)/m_anigif.o \
+ $(OBJDIR)/m_argv.o \
+ $(OBJDIR)/m_bbox.o \
+ $(OBJDIR)/m_cheat.o \
+ $(OBJDIR)/m_cond.o \
+ $(OBJDIR)/m_fixed.o \
+ $(OBJDIR)/m_menu.o \
+ $(OBJDIR)/m_misc.o \
+ $(OBJDIR)/m_perfstats.o \
+ $(OBJDIR)/m_random.o \
+ $(OBJDIR)/m_queue.o \
+ $(OBJDIR)/info.o \
+ $(OBJDIR)/p_ceilng.o \
+ $(OBJDIR)/p_enemy.o \
+ $(OBJDIR)/p_floor.o \
+ $(OBJDIR)/p_inter.o \
+ $(OBJDIR)/p_lights.o \
+ $(OBJDIR)/p_map.o \
+ $(OBJDIR)/p_maputl.o \
+ $(OBJDIR)/p_mobj.o \
+ $(OBJDIR)/p_polyobj.o\
+ $(OBJDIR)/p_saveg.o \
+ $(OBJDIR)/p_setup.o \
+ $(OBJDIR)/p_sight.o \
+ $(OBJDIR)/p_spec.o \
+ $(OBJDIR)/p_telept.o \
+ $(OBJDIR)/p_tick.o \
+ $(OBJDIR)/p_user.o \
+ $(OBJDIR)/p_slopes.o \
+ $(OBJDIR)/tables.o \
+ $(OBJDIR)/r_bsp.o \
+ $(OBJDIR)/r_data.o \
+ $(OBJDIR)/r_draw.o \
+ $(OBJDIR)/r_fps.o \
+ $(OBJDIR)/r_main.o \
+ $(OBJDIR)/r_plane.o \
+ $(OBJDIR)/r_segs.o \
+ $(OBJDIR)/r_sky.o \
+ $(OBJDIR)/r_splats.o \
+ $(OBJDIR)/r_patch.o \
+ $(OBJDIR)/r_things.o \
+ $(OBJDIR)/screen.o \
+ $(OBJDIR)/v_video.o \
+ $(OBJDIR)/s_sound.o \
+ $(OBJDIR)/sounds.o \
+ $(OBJDIR)/w_wad.o \
+ $(OBJDIR)/filesrch.o \
+ $(OBJDIR)/mserv.o \
+ $(OBJDIR)/http-mserv.o\
+ $(OBJDIR)/i_tcp.o \
+ $(OBJDIR)/i_time.o \
+ $(OBJDIR)/lzf.o \
+ $(OBJDIR)/b_bot.o \
+ $(i_net_o) \
+ $(i_system_o) \
+ $(i_sound_o) \
+ $(OBJS)
+
+# List of languages to compile.
+# For reference, this is the command I use to build a srb2.pot file from the source code.
+# (The listed source files are the ones containing translated strings).
+# FILES=""; for file in `find ./ | grep "\.c" | grep -v svn`; do [ "`grep "M_GetText(" $file`" ] && FILES="$FILES $file"; done; xgettext -d srb2 -o locale/srb2.pot -kM_GetText -F --no-wrap $FILES
+ifdef GETTEXT
+POS:=$(BIN)/en.mo
+
+OPTS+=-DGETTEXT
+endif
+
+ifdef PANDORA
+all: pre-build $(BIN)/$(PNDNAME)
+endif
+
+ifdef MINGW
+ifndef SDL
+all: pre-build $(BIN)/$(EXENAME) dll
+endif
+endif
+
+ifdef SDL
+all: pre-build $(BIN)/$(EXENAME)
+endif
+
+ifdef DUMMY
+all: $(BIN)/$(EXENAME)
+endif
+
+cleandep:
+ $(REMOVE) $(OBJDIR)/depend.dep
+ $(REMOVE) comptime.h
+
+pre-build:
+ifdef WINDOWSHELL
+ -$(.)..\comptime.bat .
+else
+ -$(.)../comptime.sh .
+endif
+
+clean:
+ $(REMOVE) *~ *.flc
+ $(REMOVE) $(OBJDIR)/*.o
+
+ifdef MINGW
+ $(REMOVE) $(OBJDIR)/*.res
+endif
+
+ifdef CYGWIN32
+ $(REMOVE) $(OBJDIR)/*.res
+endif
+
+
+# executable
+
+$(BIN)/$(EXENAME): $(POS) $(OBJS)
+ -$(MKDIR) $(BIN)
+ @echo Linking $(EXENAME)...
+ $(LD) $(LDFLAGS) $(OBJS) -o $(BIN)/$(EXENAME) $(LIBS)
+ifndef VALGRIND
+ifndef NOOBJDUMP
+ @echo Dumping debugging info
+ $(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(EXENAME) > $(BIN)/$(DBGNAME).txt
+ -$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
+ifndef WINDOWSHELL
+ -$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
+endif
+endif
+
+# mac os x lsdlsrb2 does not like objcopy
+ifndef MACOSX
+ $(OBJCOPY) $(BIN)/$(EXENAME) $(BIN)/$(DBGNAME)
+ $(OBJCOPY) --strip-debug $(BIN)/$(EXENAME)
+ -$(OBJCOPY) --add-gnu-debuglink=$(BIN)/$(DBGNAME) $(BIN)/$(EXENAME)
+endif
+ifndef NOUPX
+ -$(UPX) $(UPX_OPTS) $(BIN)/$(EXENAME)
+endif
+endif
+ @echo Build is done, please look for $(EXENAME) in $(BIN), \(checking for post steps\)
+
+reobjdump:
+ @echo Redumping debugging info
+ $(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(DBGNAME) > $(BIN)/$(DBGNAME).txt
+ -$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
+ifndef WINDOWSHELL
+ -$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
+endif
+
+$(OBJDIR):
+ -$(MKDIR) $(OBJDIR)
+
+ifndef SDL
+ifdef NOHW
+dll :
+else
+dll : opengl_dll
+endif
+ifdef MINGW
+all_dll: opengl_dll ds3d_dll fmod_dll openal_dll
+
+opengl_dll: $(BIN)/r_opengl.dll
+$(BIN)/r_opengl.dll: $(OBJDIR)/ogl_win.o $(OBJDIR)/r_opengl.o
+ -$(MKDIR) $(BIN)
+ @echo Linking R_OpenGL.dll...
+ $(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -lgdi32 -static-libgcc
+ifndef NOUPX
+ -$(UPX) $(UPX_OPTS) $@
+endif
+
+ds3d_dll: $(BIN)/s_ds3d.dll
+$(BIN)/s_ds3d.dll: $(OBJDIR)/s_ds3d.o
+ @echo Linking S_DS3d.dll...
+ $(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -ldsound -luuid
+
+fmod_dll: $(BIN)/s_fmod.dll
+$(BIN)/s_fmod.dll: $(OBJDIR)/s_fmod.o
+ -$(MKDIR) $(BIN)
+ @echo Linking S_FMOD.dll...
+ $(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -lfmod
+
+openal_dll: $(BIN)/s_openal.dll
+$(BIN)/s_openal.dll: $(OBJDIR)/s_openal.o
+ -$(MKDIR) $(BIN)
+ @echo Linking S_OpenAL.dll...
+ $(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -lopenal32
+else
+all_dll: fmod_so openal_so
+
+fmod_so: $(BIN)/s_fmod.so
+$(BIN)/s_fmod.so: $(OBJDIR)/s_fmod.o
+ -$(MKDIR) $(BIN)
+ @echo Linking S_FMOD.so...
+ $(CC) --shared $^ -o $@ -g --nostartfiles -lm -lfmod
+
+openal_so: $(BIN)/s_openal.so
+$(BIN)/s_openal.so: $(OBJDIR)/s_openal.o
+ -$(MKDIR) $(BIN)
+ @echo Linking S_OpenAL.so...
+ $(CC) --shared $^ -o $@ -g --nostartfiles -lm -lopenal
+endif
+
+else
+ifdef SDL
+ifdef MINGW
+$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
+ doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
+ command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \
+ hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
+ hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
+ am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
+ p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+else
+$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
+ doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
+ command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \
+ hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
+ hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
+ am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
+ p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
+ $(CC) $(CFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
+endif
+endif
+
+endif
+
+#dependecy made by gcc itself !
+$(OBJS):
+ifndef DUMMY
+-include $(OBJDIR)/depend.dep
+endif
+
+$(OBJDIR)/depend.dep:
+ @echo "Creating dependency file, depend.dep"
+ @echo > comptime.h
+ -$(MKDIR) $(OBJDIR)
+ $(CC) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
+ $(CC) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
+ifndef NOHW
+ $(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
+endif
+ifndef NO_LUA
+ $(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
+endif
+ @sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
+ $(REMOVE) $(OBJDIR)/depend.ped
+ @echo "Created dependency file, depend.dep"
+
+ifdef VALGRIND
+$(OBJDIR)/z_zone.o: z_zone.c
+ $(CC) $(CFLAGS) $(WFLAGS) -DHAVE_VALGRIND $(VALGRIND_CFLAGS) -c $< -o $@
+endif
+
+$(OBJDIR)/comptime.o: comptime.c pre-build
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+
+$(BIN)/%.mo: locale/%.po
+ -$(MKDIR) $(BIN)
+ $(MSGFMT) -f -o $@ $<
+
+$(OBJDIR)/%.o: %.c
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+
+$(OBJDIR)/%.o: $(INTERFACE)/%.c
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+
+ifdef MACOSX
+$(OBJDIR)/%.o: sdl/macosx/%.c
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+endif
+
+$(OBJDIR)/%.o: hardware/%.c
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+
+$(OBJDIR)/%.o: blua/%.c
+ $(CC) $(CFLAGS) $(LUA_CFLAGS) $(WFLAGS) -c $< -o $@
+
+$(OBJDIR)/%.o: %.s
+ $(CC) $(OPTS) -x assembler-with-cpp -c $< -o $@
+
+$(OBJDIR)/SRB2.res: win32/Srb2win.rc win32/afxres.h win32/resource.h
+ $(WINDRES) -i $< -O rc $(WINDRESFLAGS) --include-dir=win32 -o $@ -O coff
+
+ifdef SDL
+
+ifdef MINGW
+$(OBJDIR)/win_dbg.o: win32/win_dbg.c
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+endif
+
+ifdef STATICHS
+$(OBJDIR)/s_openal.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \
+ hardware/hw_dll.h
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+
+$(OBJDIR)/s_fmod.o: hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h \
+ hardware/hw_dll.h
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+
+ifdef MINGW
+$(OBJDIR)/s_ds3d.o: hardware/s_ds3d/s_ds3d.c hardware/hw3dsdrv.h \
+ hardware/hw_dll.h
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+endif
+else
+
+$(OBJDIR)/s_fmod.o: hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h \
+ hardware/hw_dll.h
+ $(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_fmod.o -DHW3SOUND -DUNIXCOMMON -shared -nostartfiles -c hardware/s_fmod/s_fmod.c
+
+$(OBJDIR)/s_openal.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \
+ hardware/hw_dll.h
+ $(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_openal.o -DHW3SOUND -DUNIXCOMMON -shared -nostartfiles -c hardware/s_openal/s_openal.c
+endif
+
+ifdef FILTERS
+$(OBJDIR)/%.o: $(INTERFACE)/filter/%.c
+ @echo $< needs deps
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+
+$(OBJDIR)/filters.o: $(INTERFACE)/filter/filters.c $(INTERFACE)/filter/filters.c \
+ $(INTERFACE)/filter/filters.h
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+
+$(OBJDIR)/hq2x.o: $(INTERFACE)/filter/hq2x.c $(INTERFACE)/filter/hq2x.c \
+ $(INTERFACE)/filter/filters.h
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+
+$(OBJDIR)/lq2x.o: $(INTERFACE)/filter/lq2x.c $(INTERFACE)/filter/lq2x.c \
+ $(INTERFACE)/filter/filters.h $(INTERFACE)/filter/interp.h \
+ $(INTERFACE)/filter/hq2x.h $(INTERFACE)/filter/lq2x.h
+ $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+endif
+endif
+
+#############################################################
+#
+#############################################################
diff --git a/src/discord.c b/src/discord.c
index 4e574f05e..cd7dafa8f 100644
--- a/src/discord.c
+++ b/src/discord.c
@@ -47,7 +47,7 @@ struct discordInfo_s discordInfo;
discordRequest_t *discordRequestList = NULL;
-static char self_ip[IP_SIZE];
+static char self_ip[IP_SIZE+1];
boolean drpc_init = false;
diff --git a/src/hardware/hw_data.h b/src/hardware/hw_data.h
index 415358a35..daddc5025 100644
--- a/src/hardware/hw_data.h
+++ b/src/hardware/hw_data.h
@@ -111,7 +111,7 @@ struct GLPatch_s
GLMipmap_t *mipmap;
boolean notfound; // if the texture file was not found, mark it here (used in model texture loading)
-} ATTRPACK;
+};
typedef struct GLPatch_s GLPatch_t;
#endif //_HWR_DATA_