ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Find system zlib via user override, pkg-config or in standard locations

Browse source
This commit is contained in:
Simon McVittie 2013-05-19 21:31:12 +01:00
parent 9ff2fc3324
commit c817ab5ae0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -1028,11 +1028,13 @@ ifeq ($(USE_VOIP),1)
endif endif
ifeq ($(USE_INTERNAL_ZLIB),1) ifeq ($(USE_INTERNAL_ZLIB),1)
BASE_CFLAGS += -DNO_GZIP ZLIB_CFLAGS = -DNO_GZIP -I$(ZDIR)
BASE_CFLAGS += -I$(ZDIR)
else else
LIBS += -lz ZLIB_CFLAGS ?= $(shell pkg-config --silence-errors --cflags zlib || true)
ZLIB_LIBS ?= $(shell pkg-config --silence-errors --libs zlib || echo -lz)
endif endif
BASE_CFLAGS += $(ZLIB_CFLAGS)
LIBS += $(ZLIB_LIBS)
ifeq ($(USE_INTERNAL_JPEG),1) ifeq ($(USE_INTERNAL_JPEG),1)
BASE_CFLAGS += -DUSE_INTERNAL_JPEG BASE_CFLAGS += -DUSE_INTERNAL_JPEG