From 28c972a3fd2ee914c26e526ebfc1422885548f9a Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Thu, 2 Nov 2000 07:38:41 +0000 Subject: [PATCH] get vc projects building again --- include/win32/vc/config.h | 5 ++ source/qw_client.dsp | 141 +++++++++++++++++++++++++++++++++----- source/qw_server.dsp | 9 +++ 3 files changed, 136 insertions(+), 19 deletions(-) diff --git a/include/win32/vc/config.h b/include/win32/vc/config.h index 01b07a8..a27ff00 100644 --- a/include/win32/vc/config.h +++ b/include/win32/vc/config.h @@ -34,6 +34,8 @@ #ifndef _CONFIG_H #define _CONFIG_H +#pragma warning( disable : 4761) + /* Define to empty if the keyword does not work. */ #undef const @@ -246,6 +248,9 @@ /* Define if you have the zlib library (-lz). */ #define HAVE_ZLIB +/* Define if you have a sane fnmatch.h */ +#define HAVE_FNMATCH_PROTO + /* 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 2263a4a..431447b 100644 --- a/source/qw_client.dsp +++ b/source/qw_client.dsp @@ -512,6 +512,25 @@ SOURCE=.\fnmatch.c # End Source File # Begin Source File +SOURCE=.\fractalnoise.c + +!IF "$(CFG)" == "qw_client - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\gl_draw.c !IF "$(CFG)" == "qw_client - Win32 Release" @@ -531,6 +550,63 @@ SOURCE=.\gl_draw.c # End Source File # Begin Source File +SOURCE=.\gl_dyn_fires.c + +!IF "$(CFG)" == "qw_client - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\gl_dyn_part.c + +!IF "$(CFG)" == "qw_client - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\gl_dyn_textures.c + +!IF "$(CFG)" == "qw_client - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\gl_mesh.c !IF "$(CFG)" == "qw_client - Win32 Release" @@ -645,25 +721,6 @@ SOURCE=.\gl_ngraph.c # End Source File # Begin Source File -SOURCE=.\gl_part.c - -!IF "$(CFG)" == "qw_client - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "qw_client - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" - -!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\gl_refrag.c !IF "$(CFG)" == "qw_client - Win32 Release" @@ -778,6 +835,25 @@ SOURCE=.\gl_screen.c # End Source File # Begin Source File +SOURCE=.\gl_sky.c + +!IF "$(CFG)" == "qw_client - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\gl_trans.c !IF "$(CFG)" == "qw_client - Win32 Release" @@ -915,6 +991,10 @@ SOURCE=.\qendian.c # End Source File # Begin Source File +SOURCE=..\include\win32\resources\quakeforge.rc +# End Source File +# Begin Source File + SOURCE=.\quakefs.c # End Source File # Begin Source File @@ -1324,6 +1404,25 @@ SOURCE=.\teamplay.c # End Source File # Begin Source File +SOURCE=.\tga.c + +!IF "$(CFG)" == "qw_client - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\va.c # End Source File # Begin Source File @@ -1380,6 +1479,10 @@ SOURCE=.\zone.c # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=..\include\win32\resources\icon1.ico +# End Source File # End Group # Begin Group "Asm Files" diff --git a/source/qw_server.dsp b/source/qw_server.dsp index ebbe324..ce3b9ae 100644 --- a/source/qw_server.dsp +++ b/source/qw_server.dsp @@ -121,6 +121,11 @@ SOURCE=.\fnmatch.c # End Source File # Begin Source File +SOURCE=.\gl_sky.c +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=.\info.c # End Source File # Begin Source File @@ -197,6 +202,10 @@ SOURCE=.\qendian.c # End Source File # Begin Source File +SOURCE=..\include\win32\resources\quakeforge.rc +# End Source File +# Begin Source File + SOURCE=.\quakefs.c # End Source File # Begin Source File