mirror of
https://github.com/ZDoom/zdbsp.git
synced 2024-11-21 11:21:19 +00:00
- Bumped ZDBSP version to 1.16.
- Fixed: ZDBSP stored seg vertices in 16-bit words, so it failed to write proper nodes for maps that ended up with more than 65536 vertices after node building, even though it can write formats that could support it. - Sync debugging output between ZDBSP and ZDoom's internal node builder. SVN r2388 (trunk)
This commit is contained in:
Randy Heit
parent
b486edd60e
commit
594e1fd562
10 changed files with 345 additions and 298 deletions
12
doomdata.h
12
doomdata.h
|
|
@ -129,6 +129,16 @@ struct MapSeg
|
|||
short offset;
|
||||
};
|
||||
|
||||
struct MapSegEx
|
||||
{
|
||||
DWORD v1;
|
||||
DWORD v2;
|
||||
WORD angle;
|
||||
WORD linedef;
|
||||
short side;
|
||||
short offset;
|
||||
};
|
||||
|
||||
struct MapSegGL
|
||||
{
|
||||
WORD v1;
|
||||
|
|
@ -219,7 +229,7 @@ struct FLevel
|
|||
TArray<IntSector> Sectors;
|
||||
TArray<IntThing> Things;
|
||||
MapSubsectorEx *Subsectors; int NumSubsectors;
|
||||
MapSeg *Segs; int NumSegs;
|
||||
MapSegEx *Segs; int NumSegs;
|
||||
MapNodeEx *Nodes; int NumNodes;
|
||||
WORD *Blockmap; int BlockmapSize;
|
||||
BYTE *Reject; int RejectSize;
|
||||
|
|
|
|||
|
|
@ -433,6 +433,8 @@ int FNodeBuilder::SelectSplitter (DWORD set, node_t &node, DWORD &splitseg, int
|
|||
|
||||
memset (&PlaneChecked[0], 0, PlaneChecked.Size());
|
||||
|
||||
D(printf("Processing set %d\n", set));
|
||||
|
||||
while (seg != DWORD_MAX)
|
||||
{
|
||||
FPrivSeg *pseg = &Segs[seg];
|
||||
|
|
@ -454,8 +456,8 @@ int FNodeBuilder::SelectSplitter (DWORD set, node_t &node, DWORD &splitseg, int
|
|||
|
||||
int value = Heuristic (node, set, nosplit);
|
||||
|
||||
D(Printf ("Seg %5d%c(%5d,%5d)-(%5d,%5d) scores %d\n", seg,
|
||||
Segs[seg].linedef == -1 ? '+' : ' ',
|
||||
D(Printf ("Seg %5d, ld %d (%5d,%5d)-(%5d,%5d) scores %d\n", seg,
|
||||
Segs[seg].linedef,
|
||||
node.x>>16, node.y>>16,
|
||||
(node.x+node.dx)>>16, (node.y+node.dy)>>16, value));
|
||||
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ public:
|
|||
|
||||
void GetVertices (WideVertex *&verts, int &count);
|
||||
void GetNodes (MapNodeEx *&nodes, int &nodeCount,
|
||||
MapSeg *&segs, int &segCount,
|
||||
MapSegEx *&segs, int &segCount,
|
||||
MapSubsectorEx *&ssecs, int &subCount);
|
||||
|
||||
void GetGLNodes (MapNodeEx *&nodes, int &nodeCount,
|
||||
|
|
@ -231,8 +231,8 @@ private:
|
|||
DWORD AddMiniseg (int v1, int v2, DWORD partner, DWORD seg1, DWORD splitseg);
|
||||
void SetNodeFromSeg (node_t &node, const FPrivSeg *pseg) const;
|
||||
|
||||
int RemoveMinisegs (MapNodeEx *nodes, TArray<MapSeg> &segs, MapSubsectorEx *subs, int node, short bbox[4]);
|
||||
int StripMinisegs (TArray<MapSeg> &segs, int subsector, short bbox[4]);
|
||||
int RemoveMinisegs (MapNodeEx *nodes, TArray<MapSegEx> &segs, MapSubsectorEx *subs, int node, short bbox[4]);
|
||||
int StripMinisegs (TArray<MapSegEx> &segs, int subsector, short bbox[4]);
|
||||
void AddSegToShortBBox (short bbox[4], const FPrivSeg *seg);
|
||||
int CloseSubsector (TArray<MapSegGLEx> &segs, int subsector);
|
||||
DWORD PushGLSeg (TArray<MapSegGLEx> &segs, const FPrivSeg *seg);
|
||||
|
|
|
|||
|
|
@ -27,8 +27,10 @@
|
|||
|
||||
#if 0
|
||||
#define D(x) x
|
||||
#define DD 1
|
||||
#else
|
||||
#define D(x) do{}while(0)
|
||||
#undef DD
|
||||
#endif
|
||||
|
||||
void FNodeBuilder::GetGLNodes (MapNodeEx *&outNodes, int &nodeCount,
|
||||
|
|
@ -126,7 +128,7 @@ int FNodeBuilder::CloseSubsector (TArray<MapSegGLEx> &segs, int subsector)
|
|||
prev = seg;
|
||||
firstVert = seg->v1;
|
||||
|
||||
#if 0
|
||||
#ifdef DD
|
||||
printf("--%d--\n", subsector);
|
||||
for (j = first; j < max; ++j)
|
||||
{
|
||||
|
|
@ -180,7 +182,7 @@ int FNodeBuilder::CloseSubsector (TArray<MapSegGLEx> &segs, int subsector)
|
|||
PushConnectingGLSeg (subsector, segs, prev->v2, seg->v1);
|
||||
count++;
|
||||
}
|
||||
#if 0
|
||||
#ifdef DD
|
||||
printf ("+%d\n", bestj);
|
||||
#endif
|
||||
prevAngle -= bestdiff;
|
||||
|
|
@ -193,7 +195,7 @@ int FNodeBuilder::CloseSubsector (TArray<MapSegGLEx> &segs, int subsector)
|
|||
break;
|
||||
}
|
||||
}
|
||||
#if 0
|
||||
#ifdef DD
|
||||
printf ("\n");
|
||||
#endif
|
||||
}
|
||||
|
|
@ -224,7 +226,7 @@ int FNodeBuilder::CloseSubsector (TArray<MapSegGLEx> &segs, int subsector)
|
|||
PushConnectingGLSeg (subsector, segs, prev->v2, firstVert);
|
||||
count++;
|
||||
}
|
||||
#if 0
|
||||
#ifdef DD
|
||||
printf ("Output GL subsector %d:\n", subsector);
|
||||
for (i = segs.Size() - count; i < (int)segs.Size(); ++i)
|
||||
{
|
||||
|
|
@ -380,11 +382,11 @@ void FNodeBuilder::GetVertices (WideVertex *&verts, int &count)
|
|||
}
|
||||
|
||||
void FNodeBuilder::GetNodes (MapNodeEx *&outNodes, int &nodeCount,
|
||||
MapSeg *&outSegs, int &segCount,
|
||||
MapSegEx *&outSegs, int &segCount,
|
||||
MapSubsectorEx *&outSubs, int &subCount)
|
||||
{
|
||||
short bbox[4];
|
||||
TArray<MapSeg> segs (Segs.Size());
|
||||
TArray<MapSegEx> segs (Segs.Size());
|
||||
|
||||
// Walk the BSP and create a new BSP with only the information
|
||||
// suitable for a standard tree. At a minimum, this means removing
|
||||
|
|
@ -401,12 +403,36 @@ void FNodeBuilder::GetNodes (MapNodeEx *&outNodes, int &nodeCount,
|
|||
RemoveMinisegs (outNodes, segs, outSubs, Nodes.Size() - 1, bbox);
|
||||
|
||||
segCount = segs.Size ();
|
||||
outSegs = new MapSeg[segCount];
|
||||
memcpy (outSegs, &segs[0], segCount*sizeof(MapSeg));
|
||||
outSegs = new MapSegEx[segCount];
|
||||
memcpy (outSegs, &segs[0], segCount*sizeof(MapSegEx));
|
||||
|
||||
#ifdef DD
|
||||
int i, j;
|
||||
|
||||
for (i = 0; i < nodeCount; ++i)
|
||||
{
|
||||
printf("Node %d:\n", i);
|
||||
for (j = 1; j >= 0; --j)
|
||||
{
|
||||
if (outNodes[i].children[j] & NFX_SUBSECTOR)
|
||||
{
|
||||
printf(" subsector %d\n", outNodes[i].children[j] & ~NFX_SUBSECTOR);
|
||||
}
|
||||
else
|
||||
{
|
||||
printf(" node %d\n", outNodes[i].children[j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
for (i = 0; i < segCount; ++i)
|
||||
{
|
||||
printf("Seg %d: v1(%d) -> v2(%d)\n", i, outSegs[i].v1, outSegs[i].v2);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
int FNodeBuilder::RemoveMinisegs (MapNodeEx *nodes,
|
||||
TArray<MapSeg> &segs, MapSubsectorEx *subs, int node, short bbox[4])
|
||||
TArray<MapSegEx> &segs, MapSubsectorEx *subs, int node, short bbox[4])
|
||||
{
|
||||
if (node & NFX_SUBSECTOR)
|
||||
{
|
||||
|
|
@ -441,7 +467,7 @@ int FNodeBuilder::RemoveMinisegs (MapNodeEx *nodes,
|
|||
}
|
||||
}
|
||||
|
||||
int FNodeBuilder::StripMinisegs (TArray<MapSeg> &segs, int subsector, short bbox[4])
|
||||
int FNodeBuilder::StripMinisegs (TArray<MapSegEx> &segs, int subsector, short bbox[4])
|
||||
{
|
||||
int count, i, max;
|
||||
|
||||
|
|
@ -468,7 +494,7 @@ int FNodeBuilder::StripMinisegs (TArray<MapSeg> &segs, int subsector, short bbox
|
|||
}
|
||||
else
|
||||
{
|
||||
MapSeg newseg;
|
||||
MapSegEx newseg;
|
||||
|
||||
AddSegToShortBBox (bbox, org);
|
||||
|
||||
|
|
|
|||
|
|
@ -1034,26 +1034,31 @@ void FProcessor::WriteSectors (FWadWriter &out)
|
|||
|
||||
void FProcessor::WriteSegs (FWadWriter &out)
|
||||
{
|
||||
int i, count;
|
||||
short *segdata;
|
||||
int i;
|
||||
MapSeg *segdata;
|
||||
|
||||
segdata = (short *)Level.Segs;
|
||||
count = Level.NumSegs*sizeof(MapSeg)/sizeof(*segdata);
|
||||
assert(Level.NumVertices < 65536);
|
||||
|
||||
for (i = 0; i < count; ++i)
|
||||
segdata = new MapSeg[Level.NumSegs];
|
||||
|
||||
for (i = 0; i < Level.NumSegs; ++i)
|
||||
{
|
||||
segdata[i] = LittleShort(segdata[i]);
|
||||
segdata[i].v1 = LittleShort(segdata[i].v1);
|
||||
segdata[i].v2 = LittleShort(segdata[i].v2);
|
||||
segdata[i].angle = LittleShort(segdata[i].angle);
|
||||
segdata[i].linedef = LittleShort(segdata[i].linedef);
|
||||
segdata[i].side = LittleShort(segdata[i].side);
|
||||
segdata[i].offset = LittleShort(segdata[i].offset);
|
||||
}
|
||||
out.WriteLump ("SEGS", segdata, sizeof(*segdata)*count);
|
||||
out.WriteLump ("SEGS", segdata, sizeof(*segdata)*Level.NumSegs);
|
||||
|
||||
count /= sizeof(MapSeg)/sizeof(*segdata);
|
||||
if (count >= 65536)
|
||||
if (Level.NumSegs >= 65536)
|
||||
{
|
||||
printf (" SEGS is too big for any port. (%d segs)\n", count);
|
||||
printf (" SEGS is too big for any port. (%d segs)\n", Level.NumSegs);
|
||||
}
|
||||
else if (count >= 32768)
|
||||
else if (Level.NumSegs >= 32768)
|
||||
{
|
||||
printf (" SEGS is too big for vanilla Doom and most ports. (%d segs)\n", count);
|
||||
printf (" SEGS is too big for vanilla Doom and some ports. (%d segs)\n", Level.NumSegs);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1414,7 +1419,7 @@ void FProcessor::WriteSubsectorsZ (ZLibOut &out, const MapSubsectorEx *subs, int
|
|||
}
|
||||
}
|
||||
|
||||
void FProcessor::WriteSegsZ (ZLibOut &out, const MapSeg *segs, int numsegs)
|
||||
void FProcessor::WriteSegsZ (ZLibOut &out, const MapSegEx *segs, int numsegs)
|
||||
{
|
||||
out << (DWORD)numsegs;
|
||||
|
||||
|
|
@ -1532,7 +1537,7 @@ void FProcessor::WriteSubsectorsX (FWadWriter &out, const MapSubsectorEx *subs,
|
|||
}
|
||||
}
|
||||
|
||||
void FProcessor::WriteSegsX (FWadWriter &out, const MapSeg *segs, int numsegs)
|
||||
void FProcessor::WriteSegsX (FWadWriter &out, const MapSegEx *segs, int numsegs)
|
||||
{
|
||||
out << (DWORD)numsegs;
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ private:
|
|||
|
||||
void WriteVerticesZ (ZLibOut &out, const WideVertex *verts, int orgverts, int newverts);
|
||||
void WriteSubsectorsZ (ZLibOut &out, const MapSubsectorEx *subs, int numsubs);
|
||||
void WriteSegsZ (ZLibOut &out, const MapSeg *segs, int numsegs);
|
||||
void WriteSegsZ (ZLibOut &out, const MapSegEx *segs, int numsegs);
|
||||
void WriteGLSegsZ (ZLibOut &out, const MapSegGLEx *segs, int numsegs);
|
||||
void WriteNodesZ (ZLibOut &out, const MapNodeEx *nodes, int numnodes);
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ private:
|
|||
|
||||
void WriteVerticesX (FWadWriter &out, const WideVertex *verts, int orgverts, int newverts);
|
||||
void WriteSubsectorsX (FWadWriter &out, const MapSubsectorEx *subs, int numsubs);
|
||||
void WriteSegsX (FWadWriter &out, const MapSeg *segs, int numsegs);
|
||||
void WriteSegsX (FWadWriter &out, const MapSegEx *segs, int numsegs);
|
||||
void WriteGLSegsX (FWadWriter &out, const MapSegGLEx *segs, int numsegs);
|
||||
void WriteNodesX (FWadWriter &out, const MapNodeEx *nodes, int numnodes);
|
||||
|
||||
|
|
|
|||
2
view.cpp
2
view.cpp
|
|
@ -723,7 +723,7 @@ static void DrawLevelPVS (HDC dc)
|
|||
static void SetDesiredSector (int x, int y)
|
||||
{
|
||||
int node = Level->NumNodes - 1;
|
||||
const MapSeg *seg;
|
||||
const MapSegEx *seg;
|
||||
|
||||
while (!(node & NFX_SUBSECTOR))
|
||||
{
|
||||
|
|
|
|||
2
zdbsp.h
2
zdbsp.h
|
|
@ -16,7 +16,7 @@ typedef __int32 int32_t;
|
|||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
#define ZDBSP_VERSION "1.15"
|
||||
#define ZDBSP_VERSION "1.16"
|
||||
|
||||
enum EBlockmapMode
|
||||
{
|
||||
|
|
|
|||
|
|
@ -96,6 +96,85 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="0"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="zlib"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
DisableSpecificWarnings="4996"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\zdbsp.exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)_vs2005"
|
||||
|
|
@ -181,170 +260,6 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release, SSE2|Win32"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="0"
|
||||
WholeProgramOptimization="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="3"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="zlib"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__SSE2__"
|
||||
RuntimeLibrary="0"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
FloatingPointModel="2"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
DisableSpecificWarnings="4996"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\zdbsp.exe"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="0"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="zlib"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
DisableSpecificWarnings="4996"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\zdbsp.exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
|
|
@ -433,6 +348,91 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release, SSE2|Win32"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="0"
|
||||
WholeProgramOptimization="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="3"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="zlib"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__SSE2__"
|
||||
RuntimeLibrary="0"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
FloatingPointModel="2"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
DisableSpecificWarnings="4996"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\zdbsp.exe"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release, SSE2|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
|
|
@ -588,7 +588,7 @@
|
|||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
Name="Debug|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
|
|
@ -596,7 +596,7 @@
|
|||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
|
|
@ -623,22 +623,6 @@
|
|||
EnableEnhancedInstructionSet="2"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
>
|
||||
|
|
@ -647,6 +631,14 @@
|
|||
EnableEnhancedInstructionSet="2"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
>
|
||||
|
|
@ -655,6 +647,14 @@
|
|||
EnableEnhancedInstructionSet="2"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|x64"
|
||||
>
|
||||
|
|
@ -779,22 +779,6 @@
|
|||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -803,6 +787,14 @@
|
|||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -811,6 +803,14 @@
|
|||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -831,22 +831,6 @@
|
|||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -855,6 +839,14 @@
|
|||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -863,6 +855,14 @@
|
|||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -883,22 +883,6 @@
|
|||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -907,6 +891,14 @@
|
|||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -915,6 +907,14 @@
|
|||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -935,22 +935,6 @@
|
|||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -959,6 +943,14 @@
|
|||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -967,6 +959,14 @@
|
|||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
@ -1015,22 +1015,6 @@
|
|||
DisableSpecificWarnings="4267"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
DisableSpecificWarnings="4267"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
DisableSpecificWarnings="4267"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
>
|
||||
|
|
@ -1039,6 +1023,14 @@
|
|||
DisableSpecificWarnings="4267"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
DisableSpecificWarnings="4267"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
>
|
||||
|
|
@ -1047,6 +1039,14 @@
|
|||
DisableSpecificWarnings="4267"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
DisableSpecificWarnings="4267"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release, SSE2|x64"
|
||||
>
|
||||
|
|
@ -1077,6 +1077,10 @@
|
|||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath=".\Makefile"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zdbsp.html"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
kzip %1 release\zdbsp.exe zdbsp.html *.png
|
||||
kzip %1 zdbsp.exe zdbsp.html *.png
|
||||
Loading…
Reference in a new issue