ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2025-01-18 23:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix zlib includes

Browse source
This commit is contained in:
Ludwig Nussel 2009-10-24 14:19:39 +00:00
parent c312449422
commit 2fc4023e0b
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -879,6 +879,9 @@ endif
ifeq ($(USE_INTERNAL_ZLIB),1) ifeq ($(USE_INTERNAL_ZLIB),1)
BASE_CFLAGS += -DNO_GZIP BASE_CFLAGS += -DNO_GZIP
ifneq ($(USE_LOCAL_HEADERS),1)
BASE_CFLAGS += -I$(ZDIR)
endif
else else
LIBS += -lz LIBS += -lz
endif endif

1
code/qcommon/unzip.c
View file

@ -38,7 +38,6 @@ woven in by Terry Thorsen 1/2003.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "zlib.h"
#include "unzip.h" #include "unzip.h"
#ifdef STDC #ifdef STDC

13
code/qcommon/unzip.h
View file

@ -49,17 +49,12 @@
extern "C" { extern "C" {
#endif #endif
#ifndef _ZLIB_H #ifdef USE_LOCAL_HEADERS
#ifdef USE_LOCAL_HEADERS #include "../zlib/zlib.h"
#include "../zlib/zlib.h" #else
#else #include <zlib.h>
#include <zlib.h>
#endif
#endif #endif
#ifndef _ZLIBIOAPI_H
#include "ioapi.h" #include "ioapi.h"
#endif
#define NOUNCRYPT #define NOUNCRYPT