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
This commit is contained in:
TimeServ
parent
273dedc28c
commit
3d355984f2
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -3,7 +3,7 @@
|
|||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Name="gas2masm"
|
||||
ProjectGUID="{E9BED2C3-4D4D-429D-8C33-7D5E6787A7EB}"
|
||||
ProjectGUID="{382E6790-D1CA-48F5-8E53-D114635EB61D}"
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
RuntimeLibrary="1"
|
||||
PrecompiledHeaderFile="..\gas2masm\Debug\gas2masm.pch"
|
||||
|
|
@ -52,6 +52,8 @@
|
|||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="1"
|
||||
DisableSpecificWarnings="4996"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
|
|
|
|||
Loading…
Reference in New Issue