$NetBSD: patch-src_Makefile,v 1.2 2021/02/09 22:33:23 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