aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-10-19 14:00:16 +0000
committerthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-10-19 14:00:16 +0000
commitb216c712418ff9260683c212e2c5a1af25bee600 (patch)
treecd3c256ae11b89daa84a531081a6549d6082b1f8 /Makefile
parentb53b2afb9ef108c44f3666b3befc10b0db58b8d5 (diff)
downloadioquake3-aero-b216c712418ff9260683c212e2c5a1af25bee600.tar.gz
ioquake3-aero-b216c712418ff9260683c212e2c5a1af25bee600.zip
Just unix2dos, nothing to see here ...
git-svn-id: svn://svn.icculus.org/quake3/trunk@1681 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile38
1 files changed, 38 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ba3e4fb..23b9949 100644
--- a/Makefile
+++ b/Makefile
@@ -143,6 +143,10 @@ ifndef USE_INTERNAL_SPEEX
USE_INTERNAL_SPEEX=1
endif
+ifndef USE_INTERNAL_ZLIB
+USE_INTERNAL_ZLIB=1
+endif
+
ifndef USE_LOCAL_HEADERS
USE_LOCAL_HEADERS=1
endif
@@ -166,6 +170,7 @@ UIDIR=$(MOUNT_DIR)/ui
Q3UIDIR=$(MOUNT_DIR)/q3_ui
JPDIR=$(MOUNT_DIR)/jpeg-6b
SPEEXDIR=$(MOUNT_DIR)/libspeex
+ZDIR=$(MOUNT_DIR)/zlib
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp
@@ -872,6 +877,12 @@ ifeq ($(USE_VOIP),1)
endif
endif
+ifeq ($(USE_INTERNAL_ZLIB),1)
+ BASE_CFLAGS += -DNO_GZIP
+else
+ LDFLAGS += -lz
+endif
+
ifdef DEFAULT_BASEDIR
BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
endif
@@ -1311,6 +1322,7 @@ Q3OBJ = \
$(B)/client/q_shared.o \
\
$(B)/client/unzip.o \
+ $(B)/client/ioapi.o \
$(B)/client/puff.o \
$(B)/client/vm.o \
$(B)/client/vm_interpreted.o \
@@ -1478,6 +1490,15 @@ Q3OBJ += \
endif
endif
+ifeq ($(USE_INTERNAL_ZLIB),1)
+Q3OBJ += \
+ $(B)/client/adler32.o \
+ $(B)/client/crc32.o \
+ $(B)/client/inffast.o \
+ $(B)/client/inflate.o \
+ $(B)/client/inftrees.o \
+ $(B)/client/zutil.o
+endif
ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),i386)
@@ -1581,6 +1602,7 @@ Q3DOBJ = \
$(B)/ded/q_shared.o \
\
$(B)/ded/unzip.o \
+ $(B)/ded/ioapi.o \
$(B)/ded/vm.o \
$(B)/ded/vm_interpreted.o \
\
@@ -1633,6 +1655,16 @@ ifeq ($(ARCH),x86)
$(B)/ded/matha.o
endif
+ifeq ($(USE_INTERNAL_ZLIB),1)
+Q3DOBJ += \
+ $(B)/ded/adler32.o \
+ $(B)/ded/crc32.o \
+ $(B)/ded/inffast.o \
+ $(B)/ded/inflate.o \
+ $(B)/ded/inftrees.o \
+ $(B)/ded/zutil.o
+endif
+
ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),i386)
Q3DOBJ += $(B)/ded/vm_x86.o
@@ -1985,6 +2017,9 @@ $(B)/client/%.o: $(JPDIR)/%.c
$(B)/client/%.o: $(SPEEXDIR)/%.c
$(DO_CC)
+$(B)/client/%.o: $(ZDIR)/%.c
+ $(DO_CC)
+
$(B)/client/%.o: $(RDIR)/%.c
$(DO_CC)
@@ -2013,6 +2048,9 @@ $(B)/ded/%.o: $(SDIR)/%.c
$(B)/ded/%.o: $(CMDIR)/%.c
$(DO_DED_CC)
+$(B)/ded/%.o: $(ZDIR)/%.c
+ $(DO_DED_CC)
+
$(B)/ded/%.o: $(BLIBDIR)/%.c
$(DO_BOT_CC)