mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-21 19:51:18 +00:00
get MSVC back up and running again.
This commit is contained in:
parent
7634d8f3f7
commit
8290955813
4 changed files with 50 additions and 39 deletions
|
@ -36,6 +36,8 @@
|
|||
|
||||
#pragma warning( disable : 4761)
|
||||
|
||||
/* fix the retarded malloc.h problem */
|
||||
#define alloca _alloca
|
||||
// disable data conversion warnings
|
||||
# pragma warning(disable : 4051) // ALPHA
|
||||
# pragma warning(disable : 4136) // X86
|
||||
|
@ -260,6 +262,9 @@
|
|||
/* Define if you have a sane fnmatch.h */
|
||||
#define HAVE_FNMATCH_PROTO
|
||||
|
||||
/* Define this to something appropriate for declaring 0 length arrays */
|
||||
#define ZERO_LENGTH_ARRAY 0
|
||||
|
||||
/* Posix, needed for limits.h and Unix stuffs to work right */
|
||||
#define _POSIX_
|
||||
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "console.h"
|
||||
|
|
|
@ -138,7 +138,7 @@ 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 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"
|
||||
# ADD LINK32 libc.lib 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
|
||||
|
@ -721,25 +721,6 @@ SOURCE=.\gl_ngraph.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\gl_refrag.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_rlight.c
|
||||
|
||||
!IF "$(CFG)" == "qw_client - Win32 Release"
|
||||
|
@ -930,6 +911,10 @@ SOURCE=.\gl_warp.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\hash.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\in_win.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -938,6 +923,10 @@ SOURCE=.\info.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\joy_win.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\keys.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -994,6 +983,10 @@ SOURCE=.\net_udp.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\pcx.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\pmove.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -1010,6 +1003,25 @@ SOURCE=.\qendian.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\qfgl_ext.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=..\include\win32\resources\quakeforge.rc
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -1118,21 +1130,6 @@ SOURCE=.\r_edge.c
|
|||
# Begin Source File
|
||||
|
||||
SOURCE=.\r_efrag.c
|
||||
|
||||
!IF "$(CFG)" == "qw_client - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "qw_client - Win32 Debug"
|
||||
|
||||
!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug"
|
||||
|
||||
# PROP Exclude_From_Build 1
|
||||
|
||||
!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease"
|
||||
|
||||
# PROP Exclude_From_Build 1
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
|
|
@ -131,6 +131,10 @@ SOURCE=.\gl_sky_clip.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\hash.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\info.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -183,10 +187,6 @@ SOURCE=.\pmovetst.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\pr_cmds.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\pr_edict.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@ -263,6 +263,14 @@ SOURCE=.\sv_phys.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\sv_pr_cmds.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\sv_progs.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\sv_send.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
Loading…
Reference in a new issue