qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-21 19:01:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Zlib support for BC win32.

Browse source
This commit is contained in:
Dabb 2000-10-03 15:05:24 +00:00
parent 85e0b2b6aa
commit 496de868dc
7 changed files with 47 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
README.WIN
View file

@ -62,8 +62,8 @@ FREE Borland C++ complier 5.5.
(http://www.borland.com/bcppbuilder/freecompiler/)
5) Borland preprocessor can't process quake .S files. You need to get
.ASM files or use some other complier to preprocess them. .ASM files
must be placed on SOURCE dir.
.ASM files or use some other complier to preprocess them.
ASM files must be placed on newtree SOURCE dir.
(http://www.saunalahti.fi/~mipes/qf-asms.zip)
6) You need to have either MASM or TASM to compile ASM files.
@ -74,18 +74,28 @@ You only need to extract BINS_DDK.EXE and get two files, ML.EXE and ML.ERR
from it. Then get and run patch to upgrade ML.EXE to version 6.14. Put
ML.EXE and ML.ERR in some directory which is included in your %path.
7) For GL targets, you'll need to have import library for OPENGL stuffs
7) Download ZLIB source code from http://www.info-zip.org/pub/infozip/zlib/
and build a static library named zlib.lib. You have to copy makefile.b32
from MSDOS directory to zlib main dir and then comment out or delete
MODEL=-WX line in makefile.b32. Then do:
make -fmakefile.b32 zlib.lib
and it'll make lib and stuff. You can safely ignore any complains
from zlib makefile as long as it builds working zlib.lib.
8) For GL targets, you'll need to have import library for OPENGL stuffs
one coming with Borland C++ itself is screwed!
implib -c -f opengl32.lib c:\windows\system\opengl32.dll
8) If you want to compile SDL/SGL, you HAVE to run:
9) If you want to compile SDL/SGL, you HAVE to run:
implib -a -c sdl.lib sdl.dll (in sdlsdk directory where sdl.dll is located)
9) Check all paths in all makefiles and correct them to suit your system.
10) Check all paths in all makefiles and correct them to suit your system.
10) When everything else is done, just start making
11) When everything else is done, just start making
cd source
make -fqf-client-win

3
include/win32/bc/config.h
View file

@ -243,6 +243,9 @@
/* Define if you have the m library (-lm). */
#undef HAVE_LIBM
/* Define if you have the zlib library (-lz). */
#define HAVE_ZLIB
/* Posix, needed for limits.h and Unix stuffs to work right */
#define _POSIX_

8
source/qf-client-sdl.mak
View file

@ -65,6 +65,8 @@ SCITECHROOT=D:\SCITECH
DIRECTXSDK=D:\project\dx7sdk
# Path to your Direct-X libraries and includes
SDLSDK=d:\project\SDL-1.1.3
# Path to ZLIB source code
ZLIB=D:\PROJECT\ZLIB
# end of system dependant stuffs
@ -74,7 +76,7 @@ LIBS=$(SYSLIBS);$(MISCLIBS)
SYSINCLUDE = $(CROOT)\INCLUDE
QFINCLUDES = $(QFROOT)\INCLUDE\WIN32\BC;$(QFROOT)\INCLUDE\WIN32;$(QFROOT)\INCLUDE
MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include;$(SDLSDK)\include
MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include;$(SDLSDK)\include;$(ZLIB)
INCLUDES = $(QFINCLUDES);$(SYSINCLUDE);$(MISCINCLUDES)
@ -130,6 +132,7 @@ EXT2=.obj
#EXT2=.asm
DEPEND = \
$(ZLIB)\zlib.lib\
$(OBJS)\sdl_main.obj\
$(OBJS)\model.obj\
$(OBJS)\model_brush.obj\
@ -247,6 +250,7 @@ $(EXE)\qf-client-sdl.exe : $(DEPEND)
$(TLINK32) /v @&&|
$(LINKOPTS) +
$(CROOT)\LIB\c0w32.obj+
$(ZLIB)\zlib.lib+
$(OBJS)\sdl_main.obj+
$(OBJS)\model.obj+
$(OBJS)\model_brush.obj+
@ -361,7 +365,7 @@ $<,$*
$(DIRECTXSDK)\lib\borland\dxguid.lib+
$(SDLSDK)\lib\sdl.lib+
$(CROOT)\LIB\import32.lib+
$(CROOT)\LIB\cw32mt.lib
$(CROOT)\LIB\cw32.lib
|
$(OBJS)\model.obj : $(QFROOT)\source\model.c

