Permalink
Browse files

Remove zlib from pkg-config calls. Fixes warnings during build. Add -…

…lz to

LDLIBS.
  • Loading branch information...
1 parent 730d3ae commit 7a4b1b62551b3aa32efbf9832268dde24eea9698 othyro committed Nov 11, 2012
Showing with 12 additions and 1 deletion.
  1. +12 −1 mupen64plus/patches/patch-source_mupen64plus-core_projects_unix_Makefile
@@ -53,7 +53,7 @@ Adding NetBSD support. Setting TARGET, CFLAGS, LDFLAGS, LIBS, etc.
+ SONAME = libmupen64plus.so.2
+ CFLAGS += -I${PREFIX}/include -I../../src/
+ LDFLAGS += -Wl,-rpath,${LIBDIR} -shared -Wl,-export-dynamic -Wl,-soname,$(SONAME)
-+ LIBS += $(shell pkg-config --libs gl glu libpng freetype2) -lz -lm
++ LIBS += $(shell pkg-config --libs freetype2 gl glu libpng) -lz -lm
+endif
ifeq ($(CPU_ENDIANNESS), BIG)
CFLAGS += -DM64P_BIG_ENDIAN
@@ -68,6 +68,17 @@ Adding NetBSD support. Setting TARGET, CFLAGS, LDFLAGS, LIBS, etc.
ifeq ($(shell pkg-config --modversion freetype2 2>/dev/null),)
$(error No FreeType 2 development libraries found!)
endif
+@@ -183,8 +190,8 @@ endif
+ ifeq ($(shell pkg-config --modversion glu 2>/dev/null),)
+ $(error No OpenGL utility development libraries found!)
+ endif
+-CFLAGS += $(shell pkg-config --cflags libpng zlib freetype2 gl glu)
+-LDLIBS += $(shell pkg-config --libs libpng zlib freetype2 gl glu)
++CFLAGS += $(shell pkg-config --cflags libpng freetype2 gl glu)
++LDLIBS += $(shell pkg-config --libs libpng freetype2 gl glu) -lz
+
+ # test for presence of SDL
+ ifeq ($(shell which sdl-config 2>/dev/null),)
@@ -212,6 +219,9 @@ else
ifeq ($(OS),FREEBSD)
LDCONFIG ?= PATH="$$PATH:/sbin" ldconfig -m

0 comments on commit 7a4b1b6

Please sign in to comment.