head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.42 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.40 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.38 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.36 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.34 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.32 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.30 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.28 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.26 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.24 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.22 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.20 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.18 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.16 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.14 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.12 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.10 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.8 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.6 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.4 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.2 pkgsrc-2021Q1-base:1.2 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.2 date 2021.02.09.22.33.23; author nia; state Exp; branches; next 1.1; commitid 8lI7Fyg1nKnJs5HC; 1.1 date 2019.06.30.21.41.46; author nia; state Exp; branches; next ; commitid amYQ5lUvbisF8gtB; desc @@ 1.2 log @sauerbraten: Update to 2020_12_27 Unknown changes, seems to use SDL2 now which is nice. @ text @$NetBSD: patch-src_Makefile,v 1.1 2019/06/30 21:41:46 nia Exp $ - Do not override CFLAGS/CXXFLAGS. - Use libenet from pkgsrc. - Use LDFLAGS instead of CXXFLAGS for linking. --- src/Makefile.orig 2020-12-04 19:55:54.000000000 +0000 +++ src/Makefile @@@@ -1,10 +1,9 @@@@ -CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math -override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti +CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]') PLATFORM_PREFIX= native -INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include +INCLUDES= -Ishared -Iengine -Ifpsgame $(shell pkg-config --cflags libenet) STRIP= ifeq (,$(findstring -g,$(CXXFLAGS))) @@@@ -65,8 +64,8 @@@@ CLIENT_LIBS= -F../sauerbraten.app/Conten CLIENT_LIBS+= -framework SDL2_mixer -framework CoreAudio -framework AudioToolbox CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -Lenet -lenet else -CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags` -CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL +CLIENT_INCLUDES= $(INCLUDES) `sdl2-config --cflags` +CLIENT_LIBS= $(shell pkg-config --libs libenet) -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL endif endif ifeq ($(PLATFORM),LINUX) @@@@ -201,22 +200,22 @@@@ master: $(MASTER_OBJS) install: all else client: libenet $(CLIENT_OBJS) - $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) + $(CXX) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) ifneq (,$(findstring DARWIN,$(PLATFORM))) install_name_tool -add_rpath @@executable_path/../Frameworks sauer_client endif server: libenet $(SERVER_OBJS) - $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) + $(CXX) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) master: libenet $(MASTER_OBJS) - $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) + $(CXX) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) shared/cube2font.o: shared/cube2font.c $(CXX) $(CXXFLAGS) -c -o $@@ $< `freetype-config --cflags` cube2font: shared/cube2font.o - $(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz + $(CXX) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz ifneq (,$(findstring DARWIN,$(PLATFORM))) install: client @ 1.1 log @Add sauerbraten-2013_04_04 as games/sauerbraten Cube 2: Sauerbraten is a free multiplayer & singleplayer first person shooter, the successor of the Cube FPS. Much like the original Cube, the aim of this game is fun, old school deathmatch gameplay and also to allow map/geometry editing to be done cooperatively in-game. The engine supporting the game is entirely original in code & design, and its code is Open Source (ZLIB license, read the docs for more on how you can use the engine). @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 --- src/Makefile.orig 2012-08-28 05:30:07.000000000 +0000 d10 1 a10 1 -CXXFLAGS= -O3 -fomit-frame-pointer d14 1 a14 1 PLATFORM= $(shell uname -s) d18 1 a18 1 +INCLUDES= -Ishared -Iengine -Ifpsgame $$(pkg-config --cflags libenet) d22 8 a29 6 @@@@ -37,7 +36,7 @@@@ endif CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm else CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` -CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL +CLIENT_LIBS= $$(pkg-config --libs libenet) -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL a30 9 ifeq ($(PLATFORM),Linux) CLIENT_LIBS+= -lrt @@@@ -106,7 +105,7 @@@@ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(W MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm else SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -SERVER_LIBS= -Lenet/.libs -lenet -lz +SERVER_LIBS= $$(pkg-config --libs libenet) -lz MASTER_LIBS= $(SERVER_LIBS) d32 2 a33 3 SERVER_OBJS= \ @@@@ -176,14 +175,14 @@@@ master: $(MASTER_OBJS) d36 1 a36 1 -client: libenet $(CLIENT_OBJS) a37 1 +client: $(CLIENT_OBJS) d39 3 d43 7 a49 9 -server: libenet $(SERVER_OBJS) - $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) +server: $(SERVER_OBJS) + $(CXX) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) -master: libenet $(MASTER_OBJS) - $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) +master: $(MASTER_OBJS) + $(CXX) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) d53 7 @