get it building on windows again.

cl_main.c:
    added #include "winquake.h" back in, since ming and msvc
    wouldn't build without it

qw_client.dsp and makefile.mgw:
    added vid_win.c
    (need to rename qw_*.dsp to qf_*.dsp one of these days...)
This commit is contained in:
Thad Ward 2001-01-25 04:56:27 +00:00
parent 0ec668bc4e
commit 04d66b0952
3 changed files with 44 additions and 39 deletions

View file

@ -86,6 +86,7 @@
#include "vid.h"
#include "view.h"
#include "va.h"
#include "winquake.h"
#ifdef __sun
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */

View file

@ -82,7 +82,7 @@ WIN32_OTHER = cd_win.c joy_win.c in_win.c
client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
cl_main.c cl_misc.c cl_parse.c cl_pred.c cl_slist.c cl_tent.c \
console.c keys.c menu.c model_alias.c model_sprite.c nonintel.c \
pcx.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c vid.c $(client_ASM)
pcx.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c vid.c vid_win.c $(client_ASM)
#
# OPENGL rendering

View file

@ -218,25 +218,6 @@ SOURCE=.\cl_tent.c
# End Source File
# Begin Source File
SOURCE=.\sw_skin.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
SOURCE=.\cmd.c
# End Source File
# Begin Source File
@ -816,6 +797,25 @@ SOURCE=.\gl_screen.c
# End Source File
# Begin Source File
SOURCE=.\gl_skin.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_sky.c
!IF "$(CFG)" == "qw_client - Win32 Release"
@ -854,25 +854,6 @@ SOURCE=.\gl_sky_clip.c
# End Source File
# Begin Source File
SOURCE=.\gl_skin.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_view.c
!IF "$(CFG)" == "qw_client - Win32 Release"
@ -1393,6 +1374,25 @@ SOURCE=.\sw_model_sprite.c
# End Source File
# Begin Source File
SOURCE=.\sw_skin.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
SOURCE=.\sw_view.c
!IF "$(CFG)" == "qw_client - Win32 Release"
@ -1481,6 +1481,10 @@ SOURCE=.\vid_wgl.c
# End Source File
# Begin Source File
SOURCE=.\vid_win.c
# End Source File
# Begin Source File
SOURCE=.\wad.c
# End Source File
# Begin Source File