diff options
Diffstat (limited to 'games/fteqw/files/patch-Makefile')
| -rw-r--r-- | games/fteqw/files/patch-Makefile | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/games/fteqw/files/patch-Makefile b/games/fteqw/files/patch-Makefile deleted file mode 100644 index c47d7a84c73c..000000000000 --- a/games/fteqw/files/patch-Makefile +++ /dev/null @@ -1,98 +0,0 @@ ---- Makefile.orig 2014-02-05 16:57:36.000000000 -0500 -+++ Makefile -@@ -1,6 +1,6 @@ --CC=gcc -+CC?=gcc - WINDRES=windres --STRIP=strip -+STRIP?=strip - - STRIPFLAGS=--strip-unneeded --remove-section=.comment - -@@ -179,9 +179,9 @@ else - endif - - #BASELDFLAGS=-lm -lz --GLXLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext $(IMAGELDFLAGS) --GLSLDFLAGS=-L/usr/X11R6/lib -lMesaGL -lglide -lvga --XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext $(IMAGELDFLAGS) -+GLXLDFLAGS=-L$(LOCALBASE)/lib -lX11 -lXext $(IMAGELDFLAGS) -+GLSLDFLAGS=-L$(LOCALBASE)/lib -lMesaGL -lglide -lvga -+XLDFLAGS=-L$(LOCALBASE)/lib -lX11 -lXext $(IMAGELDFLAGS) - SLDFLAGS=-lvga - - ifeq ($(USEASM),true) -@@ -212,18 +212,20 @@ else - BASE_ASM_CFLAGS = -DNOASM - endif - --BASE_CFLAGS=$(BASE_ASM_CFLAGS) -Wall -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) -I$(COMMON_DIR) -I$(SW_DIR) -I$(GL_DIR) -I$(D3D9_DIR) -I$(D3D7_DIR) -I$(PROGS_DIR) -I$(LIBS_DIR) -I$(LIBS_DIR)/dxsdk7/include -I$(LIBS_DIR)/sdl/include -I$(LIBS_DIR)/sdl/include/SDL -D_vsnprintf=vsnprintf -D_snprintf=snprintf -+BASE_CFLAGS=$(BASE_ASM_CFLAGS) -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) -I$(COMMON_DIR) -I$(SW_DIR) -I$(GL_DIR) -I$(D3D9_DIR) -I$(D3D7_DIR) -I$(PROGS_DIR) -I$(LIBS_DIR) -I$(LIBS_DIR)/dxsdk7/include -I$(LIBS_DIR)/sdl/include -I$(LIBS_DIR)/sdl/include/SDL -D_vsnprintf=vsnprintf -D_snprintf=snprintf - CLIENT_ONLY_CFLAGS=-DCLIENTONLY - SERVER_ONLY_CFLAGS=-DSERVERONLY - JOINT_CFLAGS= - DEBUG_CFLAGS=-ggdb -g - -+ifeq ($(OPTIMIZED_CFLAGS),true) - ifeq ($(FTE_TARGET),win32) - RELEASE_CFLAGS=-fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS) - else - RELEASE_CFLAGS=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS) - #RELEASE_CFLAGS=-O6 -fno-strict-aliasing -ffast-math -funroll-loops -fexpensive-optimizations $(CPUOPTIMIZATIONS) - endif -+endif - - GLCFLAGS=-DGLQUAKE - SWCFLAGS=-DSWQUAKE -@@ -469,7 +471,7 @@ ifdef windir - SW_LDFLAGS=$(SWLDFLAGS) -lmingw32 -lwsock32 -lSDLmain -lSDL - else - #pthread is needed because of SDL. --SW_LDFLAGS=$(SWLDFLAGS) `sdl-config --libs` $(IMAGELDFLAGS) -+SW_LDFLAGS=$(SWLDFLAGS) `sdl-config --libs` $(IMAGELDFLAGS) -lz - endif - SW_CFLAGS=$(SWCFLAGS) `sdl-config --cflags` - SWB_DIR=sw_sdl$(BITS) -@@ -550,7 +552,7 @@ ifeq ($(FTE_TARGET),bsd) - #oss, X, etc. - - SV_DIR=sv_linux -- SV_LDFLAGS=-lz -ldl -+ SV_LDFLAGS=-lz - - ifeq ($(USEASM),true) - GLCL_OBJS=$(GL_OBJS) $(GLQUAKE_OBJS) gl_vidlinuxglx.o snd_linux.o cd_null.o sys_linux.o sys_dosa.o -@@ -559,20 +561,13 @@ else - endif - GL_EXE_NAME=../fteqw.gl - GLCL_EXE_NAME=../fteqwcl.gl -- GL_LDFLAGS= -L/usr/local/lib $(GLLDFLAGS) $(GLXLDFLAGS) -lXxf86vm -lpthread -- GL_CFLAGS=$(GLCFLAGS) -I/usr/local/include -I/usr/X11R6/include -+ GL_LDFLAGS= -L/usr/local/lib $(GLLDFLAGS) $(GLXLDFLAGS) -lXxf86vm -lpthread -lz -+ GL_CFLAGS=$(GLCFLAGS) -I$(LOCALBASE)/include - GLB_DIR=gl_bsd - GLCL_DIR=glcl_bsd - --ifeq ($(USEASM),true) -- SWCL_OBJS=$(SOFTWARE_OBJS) vid_x.o snd_linux.o cd_null.o sys_linux.o sys_dosa.o --else -- SWCL_OBJS=$(SOFTWARE_OBJS) vid_x.o snd_linux.o cd_null.o sys_linux.o --endif -- SW_EXE_NAME=../fteqw.sw -- SWCL_EXE_NAME=../fteqwcl.sw -- SW_LDFLAGS=-L/usr/local/lib $(SWLDFLAGS) $(XLDFLAGS) -lXxf86vm -lpthread -- SW_CFLAGS=$(SWCFLAGS) -I/usr/local/include -I/usr/X11R6/include -+ SW_EXE_NAME=../fteqw.sdl -+ SWCL_EXE_NAME=../fteqwcl.sdl - SWB_DIR=sw_bsd - SWCL_DIR=swcl_bsd - -@@ -584,7 +579,7 @@ endif - M_EXE_NAME=../fteqw - MCL_EXE_NAME=../fteqwcl - M_LDFLAGS=$(GLLDFLAGS) $(GLXLDFLAGS) -lXxf86vm -lpthread -- M_CFLAGS=$(SWCFLAGS) $(GLCFLAGS) -I/usr/X11R6/include -+ M_CFLAGS=$(SWCFLAGS) $(GLCFLAGS) -I$(LOCALBASE)/include - MB_DIR=m_bsd - MCL_DIR=mcl_bsd - |