From c8e95a85fd44ade2520c4d6330550b748d7c3b32 Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Thu, 28 Sep 2000 19:52:46 +0000 Subject: [PATCH] added zlib support in the VC projects. WARNING: re-read readme.win for instructions on getting this working on your system, since it depends on zlib being installed on your system, similar to the way mgl is done. --- README.WIN | 15 +++++++++++++++ include/win32/vc/config.h | 5 ++++- source/qw_client.dsp | 12 ++++++++---- source/qw_server.dsp | 6 ++++-- source/r_main.c | 2 ++ source/sv_model.c | 3 ++- tools/gas2masm/gas2masm.dsp | 4 ++-- 7 files changed, 37 insertions(+), 10 deletions(-) diff --git a/README.WIN b/README.WIN index 0c4b076..c8d1b4f 100644 --- a/README.WIN +++ b/README.WIN @@ -20,6 +20,21 @@ To compile under "free" Borland C++, see couple of paragraphs below. MGLFX.LIB, and put the appropriate paths into VC++'s options, as above. + also: + download the source for zlib from http://www.info-zip.org/pub/infozip/zlib/ + and build a static library named zlib.lib (also, build a debug version named + zlibd.lib if you plan to build the debug targets.). put the lib files in a + directory together, and add it to the MSVC libraries path, and add the + directory with the zlib source code to the include paths (see above) + + or: + open include/vc/config.h and change the line that reads + #define HAS_ZLIB + to + #undef HAS_ZLIB + and remove zlib.lib and zlibd.lib from the project settings + (not reccommended) + 2) Build the gas2masm Debug program first. all the other targets depend on this one. diff --git a/include/win32/vc/config.h b/include/win32/vc/config.h index 117ac42..f38e3b4 100644 --- a/include/win32/vc/config.h +++ b/include/win32/vc/config.h @@ -47,7 +47,7 @@ #undef HAVE_VPRINTF /* Define as __inline if that's what the C compiler calls it. */ -#undef inline +#define inline __inline /* Define if you can safely include both and . */ #undef TIME_WITH_SYS_TIME @@ -243,6 +243,9 @@ /* Define if you have the m library (-lm). */ #undef HAVE_LIBM +/* Define if you have the zlib library (-lz). */ +#define HAS_ZLIB + /* Posix, needed for limits.h and Unix stuffs to work right */ #define _POSIX_ diff --git a/source/qw_client.dsp b/source/qw_client.dsp index f8ca325..e2c29d4 100644 --- a/source/qw_client.dsp +++ b/source/qw_client.dsp @@ -55,7 +55,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 dxguid.lib mglfx.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt" /out:"Release/qf-client-win.exe" +# ADD LINK32 dxguid.lib mglfx.lib wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlib.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt" /out:"Release/qf-client-win.exe" +# SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "qw_client - Win32 Debug" @@ -81,7 +82,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 dxguid.lib mglfx.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmt" /out:"Debug/qf-client-win.exe" /pdbtype:sept +# ADD LINK32 dxguid.lib mglfx.lib wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlibd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmt" /out:"Debug/qf-client-win.exe" /pdbtype:sept +# SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" @@ -108,7 +110,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 dxguid.lib ..\scitech\lib\win32\vc\mgllt.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 comctl32.lib opengl32.lib glu32.lib dxguid.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/qf-client-wgl.exe" /pdbtype:sept +# ADD LINK32 comctl32.lib opengl32.lib glu32.lib dxguid.lib wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlibd.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/qf-client-wgl.exe" /pdbtype:sept +# SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease" @@ -135,7 +138,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 dxguid.lib ..\scitech\lib\win32\vc\mgllt.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 comctl32.lib opengl32.lib glu32.lib dxguid.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /out:"Release/qf-client-wgl.exe" +# ADD LINK32 comctl32.lib opengl32.lib glu32.lib dxguid.lib wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlib.lib /nologo /subsystem:windows /machine:I386 /out:"Release/qf-client-wgl.exe" +# SUBTRACT LINK32 /nodefaultlib !ENDIF diff --git a/source/qw_server.dsp b/source/qw_server.dsp index 53da8e1..41bcbec 100644 --- a/source/qw_server.dsp +++ b/source/qw_server.dsp @@ -50,7 +50,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /machine:I386 /out:"Release/qf-server-win.exe" +# ADD LINK32 wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlib.lib /nologo /subsystem:console /machine:I386 /out:"Release/qf-server-win.exe" +# SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "qw_server - Win32 Debug" @@ -74,7 +75,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/qf-server-win.exe" /pdbtype:sept +# ADD LINK32 wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlibd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/qf-server-win.exe" /pdbtype:sept +# SUBTRACT LINK32 /nodefaultlib !ENDIF diff --git a/source/r_main.c b/source/r_main.c index 4cc8f2a..d326cc2 100644 --- a/source/r_main.c +++ b/source/r_main.c @@ -76,6 +76,8 @@ qboolean r_fov_greater_than_90; entity_t r_worldentity; +mplane_t frustum[4]; + // // view origin // diff --git a/source/sv_model.c b/source/sv_model.c index 27c5a8b..72ccba8 100644 --- a/source/sv_model.c +++ b/source/sv_model.c @@ -39,7 +39,8 @@ #include "sys.h" #include "pmove.h" -const int mod_lightmap_bytes=1; +const int mod_lightmap_bytes=1; +mplane_t frustum[4]; void Mod_LoadBrushModel (model_t *mod, void *buffer); diff --git a/tools/gas2masm/gas2masm.dsp b/tools/gas2masm/gas2masm.dsp index 20edfdf..a21e0a3 100644 --- a/tools/gas2masm/gas2masm.dsp +++ b/tools/gas2masm/gas2masm.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /W1 /WX /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c +# ADD CPP /nologo /WX /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /W1 /WX /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c +# ADD CPP /nologo /WX /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe