teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-27 14:22:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #116 from smcv/system-minizip

Browse source 
Enhancements for system libraries
This commit is contained in:
Zack Middleton 2015-04-12 19:56:37 -05:00
commit 10c5f0b5a9
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -1074,11 +1074,10 @@ ifeq ($(USE_INTERNAL_JPEG),1)
BASE_CFLAGS += -DUSE_INTERNAL_JPEG BASE_CFLAGS += -DUSE_INTERNAL_JPEG
BASE_CFLAGS += -I$(JPDIR) BASE_CFLAGS += -I$(JPDIR)
else else
# libjpeg doesn't have pkg-config yet, but let users override with # IJG libjpeg doesn't have pkg-config, but libjpeg-turbo uses libjpeg.pc;
# "make JPEG_CFLAGS=-I/opt/jpeg/include JPEG_LIBS='-L/opt/jpeg/lib -ljpeg'" # we fall back to hard-coded answers if libjpeg.pc is unavailable
# if they need to JPEG_CFLAGS ?= $(shell pkg-config --silence-errors --cflags libjpeg || true)
JPEG_CFLAGS ?= JPEG_LIBS ?= $(shell pkg-config --silence-errors --libs libjpeg || echo -ljpeg)
JPEG_LIBS ?= -ljpeg
BASE_CFLAGS += $(JPEG_CFLAGS) BASE_CFLAGS += $(JPEG_CFLAGS)
RENDERER_LIBS += $(JPEG_LIBS) RENDERER_LIBS += $(JPEG_LIBS)
endif endif

6
code/qcommon/unzip.c
View file

@ -1,4 +1,10 @@
/* unzip.c -- IO for uncompress .zip files using zlib /* unzip.c -- IO for uncompress .zip files using zlib
Modified for Quake III Arena to use the Z_Malloc() memory pool;
this means a system copy of minizip is not a suitable replacement.
Based on minizip:
Version 1.01e, February 12th, 2005 Version 1.01e, February 12th, 2005
Copyright (C) 1998-2005 Gilles Vollant Copyright (C) 1998-2005 Gilles Vollant