head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.16 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.14 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.12 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.10 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.8 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.6 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.4 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.2 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.1.0.38 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.36 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.34 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.32 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.30 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.28 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.26 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.24 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.22 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.20 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.18 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.16 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.14 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.12 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.10 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.8 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.4 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.6 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.2 pkgsrc-2019Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2024.05.06.14.04.25; author nia; state Exp; branches; next 1.2; commitid PHDh14yHJMEwEW8F; 1.2 date 2024.05.06.12.12.16; author nia; state Exp; branches; next 1.1; commitid cQLzyDcfOhH72W8F; 1.1 date 2019.06.30.21.44.30; author nia; state Exp; branches; next ; commitid X7KxU9AmRT9F9gtB; desc @@ 1.3 log @assaultcube: Update to 1.3.0.2 Changes: https://assault.cubers.net/docs/history.html @ text @$NetBSD: patch-source_src_Makefile,v 1.2 2024/05/06 12:12:16 nia Exp $ - Do not force a compiler or CXXFLAGS. - Do not hardcore -lX11 -lGL -lopenal since we want this to work on Darwin too. - Attempt to fix missing symbols in the master server. - Use LDFLAGS when linking. --- source/src/Makefile.orig 2022-03-23 08:29:06.000000000 +0000 +++ source/src/Makefile @@@@ -2,12 +2,6 @@@@ # creating a seperate 'Makefile_local' file (this way, your changes aren't # accidentally commited to the AssaultCube repository). -# AssaultCube now uses clang++ as a compiler, as there have been random crashes -# found to have been caused by the g++ compiler in the past. This seems to have -# been fixed now by relaxing the optimization that g++ does, so although we'll -# continue using clang++ (just in case), you can use g++ if you prefer. -CXX=clang++ - # call like 'DEBUGBUILD=1 make' to compile a debug version of AssaultCube. ifdef DEBUGBUILD ACDEBUG=yes @@@@ -28,30 +22,11 @@@@ endif -include Makefile_local -ifeq ($(ACDEBUG),yes) - CXXFLAGS= -O0 - override CXXFLAGS+= -g -D_DEBUG -endif - -ifneq (,$(findstring clang,$(CXX))) - CXXFLAGS= -O3 -fomit-frame-pointer - override CXXFLAGS+= -Wall -fsigned-char -else - CXXFLAGS= -O3 -fomit-frame-pointer - override CXXFLAGS+= -Wall -fsigned-char -ffast-math -rdynamic -Wno-format-zero-length - ifeq "$(shell expr 'gcc -dumpversion' \>= 8)" "1" - override CXXFLAGS+= -Wno-stringop-truncation - endif -endif +CXXFLAGS+= -Wall -fsigned-char INCLUDES= -I. -Ibot -I../enet/include STRIP= -ifeq (,$(findstring -g,$(CXXFLAGS))) -ifeq (,$(findstring -pg,$(CXXFLAGS))) - STRIP=strip -endif -endif MV=mv ifneq (,$(findstring MINGW,$(PLATFORM))) @@@@ -61,7 +36,7 @@@@ CLIENT_LIBS= -mwindows -L../lib -lSDL2 - else USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi) CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl2-config --cflags` -idirafter ../include -CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl2-config --libs` -lSDL2_image -lz -lGL -lopenal -lvorbisfile +CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl2-config --libs` -lSDL2_image -lz -lvorbisfile endif CLIENT_OBJS= \ @@@@ -142,6 +117,8 @@@@ SERVER_OBJS= \ tools-standalone.o \ wizard-standalone.o MASTER_OBJS= \ + tools-standalone.o \ + protocol-standalone.o \ stream-standalone.o \ command-standalone.o \ master-standalone.o @@@@ -202,12 +179,12 @@@@ server_install: server else client: libenet $(CLIENT_OBJS) - $(CXX) $(CXXFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS) + $(CXX) $(LDFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS) server: libenet $(SERVER_OBJS) - $(CXX) $(CXXFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS) + $(CXX) $(LDFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS) master: libenet $(MASTER_OBJS) - $(CXX) $(CXXFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS) + $(CXX) $(LDFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS) client_install: client install -d ../../bin_unix/ @ 1.2 log @assaultcube: Port to Darwin. @ text @d1 1 a1 1 $NetBSD: patch-source_src_Makefile,v 1.1 2019/06/30 21:44:30 nia Exp $ a3 1 - Use LDFLAGS when linking. d6 2 a7 1 - Use libenet from pkgsrc. d9 1 a9 1 --- source/src/Makefile.orig 2013-11-09 23:12:11.000000000 +0000 d11 32 a42 4 @@@@ -1,11 +1,9 @@@@ -CXXFLAGS= -O3 -fomit-frame-pointer -CXX=clang++ # Use clang++, as g++ optimizations cause crashes... -override CXXFLAGS+= -Wall -fsigned-char d45 1 a45 5 PLATFORM= $(shell uname -s) PLATFORM_PREFIX=native -INCLUDES= -I. -Ibot -I../enet/include +INCLUDES= -I. -Ibot d48 9 a56 4 ifeq (,$(findstring -g,$(CXXFLAGS))) @@@@ -20,10 +18,9 @@@@ WINDRES= windres CLIENT_INCLUDES= $(INCLUDES) -I../include CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -llibintl -lws2_32 -lwinmm -lcurl d58 4 a61 6 -USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi) # override CXXFLAGS+= -rdynamic # clang++ doesn't use this... -CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include -CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl +CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags` `pkg-config --cflags libenet` -I../include +CLIENT_LIBS= `sdl-config --libs` `pkg-config --libs libenet` -lSDL_image -lz -lvorbisfile -lcurl d65 10 a74 11 @@@@ -88,7 +85,7 @@@@ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm else SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -SERVER_LIBS= -L../enet/.libs -lenet -lz +SERVER_LIBS= `pkg-config --libs libenet` -lz endif SERVER_OBJS= \ @@@@ -155,13 +152,13 @@@@ client_install: client server_install: server d77 1 a77 1 -client: libenet $(CLIENT_OBJS) a78 1 +client: $(CLIENT_OBJS) d81 1 a81 1 -server: libenet $(SERVER_OBJS) d83 2 a84 1 -master: libenet $(MASTER_OBJS) a85 3 +server: $(SERVER_OBJS) + $(CXX) $(LDFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS) +master: $(MASTER_OBJS) @ 1.1 log @Add assaultcube-1.2.0.2 as games/assaultcube AssaultCube is a FREE, multiplayer, first-person shooter game, based on the CUBE engine. Taking place in realistic environments, with fast, arcade gameplay, it's addictive and fun! With efficient bandwidth usage, it's low-latency and can even run over a 56 Kbps connection. It's tiny too, weighing in at a lightweight about 50 MB package available for Windows, Mac and Linux. On the correct settings, it can even run on old hardware (Pentium III and above). @ text @d1 1 a1 1 $NetBSD$ d5 2 d34 1 a34 1 +CLIENT_LIBS= -lX11 `sdl-config --libs` `pkg-config --libs libenet` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl @