aboutsummaryrefslogtreecommitdiff
path: root/games/frogatto
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-01-03 19:58:37 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-01-03 19:58:37 +0000
commit28e7e01df0bd11e6445803ff4a8ebd8e3ca712ec (patch)
treee04a4a95d5849381e2b282b3e90796f6b4ae0139 /games/frogatto
parent931c22e7cb046db5b0a7ecf4c617acac21b1c1d7 (diff)
downloadports-28e7e01df0bd11e6445803ff4a8ebd8e3ca712ec.tar.gz
ports-28e7e01df0bd11e6445803ff4a8ebd8e3ca712ec.zip
Assume "pkg-config zlib" works after 9.x reached EOL
Notes
Notes: svn path=/head/; revision=430516
Diffstat (limited to 'games/frogatto')
-rw-r--r--games/frogatto/files/patch-Makefile13
1 files changed, 2 insertions, 11 deletions
diff --git a/games/frogatto/files/patch-Makefile b/games/frogatto/files/patch-Makefile
index 1d6d82bb7289..50294eedbd5d 100644
--- a/games/frogatto/files/patch-Makefile
+++ b/games/frogatto/files/patch-Makefile
@@ -9,7 +9,7 @@
CCACHE?=ccache
USE_CCACHE?=$(shell which $(CCACHE) 2>&1 > /dev/null && echo yes)
ifneq ($(USE_CCACHE),yes)
-@@ -34,14 +34,14 @@ BASE_CXXFLAGS += -O2
+@@ -34,7 +34,7 @@ BASE_CXXFLAGS += -O2
endif
# Initial compiler options, used before CXXFLAGS and CPPFLAGS.
@@ -17,16 +17,7 @@
+BASE_CXXFLAGS += -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wformat -Wswitch
# Compiler include options, used after CXXFLAGS and CPPFLAGS.
--INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib)
-+INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng)
-
- # Linker library options.
- LIBS := $(shell pkg-config --libs x11 ) -lSDLmain \
-- $(shell pkg-config --libs sdl glu glew SDL_image libpng zlib) -lSDL_ttf -lSDL_mixer
-+ $(shell pkg-config --libs sdl glu glew SDL_image libpng) -lz -lSDL_ttf -lSDL_mixer
-
- include Makefile.common
-
+ INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib)
@@ -60,7 +60,7 @@ game: $(objects)
$(CCACHE) $(CXX) \
$(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INC) \