9
source/qf-client-sgl.mak
View file

@ -69,7 +69,8 @@ SCITECHROOT=D:\SCITECH
DIRECTXSDK=D:\project\dx7sdk
# Path to your SDL SDK
SDLSDK=D:\project\SDL-1.1.3
#
# Path to ZLIB source code
ZLIB=D:\PROJECT\ZLIB
# end of system dependant stuffs
@ -79,7 +80,7 @@ LIBS=$(SYSLIBS);$(MISCLIBS)
SYSINCLUDE = $(CROOT)\INCLUDE
QFINCLUDES = $(QFROOT)\INCLUDE\WIN32\BC;$(QFROOT)\INCLUDE\WIN32;$(QFROOT)\INCLUDE
MISCINCLUDES = $(DIRECTXSDK)\include;$(SCITECHROOT)\include;$(SDLSDK)\include
MISCINCLUDES = $(DIRECTXSDK)\include;$(SCITECHROOT)\include;$(SDLSDK)\include;$(ZLIB)
INCLUDES = $(QFINCLUDES);$(SYSINCLUDE);$(MISCINCLUDES)
@ -135,6 +136,7 @@ EXT2=.obj
#EXT2=.asm
DEPEND = \
$(ZLIB)\zlib.lib\
$(DIRECTXSDK)\lib\borland\dxguid.lib\
$(OBJS)\model.obj\
$(OBJS)\model_brush.obj\
@ -224,6 +226,7 @@ $(EXE)\qf-client-sgl.exe : $(DEPEND)
$(TLINK32) @&&|
/v $(LINKOPTS) +
$(CROOT)\LIB\c0w32.obj+
$(ZLIB)\zlib.lib+
$(OBJS)\model.obj+
$(OBJS)\model_brush.obj+
$(OBJS)\model_alias.obj+
@ -309,7 +312,7 @@ $(QFROOT)\opengl32.lib+
$(DIRECTXSDK)\lib\borland\dxguid.lib+
$(SDLSDK)\lib\sdl.lib+
$(CROOT)\LIB\import32.lib+
$(CROOT)\LIB\cw32mt.lib
$(CROOT)\LIB\cw32.lib
|
$(OBJS)\model.obj : $(QFROOT)\source\model.c

6
source/qf-client-wgl.mak
View file

@ -67,6 +67,8 @@ EXE = $(QFROOT)
SCITECHROOT=D:\SCITECH
# Path to your Direct-X libraries and includes
DIRECTXSDK=D:\project\dx7sdk
# Path to ZLIB source code
ZLIB=D:\PROJECT\ZLIB
# end of system dependant stuffs
@ -76,7 +78,7 @@ LIBS=$(SYSLIBS);$(MISCLIBS)
SYSINCLUDE = $(CROOT)\INCLUDE
QFINCLUDES = $(QFROOT)\INCLUDE\WIN32\BC;$(QFROOT)\INCLUDE\WIN32;$(QFROOT)\INCLUDE
MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include
MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include;$(ZLIB)
INCLUDES = $(QFINCLUDES);$(SYSINCLUDE);$(MISCINCLUDES)
@ -132,6 +134,7 @@ EXT2=.obj
#EXT2=.asm
DEPEND = \
$(ZLIB)\zlib.lib\
$(OBJS)\model.obj\
$(OBJS)\model_brush.obj\
$(OBJS)\model_alias.obj\
@ -218,6 +221,7 @@ $(EXE)\qf-client-wgl.exe : $(DEPEND)
$(TLINK32) @&&|
/v $(LINKOPTS) +
$(CROOT)\LIB\c0w32.obj+
$(ZLIB)\zlib.lib+
$(OBJS)\model.obj+
$(OBJS)\model_brush.obj+
$(OBJS)\model_alias.obj+

