From 95a8c7e466fddaf02e3861d1724fa4cf34f644c8 Mon Sep 17 00:00:00 2001 From: Pontus Lidman Date: Wed, 14 Jun 2000 09:58:03 +0000 Subject: [PATCH] Patch for Windows NT/2000 IPv6 support from Florent Parent applied. --- common/cl_main.c | 18 +- common/net.h | 7 + common/net_udp6.c | 26 ++- qw_client/qw_client.dsp | 492 ++++++++++++++++++++++++++++++++++++++++ qw_server/qw_server.dsp | 43 ++++ uquake/uquake.dsp | 465 +++++++++++++++++++++++++++++++++++-- 6 files changed, 1023 insertions(+), 28 deletions(-) diff --git a/common/cl_main.c b/common/cl_main.c index e71a6a7..1a47134 100644 --- a/common/cl_main.c +++ b/common/cl_main.c @@ -41,6 +41,17 @@ #undef _LINT #endif +#ifdef _WIN32 +# include +# include +# include +# define _WINSOCKAPI_ +# define HAVE_SOCKLEN_T +#else +#include +#include +#endif + #include #include #ifdef QUAKEWORLD @@ -79,13 +90,6 @@ #define model_t sunmodel_t #endif -#ifdef _WIN32 -#include -#else -#include -#include -#endif - #ifdef __sun #undef model_t #endif diff --git a/common/net.h b/common/net.h index 018a901..fe959a8 100644 --- a/common/net.h +++ b/common/net.h @@ -38,6 +38,7 @@ #include #include + #define PORT_ANY -1 // Uncomment this line for IPv6 support @@ -50,6 +51,12 @@ struct qsockaddr }; +#ifdef _WIN32 +#ifdef HAVE_IPV6 +typedef unsigned int u_int32_t; +#endif +#endif + typedef struct { #ifdef HAVE_IPV6 diff --git a/common/net_udp6.c b/common/net_udp6.c index f2ee11b..c3392e5 100644 --- a/common/net_udp6.c +++ b/common/net_udp6.c @@ -30,6 +30,15 @@ $Id$ */ +#ifdef _WIN32 +# ifdef HAVE_IPV6 +# include +# include +# include +# define _WINSOCKAPI_ +# define HAVE_SOCKLEN_T +# endif +#endif #include #include #include @@ -41,7 +50,15 @@ /* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */ #define model_t quakeforgemodel_t +#ifdef _WIN32 +# include +# undef EWOULDBLOCK +# define EWOULDBLOCK WSAEWOULDBLOCK +#endif + +#ifndef _WIN32 #include +#endif #include #ifdef HAVE_SYS_IOCTL_H @@ -65,11 +82,6 @@ #undef model_t -#ifdef _WIN32 -# include -# undef EWOULDBLOCK -# define EWOULDBLOCK WSAEWOULDBLOCK -#endif #ifdef NeXT #include @@ -428,7 +440,11 @@ int UDP_OpenSocket (int port) if ((newsocket = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) == -1) Sys_Error ("UDP_OpenSocket: socket:", strerror(errno)); // FIONBIO sets non-blocking IO for this socket +#ifdef _WIN32 + if (ioctl (newsocket, FIONBIO, &_true) == -1) +#else /* _WIN32 */ if (ioctl (newsocket, FIONBIO, (char *)&_true) == -1) +#endif _WIN32 Sys_Error ("UDP_OpenSocket: ioctl FIONBIO:", strerror(errno)); #ifdef IPV6_BINDV6ONLY diff --git a/qw_client/qw_client.dsp b/qw_client/qw_client.dsp index 36daa75..2e936c8 100644 --- a/qw_client/qw_client.dsp +++ b/qw_client/qw_client.dsp @@ -21,6 +21,7 @@ CFG=qw_client - Win32 Debug !MESSAGE "qw_client - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "qw_client - Win32 GLRelease" (based on "Win32 (x86) Application") !MESSAGE "qw_client - Win32 GLDebug" (based on "Win32 (x86) Application") +!MESSAGE "qw_client - Win32 IPv6" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -144,6 +145,35 @@ LINK32=link.exe # ADD LINK32 comctl32.lib opengl32.lib glu32.lib dxguid.lib winmm.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 /nologo /subsystem:windows /incremental:yes /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"GLDebug/qw-client-wgl.exe" # SUBTRACT LINK32 /pdb:none +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "qw_client___Win32_IPv6" +# PROP BASE Intermediate_Dir "qw_client___Win32_IPv6" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "qw_client___Win32_IPv6" +# PROP Intermediate_Dir "qw_client___Win32_IPv6" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /WX /GX /O2 /I "../qw_client" /I "../common" /I "../win32" /I "../win32/vc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "QUAKEWORLD" /D "id386" /YX /FD /c +# ADD CPP /nologo /WX /GX /O2 /I "../qw_client" /I "../common" /I "../win32" /I "../win32/vc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "QUAKEWORLD" /D "id386" /D "HAVE_IPV6" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x419 /d "NDEBUG" +# ADD RSC /l 0x419 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 dxguid.lib winmm.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 mglfx.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /out:"Release/qw-client-win.exe" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 dxguid.lib winmm.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 mglfx.lib wship6.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /out:"Release/qw-client-win.exe" +# SUBTRACT LINK32 /pdb:none + !ENDIF # Begin Target @@ -152,6 +182,7 @@ LINK32=link.exe # Name "qw_client - Win32 Debug" # Name "qw_client - Win32 GLRelease" # Name "qw_client - Win32 GLDebug" +# Name "qw_client - Win32 IPv6" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -236,6 +267,8 @@ SOURCE=..\common\d_edge.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -256,6 +289,8 @@ SOURCE=..\common\d_fill.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -276,6 +311,8 @@ SOURCE=..\common\d_init.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -296,6 +333,8 @@ SOURCE=..\common\d_modech.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -316,6 +355,8 @@ SOURCE=..\common\d_part.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -336,6 +377,8 @@ SOURCE=..\common\d_polyse.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -356,6 +399,8 @@ SOURCE=..\common\d_scan.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -376,6 +421,8 @@ SOURCE=..\common\d_sky.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -396,6 +443,8 @@ SOURCE=..\common\d_sprite.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -416,6 +465,8 @@ SOURCE=..\common\d_surf.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -436,6 +487,8 @@ SOURCE=..\common\d_vars.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -456,6 +509,8 @@ SOURCE=..\common\d_zpoint.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -480,6 +535,8 @@ SOURCE=..\common\draw.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -503,6 +560,11 @@ SOURCE=..\common\gl_cl_parse.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -524,6 +586,11 @@ SOURCE=..\common\gl_draw.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -545,6 +612,11 @@ SOURCE=..\common\gl_mesh.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -564,6 +636,11 @@ SOURCE=..\common\gl_model.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -583,6 +660,11 @@ SOURCE=..\common\gl_ngraph.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -604,6 +686,11 @@ SOURCE=..\common\gl_refrag.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -623,6 +710,11 @@ SOURCE=..\common\gl_rlight.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -644,6 +736,11 @@ SOURCE=..\common\gl_rmain.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -665,6 +762,11 @@ SOURCE=..\common\gl_rmisc.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -684,6 +786,11 @@ SOURCE=..\common\gl_rpart.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -705,6 +812,11 @@ SOURCE=..\common\gl_rsurf.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -724,6 +836,11 @@ SOURCE=..\common\gl_screen.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -745,6 +862,11 @@ SOURCE=..\common\gl_test.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -764,6 +886,11 @@ SOURCE=..\common\gl_view.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -785,6 +912,11 @@ SOURCE=..\common\gl_warp.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -833,6 +965,8 @@ SOURCE=..\common\model.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -847,6 +981,48 @@ SOURCE=..\common\net_com.c # Begin Source File SOURCE=..\common\net_udp.c + +!IF "$(CFG)" == "qw_client - Win32 Release" + +!ELSEIF "$(CFG)" == "qw_client - Win32 Debug" + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLRelease" + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" + +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\common\net_udp6.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 GLRelease" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# ADD CPP /D "HAVE_IPV6" + +!ENDIF + # End Source File # Begin Source File @@ -868,6 +1044,11 @@ SOURCE=..\common\nonintel.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -920,6 +1101,8 @@ SOURCE=..\common\r_aclip.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -940,6 +1123,8 @@ SOURCE=..\common\r_alias.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -960,6 +1145,8 @@ SOURCE=..\common\r_bsp.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -980,6 +1167,8 @@ SOURCE=..\common\r_draw.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1000,6 +1189,8 @@ SOURCE=..\common\r_edge.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1020,6 +1211,8 @@ SOURCE=..\common\r_efrag.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1040,6 +1233,8 @@ SOURCE=..\common\r_light.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1060,6 +1255,8 @@ SOURCE=..\common\r_main.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1080,6 +1277,8 @@ SOURCE=..\common\r_misc.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1099,6 +1298,8 @@ SOURCE=..\common\r_part.c # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1119,6 +1320,8 @@ SOURCE=..\common\r_sky.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1139,6 +1342,8 @@ SOURCE=..\common\r_sprite.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1159,6 +1364,8 @@ SOURCE=..\common\r_surf.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1179,6 +1386,8 @@ SOURCE=..\common\r_vars.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1207,6 +1416,8 @@ SOURCE=..\common\screen.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1247,6 +1458,8 @@ SOURCE=.\sw_cl_parse.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1267,6 +1480,8 @@ SOURCE=..\common\sw_view.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1296,6 +1511,11 @@ SOURCE=..\common\vid_wgl.c !ELSEIF "$(CFG)" == "qw_client - Win32 GLDebug" +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1316,6 +1536,8 @@ SOURCE=..\common\vid_win.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + !ENDIF # End Source File @@ -1394,6 +1616,21 @@ InputName=d_draw # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\d_draw.s +InputName=d_draw + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1440,6 +1677,21 @@ InputName=d_draw16 # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\d_draw16.s +InputName=d_draw16 + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1486,6 +1738,21 @@ InputName=d_parta # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\d_parta.s +InputName=d_parta + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1532,6 +1799,21 @@ InputName=d_polysa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\d_polysa.s +InputName=d_polysa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1578,6 +1860,21 @@ InputName=d_scana # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\d_scana.s +InputName=d_scana + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1624,6 +1921,21 @@ InputName=d_spr8 # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\d_spr8.s +InputName=d_spr8 + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1670,6 +1982,21 @@ InputName=d_varsa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\d_varsa.s +InputName=d_varsa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1737,6 +2064,21 @@ InputName=math # End Custom Build +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\math.s +InputName=math + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1783,6 +2125,21 @@ InputName=r_aclipa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\r_aclipa.s +InputName=r_aclipa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1829,6 +2186,21 @@ InputName=r_aliasa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\r_aliasa.s +InputName=r_aliasa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1875,6 +2247,21 @@ InputName=r_drawa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\r_drawa.s +InputName=r_drawa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1921,6 +2308,21 @@ InputName=r_edgea # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\r_edgea.s +InputName=r_edgea + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1967,6 +2369,21 @@ InputName=r_varsa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\r_varsa.s +InputName=r_varsa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -2034,6 +2451,21 @@ InputName=snd_mixa # End Custom Build +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\snd_mixa.s +InputName=snd_mixa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -2080,6 +2512,21 @@ InputName=surf16 # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\surf16.s +InputName=surf16 + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -2126,6 +2573,21 @@ InputName=surf8 # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\surf8.s +InputName=surf8 + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -2193,6 +2655,21 @@ InputName=sys_dosa # End Custom Build +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\sys_dosa.s +InputName=sys_dosa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -2260,6 +2737,21 @@ InputName=worlda # End Custom Build +!ELSEIF "$(CFG)" == "qw_client - Win32 IPv6" + +# Begin Custom Build +OutDir=.\qw_client___Win32_IPv6 +InputPath=..\common\worlda.s +InputName=worlda + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File diff --git a/qw_server/qw_server.dsp b/qw_server/qw_server.dsp index 46a9c17..88f7923 100644 --- a/qw_server/qw_server.dsp +++ b/qw_server/qw_server.dsp @@ -19,6 +19,7 @@ CFG=qw_server - Win32 Debug !MESSAGE !MESSAGE "qw_server - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "qw_server - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "qw_server - Win32 IPv6" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -76,12 +77,39 @@ 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/qw-server-win.exe" /pdbtype:sept +!ELSEIF "$(CFG)" == "qw_server - Win32 IPv6" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "qw_server___Win32_IPv6" +# PROP BASE Intermediate_Dir "qw_server___Win32_IPv6" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "qw_server___Win32_IPv6" +# PROP Intermediate_Dir "qw_server___Win32_IPv6" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /WX /GX /O2 /I "../common" /I "../qw_server" /I "../win32" /I "../win32/vc" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "QUAKEWORLD" /D "SERVERONLY" /YX /FD /c +# ADD CPP /nologo /WX /GX /O2 /I "../common" /I "../qw_server" /I "../win32" /I "../win32/vc" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "QUAKEWORLD" /D "SERVERONLY" /D "HAVE_IPV6" /YX /FD /c +# ADD BASE RSC /l 0x419 /d "NDEBUG" +# ADD RSC /l 0x419 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE 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/qw-server-win.exe" +# 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 wship6.lib /nologo /subsystem:console /machine:I386 /out:"Release/qw-server-win.exe" +# SUBTRACT LINK32 /map + !ENDIF # Begin Target # Name "qw_server - Win32 Release" # Name "qw_server - Win32 Debug" +# Name "qw_server - Win32 IPv6" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -136,6 +164,21 @@ SOURCE=..\common\net_com.c # Begin Source File SOURCE=..\common\net_udp.c + +!IF "$(CFG)" == "qw_server - Win32 Release" + +!ELSEIF "$(CFG)" == "qw_server - Win32 Debug" + +!ELSEIF "$(CFG)" == "qw_server - Win32 IPv6" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\common\net_udp6.c # End Source File # Begin Source File diff --git a/uquake/uquake.dsp b/uquake/uquake.dsp index 41c11da..59b1c47 100644 --- a/uquake/uquake.dsp +++ b/uquake/uquake.dsp @@ -21,6 +21,7 @@ CFG=uquake - Win32 Debug !MESSAGE "uquake - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "uquake - Win32 GLRelease" (based on "Win32 (x86) Application") !MESSAGE "uquake - Win32 GLDebug" (based on "Win32 (x86) Application") +!MESSAGE "uquake - Win32 IPv6" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -139,6 +140,33 @@ LINK32=link.exe # ADD LINK32 comctl32.lib opengl32.lib glu32.lib dxguid.lib winmm.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 /nologo /subsystem:windows /incremental:yes /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"GLDebug/uquake-wgl.exe" # SUBTRACT LINK32 /pdb:none +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "uquake___Win32_IPv6" +# PROP BASE Intermediate_Dir "uquake___Win32_IPv6" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "uquake___Win32_IPv6" +# PROP Intermediate_Dir "uquake___Win32_IPv6" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /WX /GX /O2 /I "../uquake" /I "../common" /I "../win32" /I "../win32/vc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "UQUAKE" /D "id386" /YX /FD /c +# ADD CPP /nologo /WX /GX /O2 /I "../uquake" /I "../common" /I "../win32" /I "../win32/vc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "UQUAKE" /D "id386" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x419 /d "NDEBUG" +# ADD RSC /l 0x419 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 dxguid.lib winmm.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 mglfx.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /out:"Release/uquake-win.exe" +# ADD LINK32 dxguid.lib winmm.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 mglfx.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /out:"Release/uquake-win.exe" + !ENDIF # Begin Target @@ -147,6 +175,7 @@ LINK32=link.exe # Name "uquake - Win32 Debug" # Name "uquake - Win32 GLRelease" # Name "uquake - Win32 GLDebug" +# Name "uquake - Win32 IPv6" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -231,6 +260,8 @@ SOURCE=..\common\d_edge.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -251,6 +282,8 @@ SOURCE=..\common\d_fill.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -271,6 +304,8 @@ SOURCE=..\common\d_init.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -291,6 +326,8 @@ SOURCE=..\common\d_modech.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -311,6 +348,8 @@ SOURCE=..\common\d_part.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -331,6 +370,8 @@ SOURCE=..\common\d_polyse.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -351,6 +392,8 @@ SOURCE=..\common\d_scan.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -371,6 +414,8 @@ SOURCE=..\common\d_sky.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -391,6 +436,8 @@ SOURCE=..\common\d_sprite.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -411,6 +458,8 @@ SOURCE=..\common\d_surf.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -431,6 +480,8 @@ SOURCE=..\common\d_vars.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -451,6 +502,8 @@ SOURCE=..\common\d_zpoint.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -475,6 +528,8 @@ SOURCE=..\common\draw.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -498,6 +553,11 @@ SOURCE=..\common\gl_cl_parse.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -517,6 +577,11 @@ SOURCE=..\common\gl_draw.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -536,6 +601,11 @@ SOURCE=..\common\gl_mesh.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -555,6 +625,11 @@ SOURCE=..\common\gl_model.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -574,6 +649,11 @@ SOURCE=..\common\gl_refrag.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -593,6 +673,11 @@ SOURCE=..\common\gl_rlight.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -612,6 +697,11 @@ SOURCE=..\common\gl_rmain.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -631,6 +721,11 @@ SOURCE=..\common\gl_rmisc.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -650,6 +745,11 @@ SOURCE=..\common\gl_rpart.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -669,6 +769,11 @@ SOURCE=..\common\gl_rsurf.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -688,25 +793,11 @@ SOURCE=..\common\gl_screen.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\common\vid_wgl.c - -!IF "$(CFG)" == "uquake - Win32 Release" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" +# PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "uquake - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "uquake - Win32 GLRelease" - -!ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" - !ENDIF # End Source File @@ -726,6 +817,11 @@ SOURCE=..\common\gl_view.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -745,6 +841,11 @@ SOURCE=..\common\gl_warp.c !ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -797,6 +898,8 @@ SOURCE=..\common\model.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -889,6 +992,8 @@ SOURCE=..\common\r_aclip.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -909,6 +1014,8 @@ SOURCE=..\common\r_alias.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -929,6 +1036,8 @@ SOURCE=..\common\r_bsp.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -949,6 +1058,8 @@ SOURCE=..\common\r_draw.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -969,6 +1080,8 @@ SOURCE=..\common\r_edge.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -989,6 +1102,8 @@ SOURCE=..\common\r_efrag.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1009,6 +1124,8 @@ SOURCE=..\common\r_light.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1029,6 +1146,8 @@ SOURCE=..\common\r_main.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1049,6 +1168,8 @@ SOURCE=..\common\r_misc.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1068,6 +1189,8 @@ SOURCE=..\common\r_part.c # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1088,6 +1211,8 @@ SOURCE=..\common\r_sky.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1108,6 +1233,8 @@ SOURCE=..\common\r_sprite.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1128,6 +1255,8 @@ SOURCE=..\common\r_surf.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1148,6 +1277,8 @@ SOURCE=..\common\r_vars.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1176,6 +1307,8 @@ SOURCE=..\common\screen.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1228,6 +1361,8 @@ SOURCE=.\sw_cl_parse.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1248,6 +1383,8 @@ SOURCE=..\common\sw_view.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1261,6 +1398,30 @@ SOURCE=.\sys_win.c # End Source File # Begin Source File +SOURCE=..\common\vid_wgl.c + +!IF "$(CFG)" == "uquake - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "uquake - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "uquake - Win32 GLRelease" + +!ELSEIF "$(CFG)" == "uquake - Win32 GLDebug" + +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\common\vid_win.c !IF "$(CFG)" == "uquake - Win32 Release" @@ -1276,6 +1437,8 @@ SOURCE=..\common\vid_win.c # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + !ENDIF # End Source File @@ -1350,6 +1513,21 @@ InputName=d_draw # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\d_draw.s +InputName=d_draw + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1396,6 +1574,21 @@ InputName=d_draw16 # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\d_draw16.s +InputName=d_draw16 + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1442,6 +1635,21 @@ InputName=d_parta # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\d_parta.s +InputName=d_parta + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1488,6 +1696,21 @@ InputName=d_polysa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\d_polysa.s +InputName=d_polysa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1534,6 +1757,21 @@ InputName=d_scana # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\d_scana.s +InputName=d_scana + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1580,6 +1818,21 @@ InputName=d_spr8 # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\d_spr8.s +InputName=d_spr8 + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1626,6 +1879,21 @@ InputName=d_varsa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\d_varsa.s +InputName=d_varsa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1693,6 +1961,21 @@ InputName=math # End Custom Build +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\math.s +InputName=math + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1739,6 +2022,21 @@ InputName=r_aclipa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\r_aclipa.s +InputName=r_aclipa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1785,6 +2083,21 @@ InputName=r_aliasa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\r_aliasa.s +InputName=r_aliasa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1831,6 +2144,21 @@ InputName=r_drawa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\r_drawa.s +InputName=r_drawa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1877,6 +2205,21 @@ InputName=r_edgea # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\r_edgea.s +InputName=r_edgea + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1923,6 +2266,21 @@ InputName=r_varsa # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\r_varsa.s +InputName=r_varsa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -1990,6 +2348,21 @@ InputName=snd_mixa # End Custom Build +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\snd_mixa.s +InputName=snd_mixa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -2036,6 +2409,21 @@ InputName=surf16 # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\surf16.s +InputName=surf16 + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -2082,6 +2470,21 @@ InputName=surf8 # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\surf8.s +InputName=surf8 + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -2149,6 +2552,21 @@ InputName=sys_dosa # End Custom Build +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\sys_dosa.s +InputName=sys_dosa + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File @@ -2216,6 +2634,21 @@ InputName=worlda # End Custom Build +!ELSEIF "$(CFG)" == "uquake - Win32 IPv6" + +# Begin Custom Build +OutDir=.\uquake___Win32_IPv6 +InputPath=..\common\worlda.s +InputName=worlda + +"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /D "id386" /I "..\common" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) + ..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm + ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm + del $(OUTDIR)\$(InputName).spp + +# End Custom Build + !ENDIF # End Source File