From 3d355984f2874c042d01fcc72142c7d72c02ac79 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Tue, 7 Aug 2007 16:11:30 +0000 Subject: [PATCH] attempting to fix builds and update the 2005 project git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2580 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/bothdefs.h | 12 + engine/d3d/d3d_mesh.c | 4 +- engine/d3d9/d3d9_mesh.c | 4 +- engine/d3d9/d3d9_rmain.c | 9 +- engine/dotnet2005/ftequake.sln | 115 +- engine/dotnet2005/ftequake.vcproj | 4087 +++++++++++++++++++++++++---- engine/dotnet2005/gas2masm.vcproj | 6 +- 7 files changed, 3595 insertions(+), 642 deletions(-) diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h index 32d17b2c4..6aad8f894 100644 --- a/engine/common/bothdefs.h +++ b/engine/common/bothdefs.h @@ -199,6 +199,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #undef TERRAIN #undef Q3CLIENT #endif + + // undefine things not supported yet for D3D + #if defined(D3DQUAKE) && !defined(GLQUAKE) + #undef DDS // this is dumb + #undef HALFLIFEMODELS + #undef Q3BSPS + #undef Q3CLIENT + #undef Q2BSPS + #undef Q2CLIENT + #undef Q2SERVER + #endif + #endif #if !defined(GLQUAKE) diff --git a/engine/d3d/d3d_mesh.c b/engine/d3d/d3d_mesh.c index cdc00eb87..55e7f7b52 100644 --- a/engine/d3d/d3d_mesh.c +++ b/engine/d3d/d3d_mesh.c @@ -105,8 +105,8 @@ static galiastexnum_t *D3D_ChooseSkin(galiasinfo_t *inf, char *modelname, int su { if (!e->scoreboard->skin) Skin_Find(e->scoreboard); - tc = e->scoreboard->topcolor; - bc = e->scoreboard->bottomcolor; + tc = e->scoreboard->ttopcolor; + bc = e->scoreboard->tbottomcolor; //colour forcing if (cl.splitclients<2 && !(cl.fpd & FPD_NO_FORCE_COLOR)) //no colour/skin forcing in splitscreen. diff --git a/engine/d3d9/d3d9_mesh.c b/engine/d3d9/d3d9_mesh.c index 04b5e7800..44e85df67 100644 --- a/engine/d3d9/d3d9_mesh.c +++ b/engine/d3d9/d3d9_mesh.c @@ -107,8 +107,8 @@ static galiastexnum_t *D3D9_ChooseSkin(galiasinfo_t *inf, char *modelname, int s { if (!e->scoreboard->skin) Skin_Find(e->scoreboard); - tc = e->scoreboard->topcolor; - bc = e->scoreboard->bottomcolor; + tc = e->scoreboard->ttopcolor; + bc = e->scoreboard->tbottomcolor; //colour forcing if (cl.splitclients<2 && !(cl.fpd & FPD_NO_FORCE_COLOR)) //no colour/skin forcing in splitscreen. diff --git a/engine/d3d9/d3d9_rmain.c b/engine/d3d9/d3d9_rmain.c index 6ef62765e..a30ce85a2 100644 --- a/engine/d3d9/d3d9_rmain.c +++ b/engine/d3d9/d3d9_rmain.c @@ -962,10 +962,15 @@ static void D3D9_DrawSpriteModel (entity_t *e) 0, 2, 3 }; - if (e->forcedshader || !e->model) +#ifdef Q3SHADERS + mpic_t *pic = e->forcedshader; +#else + mpic_t *pic = NULL; +#endif + + if (pic || !e->model) { int colour; - mpic_t *pic = e->forcedshader; colour = 0; diff --git a/engine/dotnet2005/ftequake.sln b/engine/dotnet2005/ftequake.sln index 8e4be8998..21f3e2b03 100644 --- a/engine/dotnet2005/ftequake.sln +++ b/engine/dotnet2005/ftequake.sln @@ -1,15 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftequake", "ftequake.vcproj", "{91EB8023-5BC5-422A-B55E-1A25F25F5AE1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftequake", "ftequake.vcproj", "{88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}" ProjectSection(ProjectDependencies) = postProject - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB} = {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB} + {382E6790-D1CA-48F5-8E53-D114635EB61D} = {382E6790-D1CA-48F5-8E53-D114635EB61D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gas2masm", "gas2masm.vcproj", "{E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gas2masm", "gas2masm.vcproj", "{382E6790-D1CA-48F5-8E53-D114635EB61D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + D3DDebug|Win32 = D3DDebug|Win32 Debug Dedicated Server|Win32 = Debug Dedicated Server|Win32 Debug Dedicated ServerQ3|Win32 = Debug Dedicated ServerQ3|Win32 Debug|Win32 = Debug|Win32 @@ -25,58 +26,62 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Debug Dedicated Server|Win32.ActiveCfg = Debug Dedicated Server|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Debug Dedicated Server|Win32.Build.0 = Debug Dedicated Server|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Debug Dedicated ServerQ3|Win32.ActiveCfg = Debug Dedicated ServerQ3|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Debug Dedicated ServerQ3|Win32.Build.0 = Debug Dedicated ServerQ3|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Debug|Win32.ActiveCfg = Debug|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Debug|Win32.Build.0 = Debug|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.GLDebug|Win32.ActiveCfg = GLDebug|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.GLDebug|Win32.Build.0 = GLDebug|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.GLDebugQ3|Win32.ActiveCfg = GLDebugQ3|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.GLDebugQ3|Win32.Build.0 = GLDebugQ3|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.GLRelease|Win32.ActiveCfg = GLRelease|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.GLRelease|Win32.Build.0 = GLRelease|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MDebug|Win32.ActiveCfg = MDebug|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MDebug|Win32.Build.0 = MDebug|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MinGLDebug|Win32.ActiveCfg = MinGLDebug|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MinGLDebug|Win32.Build.0 = MinGLDebug|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MinGLRelease|Win32.ActiveCfg = MinGLRelease|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MinGLRelease|Win32.Build.0 = MinGLRelease|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MinSW|Win32.ActiveCfg = MinSW|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MinSW|Win32.Build.0 = MinSW|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MRelease|Win32.ActiveCfg = MRelease|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.MRelease|Win32.Build.0 = MRelease|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Release Dedicated Server|Win32.ActiveCfg = Release Dedicated Server|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Release Dedicated Server|Win32.Build.0 = Release Dedicated Server|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Release|Win32.ActiveCfg = Release|Win32 - {91EB8023-5BC5-422A-B55E-1A25F25F5AE1}.Release|Win32.Build.0 = Release|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Debug Dedicated Server|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Debug Dedicated Server|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Debug Dedicated ServerQ3|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Debug Dedicated ServerQ3|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Debug|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.GLDebug|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.GLDebug|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.GLDebugQ3|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.GLDebugQ3|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.GLRelease|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.GLRelease|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MDebug|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MDebug|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MinGLDebug|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MinGLDebug|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MinGLRelease|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MinGLRelease|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MinSW|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MinSW|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MRelease|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.MRelease|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Release Dedicated Server|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Release Dedicated Server|Win32.Build.0 = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Release|Win32.ActiveCfg = Debug|Win32 - {E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}.Release|Win32.Build.0 = Debug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.D3DDebug|Win32.ActiveCfg = D3DDebug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.D3DDebug|Win32.Build.0 = D3DDebug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Debug Dedicated Server|Win32.ActiveCfg = Debug Dedicated Server|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Debug Dedicated Server|Win32.Build.0 = Debug Dedicated Server|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Debug Dedicated ServerQ3|Win32.ActiveCfg = Debug Dedicated ServerQ3|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Debug Dedicated ServerQ3|Win32.Build.0 = Debug Dedicated ServerQ3|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Debug|Win32.ActiveCfg = Debug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Debug|Win32.Build.0 = Debug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.GLDebug|Win32.ActiveCfg = GLDebug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.GLDebug|Win32.Build.0 = GLDebug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.GLDebugQ3|Win32.ActiveCfg = GLDebugQ3|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.GLDebugQ3|Win32.Build.0 = GLDebugQ3|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.GLRelease|Win32.ActiveCfg = GLRelease|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.GLRelease|Win32.Build.0 = GLRelease|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MDebug|Win32.ActiveCfg = MDebug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MDebug|Win32.Build.0 = MDebug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MinGLDebug|Win32.ActiveCfg = MinGLDebug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MinGLDebug|Win32.Build.0 = MinGLDebug|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MinGLRelease|Win32.ActiveCfg = MinGLRelease|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MinGLRelease|Win32.Build.0 = MinGLRelease|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MinSW|Win32.ActiveCfg = MinSW|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MinSW|Win32.Build.0 = MinSW|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MRelease|Win32.ActiveCfg = MRelease|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.MRelease|Win32.Build.0 = MRelease|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Release Dedicated Server|Win32.ActiveCfg = Release Dedicated Server|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Release Dedicated Server|Win32.Build.0 = Release Dedicated Server|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Release|Win32.ActiveCfg = Release|Win32 + {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}.Release|Win32.Build.0 = Release|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.D3DDebug|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.D3DDebug|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Debug Dedicated Server|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Debug Dedicated Server|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Debug Dedicated ServerQ3|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Debug Dedicated ServerQ3|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Debug|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Debug|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.GLDebug|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.GLDebug|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.GLDebugQ3|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.GLDebugQ3|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.GLRelease|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.GLRelease|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MDebug|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MDebug|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MinGLDebug|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MinGLDebug|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MinGLRelease|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MinGLRelease|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MinSW|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MinSW|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MRelease|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.MRelease|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Release Dedicated Server|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Release Dedicated Server|Win32.Build.0 = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Release|Win32.ActiveCfg = Debug|Win32 + {382E6790-D1CA-48F5-8E53-D114635EB61D}.Release|Win32.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/engine/dotnet2005/ftequake.vcproj b/engine/dotnet2005/ftequake.vcproj index 6e50b095c..1b54772d6 100644 --- a/engine/dotnet2005/ftequake.vcproj +++ b/engine/dotnet2005/ftequake.vcproj @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="ftequake" - ProjectGUID="{91EB8023-5BC5-422A-B55E-1A25F25F5AE1}" + ProjectGUID="{88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}" > + + + + + + + + + + + + + + + + + + + + @@ -1206,7 +1307,7 @@ + + + @@ -1439,7 +1549,7 @@ + + + @@ -1631,6 +1751,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -1765,6 +1895,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -1899,6 +2039,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -2033,6 +2183,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -2167,6 +2327,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -2301,6 +2471,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -2435,6 +2615,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -2569,6 +2759,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -2703,6 +2903,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -2837,6 +3047,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -2971,6 +3191,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -3105,6 +3335,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -3239,6 +3479,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -3373,6 +3623,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -3507,6 +3767,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -3641,6 +3911,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -3775,6 +4055,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -3909,6 +4199,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -4043,6 +4343,15 @@ PreprocessorDefinitions="" /> + + + @@ -4171,6 +4480,16 @@ PrecompiledHeaderThrough="qwsvdef.h" /> + + + @@ -4308,6 +4627,15 @@ PreprocessorDefinitions="" /> + + + @@ -4408,8 +4736,6 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - WarningLevel="4" - Detect64BitPortabilityProblems="true" /> + + + @@ -4559,6 +4894,15 @@ PreprocessorDefinitions="" /> + + + @@ -4687,6 +5031,15 @@ PreprocessorDefinitions="" /> + + + @@ -4811,6 +5164,15 @@ PreprocessorDefinitions="" /> + + + @@ -4935,6 +5297,15 @@ PreprocessorDefinitions="" /> + + + @@ -5058,6 +5429,15 @@ PreprocessorDefinitions="" /> + + + @@ -5182,6 +5562,15 @@ PreprocessorDefinitions="" /> + + + @@ -5306,6 +5695,15 @@ PreprocessorDefinitions="" /> + + + @@ -5430,6 +5828,15 @@ PreprocessorDefinitions="" /> + + + @@ -5554,6 +5961,15 @@ PreprocessorDefinitions="" /> + + + @@ -5678,6 +6094,15 @@ PreprocessorDefinitions="" /> + + + @@ -5802,6 +6227,15 @@ PreprocessorDefinitions="" /> + + + @@ -5926,6 +6360,15 @@ PreprocessorDefinitions="" /> + + + @@ -6051,6 +6494,15 @@ PreprocessorDefinitions="" /> + + + @@ -6177,6 +6629,15 @@ PreprocessorDefinitions="" /> + + + @@ -6305,6 +6766,15 @@ PreprocessorDefinitions="" /> + + + @@ -6429,6 +6899,15 @@ PreprocessorDefinitions="" /> + + + @@ -6553,6 +7032,15 @@ PreprocessorDefinitions="" /> + + + @@ -6677,6 +7165,15 @@ PreprocessorDefinitions="" /> + + + @@ -6801,6 +7298,15 @@ PreprocessorDefinitions="" /> + + + @@ -6925,6 +7431,15 @@ PreprocessorDefinitions="" /> + + + @@ -7049,6 +7564,15 @@ PreprocessorDefinitions="" /> + + + @@ -7173,6 +7697,15 @@ PreprocessorDefinitions="" /> + + + @@ -7298,6 +7831,15 @@ PreprocessorDefinitions="" /> + + + @@ -7422,6 +7964,15 @@ PreprocessorDefinitions="" /> + + + @@ -7546,6 +8097,15 @@ PreprocessorDefinitions="" /> + + + @@ -7670,6 +8230,15 @@ PreprocessorDefinitions="" /> + + + @@ -7794,6 +8363,15 @@ PreprocessorDefinitions="" /> + + + @@ -7918,6 +8496,15 @@ PreprocessorDefinitions="" /> + + + @@ -8042,6 +8629,15 @@ PreprocessorDefinitions="" /> + + + @@ -8167,6 +8763,15 @@ PreprocessorDefinitions="" /> + + + @@ -8291,6 +8896,15 @@ PreprocessorDefinitions="" /> + + + @@ -8417,6 +9031,15 @@ PreprocessorDefinitions="" /> + + + @@ -8541,6 +9164,15 @@ PreprocessorDefinitions="" /> + + + @@ -8665,6 +9297,15 @@ PreprocessorDefinitions="" /> + + + @@ -8790,6 +9431,16 @@ UsePrecompiledHeader="0" /> + + + @@ -8926,6 +9577,15 @@ PreprocessorDefinitions="" /> + + + @@ -9050,6 +9710,15 @@ PreprocessorDefinitions="" /> + + + @@ -9174,6 +9843,15 @@ PreprocessorDefinitions="" /> + + + @@ -9299,6 +9977,15 @@ PreprocessorDefinitions="" /> + + + @@ -9423,6 +10110,15 @@ PreprocessorDefinitions="" /> + + + @@ -9547,6 +10243,15 @@ PreprocessorDefinitions="" /> + + + @@ -9671,6 +10376,15 @@ PreprocessorDefinitions="" /> + + + @@ -9795,6 +10509,15 @@ PreprocessorDefinitions="" /> + + + @@ -9919,6 +10642,15 @@ PreprocessorDefinitions="" /> + + + @@ -10043,6 +10775,15 @@ PreprocessorDefinitions="" /> + + + @@ -10167,6 +10908,15 @@ PreprocessorDefinitions="" /> + + + @@ -10291,6 +11041,15 @@ PreprocessorDefinitions="" /> + + + @@ -10415,6 +11174,15 @@ PreprocessorDefinitions="" /> + + + @@ -10539,6 +11307,15 @@ PreprocessorDefinitions="" /> + + + @@ -10663,6 +11440,15 @@ PreprocessorDefinitions="" /> + + + @@ -10787,6 +11573,15 @@ PreprocessorDefinitions="" /> + + + @@ -10911,6 +11706,15 @@ PreprocessorDefinitions="" /> + + + @@ -11035,6 +11839,15 @@ PreprocessorDefinitions="" /> + + + @@ -11165,6 +11978,16 @@ PreprocessorDefinitions="" /> + + + + + @@ -11298,6 +12125,15 @@ PreprocessorDefinitions="" /> + + + @@ -11421,6 +12257,15 @@ PreprocessorDefinitions="" /> + + + @@ -11538,20 +12383,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -11599,6 +12525,15 @@ PreprocessorDefinitions="" /> + + + @@ -11726,6 +12661,16 @@ UsePrecompiledHeader="0" /> + + + @@ -11864,6 +12809,15 @@ PreprocessorDefinitions="" /> + + + @@ -11987,6 +12941,15 @@ PreprocessorDefinitions="" /> + + + @@ -12114,6 +13077,15 @@ PreprocessorDefinitions="" /> + + + @@ -12240,6 +13212,15 @@ PreprocessorDefinitions="" /> + + + @@ -12366,6 +13347,15 @@ PreprocessorDefinitions="" /> + + + @@ -12492,6 +13482,15 @@ PreprocessorDefinitions="" /> + + + @@ -12613,6 +13612,15 @@ PreprocessorDefinitions="" /> + + + @@ -12739,6 +13747,15 @@ PreprocessorDefinitions="" /> + + + @@ -12865,6 +13882,15 @@ PreprocessorDefinitions="" /> + + + @@ -12991,6 +14017,15 @@ PreprocessorDefinitions="" /> + + + @@ -13117,6 +14152,15 @@ PreprocessorDefinitions="" /> + + + @@ -13243,6 +14287,15 @@ PreprocessorDefinitions="" /> + + + @@ -13365,6 +14418,15 @@ PreprocessorDefinitions="" /> + + + @@ -13491,6 +14553,15 @@ PreprocessorDefinitions="" /> + + + @@ -13617,6 +14688,15 @@ PreprocessorDefinitions="" /> + + + @@ -13743,6 +14823,15 @@ PreprocessorDefinitions="" /> + + + @@ -13870,6 +14959,15 @@ PreprocessorDefinitions="" /> + + + @@ -13985,6 +15083,10 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -18256,7 +19687,15 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="1" + /> + + + @@ -18393,6 +19820,16 @@ UsePrecompiledHeader="1" /> + + + @@ -18526,6 +19963,15 @@ PreprocessorDefinitions="" /> + + + @@ -18647,6 +20093,15 @@ PreprocessorDefinitions="" /> + + + @@ -18768,6 +20223,15 @@ PreprocessorDefinitions="" /> + + + @@ -18889,6 +20353,15 @@ PreprocessorDefinitions="" /> + + + @@ -19010,6 +20483,15 @@ PreprocessorDefinitions="" /> + + + @@ -19131,6 +20613,15 @@ PreprocessorDefinitions="" /> + + + @@ -19253,6 +20744,16 @@ UsePrecompiledHeader="0" /> + + + @@ -19386,6 +20887,15 @@ PreprocessorDefinitions="" /> + + + @@ -19507,6 +21017,15 @@ PreprocessorDefinitions="" /> + + + @@ -19628,6 +21147,15 @@ PreprocessorDefinitions="" /> + + + @@ -19749,6 +21277,15 @@ PreprocessorDefinitions="" /> + + + @@ -19870,6 +21407,15 @@ PreprocessorDefinitions="" /> + + + @@ -19991,6 +21537,15 @@ PreprocessorDefinitions="" /> + + + @@ -20112,6 +21667,15 @@ PreprocessorDefinitions="" /> + + + @@ -20234,6 +21798,15 @@ PreprocessorDefinitions="" /> + + + @@ -20356,6 +21929,15 @@ PreprocessorDefinitions="" /> + + + @@ -20477,6 +22059,15 @@ PreprocessorDefinitions="" /> + + + @@ -20598,6 +22189,15 @@ PreprocessorDefinitions="" /> + + + @@ -20716,7 +22316,16 @@ > + + + + + @@ -20861,6 +22472,16 @@ UsePrecompiledHeader="0" /> + + + @@ -20987,7 +22608,16 @@ > + + + + + + + + + + + + + + + + + + + + @@ -21703,7 +23373,6 @@ + + + @@ -21840,7 +23518,6 @@ + + + @@ -21977,7 +23663,6 @@ + + + + + + @@ -22251,7 +23952,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -23279,6 +25043,14 @@ Name="VCCustomBuildTool" /> + + + + + + + + + + + + + + + + + + @@ -23962,6 +25775,14 @@ Name="VCCustomBuildTool" /> + + + + + + + + + @@ -24307,6 +26145,15 @@ Outputs="$(OUTDIR)\$(InputName).obj" /> + + + @@ -24432,6 +26279,15 @@ PreprocessorDefinitions="" /> + + + @@ -24554,6 +26410,15 @@ PreprocessorDefinitions="" /> + + + @@ -24676,6 +26541,15 @@ PreprocessorDefinitions="" /> + + + @@ -24798,6 +26672,15 @@ PreprocessorDefinitions="" /> + + + @@ -24908,6 +26791,10 @@ /> + + @@ -24921,6 +26808,16 @@ UsePrecompiledHeader="0" /> + + + @@ -25054,6 +26951,15 @@ PreprocessorDefinitions="" /> + + + @@ -25181,6 +27087,16 @@ PreprocessorDefinitions="" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +