diff --git a/games/mvdsv/files/patch-build_make_Makefile.BSD b/games/mvdsv/files/patch-build_make_Makefile.BSD index b9c83f435da1..2c47406e0d8a 100644 --- a/games/mvdsv/files/patch-build_make_Makefile.BSD +++ b/games/mvdsv/files/patch-build_make_Makefile.BSD @@ -1,50 +1,50 @@ --- build/make/Makefile.BSD.orig 2018-06-30 09:20:48 UTC +++ build/make/Makefile.BSD @@ -17,12 +17,11 @@ SV_DIR = ../../src # for gcc its like: make mvdsv FORCE32BITFLAGS=-m32 # configure script add FORCE32BITFLAGS=-m32 -DO_CFLAGS = ${CFLAGS} -Wall -pipe -pthread -funsigned-char -DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} -+BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define _BYTE_ORDER \(.*\),_\1__,p' ++BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define __BYTE_ORDER__ __ORDER\(.*_ENDIAN__\),_\1,p' +DO_CFLAGS = ${CFLAGS} -Wall -pipe -funsigned-char -DWWW_INTEGRATION -DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} -WITH_OPTIMIZED_CFLAGS = YES - .if defined(WITH_OPTIMIZED_CFLAGS) -DO_CFLAGS += -O2 -fno-strict-aliasing -ffast-math -funroll-loops +DO_CFLAGS += -ffast-math -funroll-loops . if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) USE_ASM=-Did386 DO_CFLAGS += ${USE_ASM} @@ -35,7 +34,7 @@ STRIP_FLAGS = --strip-unneeded .endif STRIP_FLAGS += --remove-section=.comment -LDFLAGS = -lm +LDFLAGS += -lm -lpthread -lpcre -lcurl ############################################################################# # SERVER @@ -90,9 +89,6 @@ SV_OBJS = \ ${SV_DIR}/world.o \ ${SV_DIR}/zone.o \ \ - ${SV_DIR}/pcre/get.o \ - ${SV_DIR}/pcre/pcre.o \ -\ ${SV_DIR}/central.o .ifdef USE_ASM @@ -106,10 +102,10 @@ SV_ASM_OBJS = \ ############################################################################# .c.o: - ${CC} ${DO_CFLAGS} -c $< -o $*.o + ${CC} ${DO_CFLAGS} -c $< -o $@ .s.o: - ${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $*.o + ${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $@ all: mvdsv ${STRIP} ${STRIP_FLAGS} mvdsv diff --git a/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD b/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD index 65d6ac1fd450..a606fdf847dd 100644 --- a/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD +++ b/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD @@ -1,53 +1,53 @@ --- tools/qwdtools/source/Makefile.BSD.orig 2020-03-18 18:17:05 UTC +++ tools/qwdtools/source/Makefile.BSD @@ -12,24 +12,19 @@ # MAINDIR = ../../.. -SV_DIR = $(MAINDIR)/source +SV_DIR = $(MAINDIR)/src QWDTOOLS_DIR = $(MAINDIR)/tools/qwdtools/source # To compile qwdtools as 32bit on 64bit target platform use next: # for gcc its like: make qwdtools FORCE32BITFLAGS=-m32 # configure script add FORCE32BITFLAGS=-m32 -DO_CFLAGS = ${CFLAGS} -Wall -pipe -pthread -funsigned-char -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} -+BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define _BYTE_ORDER \(.*\),_\1__,p' ++BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define __BYTE_ORDER__ __ORDER\(.*_ENDIAN__\),_\1,p' +DO_CFLAGS = ${CFLAGS} -Wall -pipe -funsigned-char -DSERVERONLY -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} -.if !defined(NOKQUEUE) && (${UNAME} == "FreeBSD" || ${UNAME} == "DragonFly") -DO_CFLAGS += -DKQUEUE -.endif - -WITH_OPTIMIZED_CFLAGS = YES - USE_ASM=-Did386 .if defined(WITH_OPTIMIZED_CFLAGS) -DO_CFLAGS += -O2 -fno-strict-aliasing -ffast-math -funroll-loops +DO_CFLAGS += -ffast-math -funroll-loops . if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) ASM=${USE_ASM} DO_CFLAGS += ${ASM} @@ -60,7 +55,7 @@ QWDTOOLS_OBJS = \ ${QWDTOOLS_DIR}/sync.o \ ${QWDTOOLS_DIR}/tools.o -.if ${USE_ASM} == ${ASM} +.if defined(ASM) && ${USE_ASM} == ${ASM} QWDTOOLS_ASM_OBJS = \ ${SV_DIR}/bothtoolsa.o .endif @@ -70,10 +65,10 @@ QWDTOOLS_ASM_OBJS = \ ############################################################################# .c.o: - ${CC} ${DO_CFLAGS} -c $< -o $*.o + ${CC} ${DO_CFLAGS} -c $< -o $@ .s.o: - ${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $*.o + ${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $@ all: qwdtools ${STRIP} ${STRIP_FLAGS} qwdtools