8
source/qf-client-win.mak
View file

@ -63,6 +63,8 @@ EXE = $(QFROOT)
SCITECHROOT=D:\SCITECH
# Path to your Direct-X libraries and includes
DIRECTXSDK=D:\project\dx7sdk
# Path to ZLIB source code
ZLIB=D:\PROJECT\ZLIB
# end of system dependant stuffs
@ -72,7 +74,7 @@ LIBS=$(SYSLIBS);$(MISCLIBS)
SYSINCLUDE = $(CROOT)\INCLUDE
QFINCLUDES = $(QFROOT)\INCLUDE\WIN32\BC;$(QFROOT)\INCLUDE\WIN32;$(QFROOT)\INCLUDE
MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include
MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include;$(ZLIB)
INCLUDES = $(QFINCLUDES);$(SYSINCLUDE);$(MISCINCLUDES)
@ -128,6 +130,7 @@ EXT2=.obj
#EXT2=.asm
DEPEND = \
$(ZLIB)\zlib.lib\
$(OBJS)\model.obj\
$(OBJS)\model_brush.obj\
$(OBJS)\model_alias.obj\
@ -244,6 +247,7 @@ $(EXE)\qf-client-win.exe : $(DEPEND)
$(TLINK32) /v @&&|
$(LINKOPTS) +
$(CROOT)\LIB\c0w32.obj+
$(ZLIB)\zlib.lib+
$(OBJS)\model.obj+
$(OBJS)\model_brush.obj+
$(OBJS)\model_alias.obj+
@ -357,7 +361,7 @@ $<,$*
$(DIRECTXSDK)\lib\borland\dxguid.lib+
$(SCITECHROOT)\lib\win32\bc5\mglfx.lib+
$(CROOT)\LIB\import32.lib+
$(CROOT)\LIB\cw32mt.lib
$(CROOT)\LIB\cw32.lib
|
$(OBJS)\model.obj : $(QFROOT)\source\model.c

6
source/qf-server.mak
View file

@ -63,6 +63,8 @@ EXE = $(QFROOT)
SCITECHROOT=D:\SCITECH
# Path to your Direct-X libraries and includes
DIRECTXSDK=D:\project\dx7sdk
# Path to ZLIB source code
ZLIB=D:\PROJECT\ZLIB
# end of system dependant stuffs
@ -72,7 +74,7 @@ LIBS=$(SYSLIBS);$(MISCLIBS)
SYSINCLUDE = $(CROOT)\INCLUDE
QFINCLUDES = $(QFROOT)\INCLUDE\WIN32\BC;$(QFROOT)\INCLUDE\WIN32;$(QFROOT)\INCLUDE
MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include
MISCINCLUDES = $(SCITECHROOT)\include;$(DIRECTXSDK)\include;$(ZLIB)
INCLUDES = $(QFINCLUDES);$(SYSINCLUDE);$(MISCINCLUDES)
@ -117,6 +119,7 @@ EXT2=.obj
# Dependency List
#
DEPEND = \
$(ZLIB)\zlib.lib\
$(OBJS)\model.obj\
$(OBJS)\model_brush.obj\
$(OBJS)\pr_offs.obj\
@ -168,6 +171,7 @@ $(EXE)\qf-server.exe : $(DEPEND)
$(TLINK32) @&&|
/v $(LINKOPTS) +
$(CROOT)\LIB\c0x32.obj+
$(ZLIB)\zlib.lib+
$(OBJS)\model.obj+
$(OBJS)\model_brush.obj+
$(OBJS)\pr_offs.obj+