1
0
forked from 0ad/0ad

GameSetup: "-autostart=mapname" command-line parameter, for faster testing.

Misc: Don't catch(...)
Atlas: Removed old project files; adjusted include paths.

This was SVN commit r3062.
This commit is contained in:
Ykkrosh 2005-10-30 21:30:52 +00:00
parent 416c7fe4ba
commit f2b88d7792
15 changed files with 51 additions and 920 deletions

View File

@ -76,9 +76,9 @@ CSkeletonAnimDef* CSkeletonAnimDef::Load(const char* filename)
unpacker.UnpackRaw(&anim->m_NumFrames,sizeof(anim->m_NumFrames));
anim->m_Keys=new Key[anim->m_NumKeys*anim->m_NumFrames];
unpacker.UnpackRaw(anim->m_Keys,anim->m_NumKeys*anim->m_NumFrames*sizeof(Key));
} catch (...) {
} catch (CFileUnpacker::CError) {
delete anim;
throw CFileUnpacker::CFileEOFError();
throw;
}
return anim;

View File

@ -12,6 +12,7 @@
#include "Model.h"
#include "CLogger.h"
#include "SkeletonAnimManager.h"
#include "FileUnpacker.h"
#include <algorithm>
#define LOG_CATEGORY "graphics"
@ -56,7 +57,7 @@ CSkeletonAnimDef* CSkeletonAnimManager::GetAnimation(const char* filename)
CSkeletonAnimDef* def;
try {
def=CSkeletonAnimDef::Load(filename);
} catch (...) {
} catch (CFileUnpacker::CError) {
def=0;
}

View File

@ -398,7 +398,9 @@ void IGUIObject::CheckSettingsValidity()
{
GUI<IGUIObject*>::RecurseObject(0, this, &IGUIObject::UpdateMouseOver, NULL);
}
catch (...) {}
catch (PS_RESULT)
{
}
}
try
@ -407,7 +409,7 @@ void IGUIObject::CheckSettingsValidity()
HandleMessage(GUIM_SETTINGS_UPDATED);
ScriptEvent("update");
}
catch (...)
catch (PS_RESULT)
{
}
}

View File

@ -35,7 +35,8 @@ int g_freq;
bool g_Quickstart=false;
// If non-empty, specified map will be automatically loaded
CStr g_AutostartMap = "";
//----------------------------------------------------------------------------
// config and profile
@ -95,6 +96,10 @@ static void ParseCommandLineArgs(int argc, char* argv[])
// switch first letter of option name
switch(argv[i][1])
{
case 'a':
if(strncmp(name, "autostart=", 10) == 0)
g_AutostartMap = argv[i]+11;
break;
case 'c':
if(strcmp(name, "conf") == 0)
{
@ -138,6 +143,10 @@ static void ParseCommandLineArgs(int argc, char* argv[])
else if(strncmp(name, "nopbuffer", 9) == 0)
g_NoPBuffer = true;
break;
case 'p':
if(strncmp(name, "profile=", 8) == 0)
g_ConfigDB.CreateValue(CFG_COMMAND, "profile")->m_String = argv[i]+9;
break;
case 'q':
if(strncmp(name, "quickstart", 10) == 0)
g_Quickstart = true;
@ -147,20 +156,17 @@ static void ParseCommandLineArgs(int argc, char* argv[])
g_ConfigDB.CreateValue(CFG_COMMAND, "shadows")->m_String="true";
break;
case 'v':
g_ConfigDB.CreateValue(CFG_COMMAND, "vsync")->m_String="true";
if(strncmp(name, "vsync", 5) == 0)
g_ConfigDB.CreateValue(CFG_COMMAND, "vsync")->m_String="true";
break;
case 'x':
if(strncmp(name, "xres=", 6) == 0)
if(strncmp(name, "xres=", 5) == 0)
g_ConfigDB.CreateValue(CFG_COMMAND, "xres")->m_String=argv[i]+6;
break;
case 'y':
if(strncmp(name, "yres=", 6) == 0)
if(strncmp(name, "yres=", 5) == 0)
g_ConfigDB.CreateValue(CFG_COMMAND, "yres")->m_String=argv[i]+6;
break;
case 'p':
if(strncmp(name, "profile=", 8) == 0 )
g_ConfigDB.CreateValue(CFG_COMMAND, "profile")->m_String = argv[i]+9;
break;
} // switch
}
}

View File

@ -23,6 +23,7 @@ extern int g_bpp;
extern int g_freq;
extern bool g_active;
extern bool g_Quickstart;
extern CStr g_AutostartMap;
extern CStr g_CursorName;

View File

@ -800,7 +800,6 @@ void Shutdown()
void Init(int argc, char* argv[], uint flags)
{
const bool setup_vmode = (flags & INIT_HAVE_VMODE) == 0;
const bool setup_gui = (flags & INIT_NO_GUI ) == 0;
debug_printf("INIT &argc=%p &argv=%p\n", &argc, &argv);
MICROLOG(L"Init");
@ -860,6 +859,9 @@ void Init(int argc, char* argv[], uint flags)
// g_ConfigDB, command line args, globals
CONFIG_Init(argc, argv);
// setup_gui must be set after CONFIG_Init, so command-line parameters can disable it
const bool setup_gui = ((flags & INIT_NO_GUI) == 0 && g_AutostartMap.Length() == 0);
// GUI is notified in SetVideoMode, so this must come before that.
#ifndef NO_GUI
new CGUI;
@ -991,6 +993,24 @@ void Init(int argc, char* argv[], uint flags)
#endif
g_Camera.UpdateFrustum();
}
if (g_AutostartMap.Length())
{
// Code copied mostly from atlas/GameInterface/Handlers/Map.cpp -
// maybe should be refactored to avoid duplication
g_GameAttributes.m_MapFile = g_AutostartMap+".pmp";
for (int i=1; i<8; ++i)
g_GameAttributes.GetSlot(i)->AssignLocal();
g_GameAttributes.m_LOSSetting = 2;
g_Game = new CGame();
PSRETURN ret = g_Game->StartGame(&g_GameAttributes);
debug_assert(ret == PSRETURN_OK);
LDR_NonprogressiveLoad();
ret = g_Game->ReallyStartGame();
debug_assert(ret == PSRETURN_OK);
}
}
#if MSC_VERSION

View File

@ -55,7 +55,7 @@ void CWorld::Initialize(CGameAttributes *pAttribs)
reader = new CMapReader;
reader->LoadMap(mapfilename, &m_Terrain, &m_UnitManager, &g_LightEnv);
// fails immediately, or registers for delay loading
} catch (...) {
} catch (CFileUnpacker::CError) {
delete reader;
LOG(ERROR, LOG_CATEGORY, "Failed to load map %s", mapfilename.c_str());
throw PSERROR_Game_World_MapLoadFailed();

View File

@ -1,97 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AtlasUI", "AtlasUI\AtlasUI.vcproj", "{E99BA969-D540-4F23-822E-37C499E8F704}"
ProjectSection(ProjectDependencies) = postProject
{228B468D-3C2E-45BF-9833-C626E1A35B04} = {228B468D-3C2E-45BF-9833-C626E1A35B04}
{8C9BF4E2-AE5A-4404-AD8A-0418508A737C} = {8C9BF4E2-AE5A-4404-AD8A-0418508A737C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AtlasObject", "AtlasObject\AtlasObject.vcproj", "{228B468D-3C2E-45BF-9833-C626E1A35B04}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActorEditor", "AtlasFrontends\ActorEditor.vcproj", "{E859DDC0-224A-41F6-B09F-E320EC8DDA35}"
ProjectSection(ProjectDependencies) = postProject
{E99BA969-D540-4F23-822E-37C499E8F704} = {E99BA969-D540-4F23-822E-37C499E8F704}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ColourTester", "AtlasFrontends\ColourTester.vcproj", "{C018BE85-EBFE-428E-8626-3CCB77052715}"
ProjectSection(ProjectDependencies) = postProject
{E99BA969-D540-4F23-822E-37C499E8F704} = {E99BA969-D540-4F23-822E-37C499E8F704}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyrogenesis", "..\..\..\build\workspaces\vc2003\pyrogenesis.vcproj", "{CDA14ADB-57CA-DB49-A474-E7605D7922BD}"
ProjectSection(ProjectDependencies) = postProject
{E99BA969-D540-4F23-822E-37C499E8F704} = {E99BA969-D540-4F23-822E-37C499E8F704}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DatafileIO", "DatafileIO\DatafileIO.vcproj", "{8C9BF4E2-AE5A-4404-AD8A-0418508A737C}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArchiveViewer", "AtlasFrontends\ArchiveViewer.vcproj", "{9F10EC81-4AD5-4AD9-A837-78F25E0C8938}"
ProjectSection(ProjectDependencies) = postProject
{E99BA969-D540-4F23-822E-37C499E8F704} = {E99BA969-D540-4F23-822E-37C499E8F704}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileConverter", "AtlasFrontends\FileConverter.vcproj", "{65124F90-05DB-4B9C-9C69-7E22632359C4}"
ProjectSection(ProjectDependencies) = postProject
{E99BA969-D540-4F23-822E-37C499E8F704} = {E99BA969-D540-4F23-822E-37C499E8F704}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
Testing = Testing
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{E99BA969-D540-4F23-822E-37C499E8F704}.Debug.ActiveCfg = Debug|Win32
{E99BA969-D540-4F23-822E-37C499E8F704}.Debug.Build.0 = Debug|Win32
{E99BA969-D540-4F23-822E-37C499E8F704}.Release.ActiveCfg = Release|Win32
{E99BA969-D540-4F23-822E-37C499E8F704}.Release.Build.0 = Release|Win32
{E99BA969-D540-4F23-822E-37C499E8F704}.Testing.ActiveCfg = Release|Win32
{E99BA969-D540-4F23-822E-37C499E8F704}.Testing.Build.0 = Release|Win32
{228B468D-3C2E-45BF-9833-C626E1A35B04}.Debug.ActiveCfg = Debug|Win32
{228B468D-3C2E-45BF-9833-C626E1A35B04}.Debug.Build.0 = Debug|Win32
{228B468D-3C2E-45BF-9833-C626E1A35B04}.Release.ActiveCfg = Release|Win32
{228B468D-3C2E-45BF-9833-C626E1A35B04}.Release.Build.0 = Release|Win32
{228B468D-3C2E-45BF-9833-C626E1A35B04}.Testing.ActiveCfg = Release|Win32
{228B468D-3C2E-45BF-9833-C626E1A35B04}.Testing.Build.0 = Release|Win32
{E859DDC0-224A-41F6-B09F-E320EC8DDA35}.Debug.ActiveCfg = Debug|Win32
{E859DDC0-224A-41F6-B09F-E320EC8DDA35}.Debug.Build.0 = Debug|Win32
{E859DDC0-224A-41F6-B09F-E320EC8DDA35}.Release.ActiveCfg = Release|Win32
{E859DDC0-224A-41F6-B09F-E320EC8DDA35}.Release.Build.0 = Release|Win32
{E859DDC0-224A-41F6-B09F-E320EC8DDA35}.Testing.ActiveCfg = Debug|Win32
{E859DDC0-224A-41F6-B09F-E320EC8DDA35}.Testing.Build.0 = Debug|Win32
{C018BE85-EBFE-428E-8626-3CCB77052715}.Debug.ActiveCfg = Debug|Win32
{C018BE85-EBFE-428E-8626-3CCB77052715}.Release.ActiveCfg = Release|Win32
{C018BE85-EBFE-428E-8626-3CCB77052715}.Release.Build.0 = Release|Win32
{C018BE85-EBFE-428E-8626-3CCB77052715}.Testing.ActiveCfg = Debug|Win32
{C018BE85-EBFE-428E-8626-3CCB77052715}.Testing.Build.0 = Debug|Win32
{CDA14ADB-57CA-DB49-A474-E7605D7922BD}.Debug.ActiveCfg = Debug|Win32
{CDA14ADB-57CA-DB49-A474-E7605D7922BD}.Debug.Build.0 = Debug|Win32
{CDA14ADB-57CA-DB49-A474-E7605D7922BD}.Release.ActiveCfg = Release|Win32
{CDA14ADB-57CA-DB49-A474-E7605D7922BD}.Release.Build.0 = Release|Win32
{CDA14ADB-57CA-DB49-A474-E7605D7922BD}.Testing.ActiveCfg = Testing|Win32
{CDA14ADB-57CA-DB49-A474-E7605D7922BD}.Testing.Build.0 = Testing|Win32
{8C9BF4E2-AE5A-4404-AD8A-0418508A737C}.Debug.ActiveCfg = Debug|Win32
{8C9BF4E2-AE5A-4404-AD8A-0418508A737C}.Release.ActiveCfg = Release|Win32
{8C9BF4E2-AE5A-4404-AD8A-0418508A737C}.Release.Build.0 = Release|Win32
{8C9BF4E2-AE5A-4404-AD8A-0418508A737C}.Testing.ActiveCfg = Release|Win32
{8C9BF4E2-AE5A-4404-AD8A-0418508A737C}.Testing.Build.0 = Release|Win32
{9F10EC81-4AD5-4AD9-A837-78F25E0C8938}.Debug.ActiveCfg = Debug|Win32
{9F10EC81-4AD5-4AD9-A837-78F25E0C8938}.Release.ActiveCfg = Release|Win32
{9F10EC81-4AD5-4AD9-A837-78F25E0C8938}.Release.Build.0 = Release|Win32
{9F10EC81-4AD5-4AD9-A837-78F25E0C8938}.Testing.ActiveCfg = Debug|Win32
{9F10EC81-4AD5-4AD9-A837-78F25E0C8938}.Testing.Build.0 = Debug|Win32
{65124F90-05DB-4B9C-9C69-7E22632359C4}.Debug.ActiveCfg = Debug|Win32
{65124F90-05DB-4B9C-9C69-7E22632359C4}.Release.ActiveCfg = Release|Win32
{65124F90-05DB-4B9C-9C69-7E22632359C4}.Release.Build.0 = Release|Win32
{65124F90-05DB-4B9C-9C69-7E22632359C4}.Testing.ActiveCfg = Debug|Win32
{65124F90-05DB-4B9C-9C69-7E22632359C4}.Testing.Build.0 = Debug|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal

View File

@ -1,126 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="AtlasObject"
ProjectGUID="{228B468D-3C2E-45BF-9833-C626E1A35B04}"
Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\..\..\binaries\system"
IntermediateDirectory="..\..\..\..\build\workspaces\atlas\Debug\atobj"
ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../libraries/xerces/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
StringPooling="TRUE"
MinimalRebuild="TRUE"
RuntimeLibrary="3"
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/AtlasObject_d.lib"
AdditionalLibraryDirectories=""/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\..\..\binaries\system"
IntermediateDirectory="..\..\..\..\build\workspaces\atlas\Release\atobj"
ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories="../../../../libraries/xerces/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/AtlasObject.lib"
AdditionalLibraryDirectories=""/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\AtlasObject.h">
</File>
<File
RelativePath=".\AtlasObjectImpl.cpp">
</File>
<File
RelativePath=".\AtlasObjectImpl.h">
</File>
<File
RelativePath=".\AtlasObjectText.cpp">
</File>
<File
RelativePath=".\AtlasObjectText.h">
</File>
<File
RelativePath=".\AtlasObjectXML.cpp">
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -1,5 +1,5 @@
#include "CustomControls/FileHistory/FileHistory.h"
#include "CustomControls/SnapSplitterWindow/SnapSplitterWindow.h"
#include "FileHistory/FileHistory.h"
#include "SnapSplitterWindow/SnapSplitterWindow.h"
#include "FilePreviewer.h"
namespace DatafileIO

View File

@ -1,489 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="AtlasUI"
ProjectGUID="{E99BA969-D540-4F23-822E-37C499E8F704}"
RootNamespace="AtlasUI"
Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\..\..\binaries\system"
IntermediateDirectory="..\..\..\..\build\workspaces\atlas\Debug\ui"
ConfigurationType="2"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..;.\General;.\CustomControls\Buttons;.\CustomControls\DraggableListCtrl;.\CustomControls\EditableListCtrl;.\CustomControls\Windows;.\Misc;E:\wx\wxWidgets-2.6.1\include;E:\wx\wxWidgets-2.6.1\include\msvc;..\..\..\..\libraries\devil\src\include;..\..\..\..\libraries\xerces\include;..\..\..\..\libraries\boost\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
UsePrecompiledHeader="3"
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib comctl32.lib rpcrt4.lib wxmsw26ud_gl.lib"
OutputFile="$(OutDir)/AtlasUI_d.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="E:\wx\wxWidgets-2.6.1\lib\vc_lib;..\..\..\..\libraries\xerces\lib;..\..\..\..\libraries\devil\src\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/AtlasUI_d.pdb"
SubSystem="2"
BaseAddress="0x14000000"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\..\..\binaries\system"
IntermediateDirectory="..\..\..\..\build\workspaces\atlas\Release\ui"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=".;..;.\General;.\CustomControls\Buttons;.\CustomControls\DraggableListCtrl;.\CustomControls\EditableListCtrl;.\CustomControls\Windows;.\Misc;E:\wx\wxWidgets-2.6.1\include;E:\wx\wxWidgets-2.6.1\include\msvc;..\..\..\..\libraries\devil\src\include;..\..\..\..\libraries\xerces\include;..\..\..\..\libraries\boost\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE"
RuntimeLibrary="2"
BufferSecurityCheck="TRUE"
UsePrecompiledHeader="3"
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib comctl32.lib rpcrt4.lib wxmsw26u_gl.lib"
OutputFile="$(OutDir)/AtlasUI.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="E:\wx\wxWidgets-2.6.1\lib\vc_lib;..\..\..\..\libraries\xerces\lib;..\..\..\..\libraries\devil\src\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/AtlasUI.pdb"
GenerateMapFile="TRUE"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
BaseAddress="0x14000000"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<Filter
Name="General"
Filter="">
<File
RelativePath=".\General\AtlasClipboard.cpp">
</File>
<File
RelativePath=".\General\AtlasClipboard.h">
</File>
<File
RelativePath=".\General\AtlasWindowCommand.cpp">
</File>
<File
RelativePath=".\General\AtlasWindowCommand.h">
</File>
<File
RelativePath=".\General\AtlasWindowCommandProc.cpp">
</File>
<File
RelativePath=".\General\AtlasWindowCommandProc.h">
</File>
<File
RelativePath=".\General\Datafile.cpp">
</File>
<File
RelativePath=".\General\Datafile.h">
</File>
<File
RelativePath=".\General\IAtlasSerialiser.h">
</File>
</Filter>
<Filter
Name="CustomControls"
Filter="">
<Filter
Name="EditableListCtrl"
Filter="">
<File
RelativePath=".\CustomControls\EditableListCtrl\EditableListCtrl.cpp">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\EditableListCtrl.h">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\EditableListCtrlCommands.cpp">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\EditableListCtrlCommands.h">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\FieldEditCtrl.cpp">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\FieldEditCtrl.h">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\ListCtrlValidator.cpp">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\ListCtrlValidator.h">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\QuickComboBox.cpp">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\QuickComboBox.h">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\QuickFileCtrl.cpp">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\QuickFileCtrl.h">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\QuickTextCtrl.cpp">
</File>
<File
RelativePath=".\CustomControls\EditableListCtrl\QuickTextCtrl.h">
</File>
</Filter>
<Filter
Name="DraggableListCtrl"
Filter="">
<File
RelativePath=".\CustomControls\DraggableListCtrl\DraggableListCtrl.cpp">
</File>
<File
RelativePath=".\CustomControls\DraggableListCtrl\DraggableListCtrl.h">
</File>
<File
RelativePath=".\CustomControls\DraggableListCtrl\DraggableListCtrlCommands.cpp">
</File>
<File
RelativePath=".\CustomControls\DraggableListCtrl\DraggableListCtrlCommands.h">
</File>
</Filter>
<Filter
Name="Windows"
Filter="">
<File
RelativePath=".\CustomControls\Windows\AtlasDialog.cpp">
</File>
<File
RelativePath=".\CustomControls\Windows\AtlasDialog.h">
</File>
<File
RelativePath=".\CustomControls\Windows\AtlasWindow.cpp">
</File>
<File
RelativePath=".\CustomControls\Windows\AtlasWindow.h">
</File>
</Filter>
<Filter
Name="VirtualDirTreeCtrl"
Filter="">
<File
RelativePath=".\CustomControls\VirtualDirTreeCtrl\virtualdirtreectrl.cpp">
</File>
<File
RelativePath=".\CustomControls\VirtualDirTreeCtrl\virtualdirtreectrl.h">
</File>
</Filter>
<Filter
Name="SnapSplitterWindow"
Filter="">
<File
RelativePath=".\CustomControls\SnapSplitterWindow\SnapSplitterWindow.cpp">
</File>
<File
RelativePath=".\CustomControls\SnapSplitterWindow\SnapSplitterWindow.h">
</File>
</Filter>
<Filter
Name="Buttons"
Filter="">
<File
RelativePath=".\CustomControls\Buttons\ActionButton.cpp">
</File>
<File
RelativePath=".\CustomControls\Buttons\ActionButton.h">
</File>
</Filter>
<Filter
Name="FileHistory"
Filter="">
<File
RelativePath=".\CustomControls\FileHistory\FileHistory.cpp">
</File>
<File
RelativePath=".\CustomControls\FileHistory\FileHistory.h">
</File>
</Filter>
<Filter
Name="HighResTimer"
Filter="">
<File
RelativePath=".\CustomControls\HighResTimer\HighResTimer.cpp">
</File>
<File
RelativePath=".\CustomControls\HighResTimer\HighResTimer.h">
</File>
</Filter>
</Filter>
<Filter
Name="Misc"
Filter="">
<File
RelativePath=".\Misc\DLLInterface.cpp">
</File>
<File
RelativePath=".\Misc\DLLInterface.h">
</File>
<File
RelativePath=".\Misc\icons.rc">
</File>
<File
RelativePath=".\Misc\stdafx.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
<File
RelativePath=".\Misc\stdafx.h">
</File>
<File
RelativePath=".\Misc\Version.h">
</File>
</Filter>
<Filter
Name="ScenarioEditor"
Filter="">
<File
RelativePath=".\ScenarioEditor\ScenarioEditor.cpp">
</File>
<File
RelativePath=".\ScenarioEditor\ScenarioEditor.h">
</File>
<Filter
Name="Sections"
Filter="">
<Filter
Name="Map"
Filter="">
<File
RelativePath=".\ScenarioEditor\Sections\Map\Map.cpp">
</File>
<File
RelativePath=".\ScenarioEditor\Sections\Map\Map.h">
</File>
</Filter>
<Filter
Name="Common"
Filter="">
<File
RelativePath=".\ScenarioEditor\Sections\Common\Sidebar.cpp">
</File>
<File
RelativePath=".\ScenarioEditor\Sections\Common\Sidebar.h">
</File>
</Filter>
<Filter
Name="Terrain"
Filter="">
<File
RelativePath=".\ScenarioEditor\Sections\Terrain\Terrain.cpp">
</File>
<File
RelativePath=".\ScenarioEditor\Sections\Terrain\Terrain.h">
</File>
</Filter>
</Filter>
<Filter
Name="Tools"
Filter="">
<File
RelativePath=".\ScenarioEditor\Tools\AlterElevation.cpp">
</File>
<Filter
Name="Common"
Filter="">
<File
RelativePath=".\ScenarioEditor\Tools\Common\Brushes.cpp">
</File>
<File
RelativePath=".\ScenarioEditor\Tools\Common\Brushes.h">
</File>
<File
RelativePath=".\ScenarioEditor\Tools\Common\Tools.cpp">
</File>
<File
RelativePath=".\ScenarioEditor\Tools\Common\Tools.h">
</File>
</Filter>
</Filter>
</Filter>
<Filter
Name="Utilities"
Filter="">
<Filter
Name="FileConverter"
Filter="">
<File
RelativePath=".\FileConverter\FileConverter.cpp">
</File>
<File
RelativePath=".\FileConverter\FileConverter.h">
</File>
</Filter>
<Filter
Name="ArchiveViewer"
Filter="">
<File
RelativePath=".\ArchiveViewer\ArchiveViewer.cpp">
</File>
<File
RelativePath=".\ArchiveViewer\ArchiveViewer.h">
</File>
<File
RelativePath=".\ArchiveViewer\FilePreviewer.cpp">
</File>
<File
RelativePath=".\ArchiveViewer\FilePreviewer.h">
</File>
</Filter>
<Filter
Name="ColourTester"
Filter="">
<File
RelativePath=".\ColourTester\ColourTester.cpp">
</File>
<File
RelativePath=".\ColourTester\ColourTester.h">
</File>
<File
RelativePath=".\ColourTester\ColourTesterColourCtrl.cpp">
</File>
<File
RelativePath=".\ColourTester\ColourTesterColourCtrl.h">
</File>
<File
RelativePath=".\ColourTester\ColourTesterFileCtrl.cpp">
</File>
<File
RelativePath=".\ColourTester\ColourTesterFileCtrl.h">
</File>
<File
RelativePath=".\ColourTester\ColourTesterImageCtrl.cpp">
</File>
<File
RelativePath=".\ColourTester\ColourTesterImageCtrl.h">
</File>
</Filter>
<Filter
Name="ActorEditor"
Filter="">
<File
RelativePath=".\ActorEditor\ActorEditor.cpp">
</File>
<File
RelativePath=".\ActorEditor\ActorEditor.h">
</File>
<File
RelativePath=".\ActorEditor\ActorEditorListCtrl.cpp">
</File>
<File
RelativePath=".\ActorEditor\ActorEditorListCtrl.h">
</File>
<File
RelativePath=".\ActorEditor\AnimListEditor.cpp">
</File>
<File
RelativePath=".\ActorEditor\AnimListEditor.h">
</File>
<File
RelativePath=".\ActorEditor\PropListEditor.cpp">
</File>
<File
RelativePath=".\ActorEditor\PropListEditor.h">
</File>
</Filter>
</Filter>
</Filter>
<File
RelativePath=".\TODO.txt">
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -1,4 +1,4 @@
#include "CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h"
#include "VirtualDirTreeCtrl/virtualdirtreectrl.h"
// wxGenericDirCtrl could potentially be used instead of this; but it gets
// indented a long way (since its root is far further back than necessary),

View File

@ -4,7 +4,7 @@
#include "General/AtlasWindowCommandProc.h"
#include "General/IAtlasSerialiser.h"
#include "CustomControls/FileHistory/FileHistory.h"
#include "FileHistory/FileHistory.h"
#include "wx/filename.h"

View File

@ -3,8 +3,8 @@
#include "ScenarioEditor.h"
#include "wx/glcanvas.h"
#include "CustomControls/SnapSplitterWindow/SnapSplitterWindow.h"
#include "CustomControls/HighResTimer/HighResTimer.h"
#include "SnapSplitterWindow/SnapSplitterWindow.h"
#include "HighResTimer/HighResTimer.h"
#include "GameInterface/MessagePasser.h"
#include "GameInterface/Messages.h"

View File

@ -1,187 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="DatafileIO"
ProjectGUID="{8C9BF4E2-AE5A-4404-AD8A-0418508A737C}"
Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\..\..\binaries\system"
IntermediateDirectory="..\..\..\..\build\workspaces\atlas\Debug\datafile"
ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\..\..\..\libraries\xerces\include;..\..\..\..\libraries\zlib\include;..\..\..\..\libraries\devil\src\include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
UsePrecompiledHeader="3"
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/DatafileIO_d.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\..\..\binaries\system"
IntermediateDirectory="..\..\..\..\build\workspaces\atlas\Release\datafile"
ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=".;..\..\..\..\libraries\xerces\include;..\..\..\..\libraries\zlib\include;..\..\..\..\libraries\devil\src\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/DatafileIO.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="XMB"
Filter="">
<File
RelativePath=".\Xmb\XMB.cpp">
</File>
<File
RelativePath=".\Xmb\XMB.h">
</File>
</Filter>
<Filter
Name="BAR"
Filter="">
<File
RelativePath=".\Bar\BAR.cpp">
</File>
<File
RelativePath=".\Bar\BAR.h">
</File>
</Filter>
<Filter
Name="Stream"
Filter="">
<File
RelativePath=".\Stream\Memory.cpp">
</File>
<File
RelativePath=".\Stream\Memory.h">
</File>
<File
RelativePath=".\Stream\Stream.cpp">
</File>
<File
RelativePath=".\Stream\Stream.h">
</File>
<File
RelativePath=".\Stream\wx.h">
</File>
</Filter>
<Filter
Name="SCN"
Filter="">
<File
RelativePath=".\Scn\SCN.cpp">
</File>
<File
RelativePath=".\Scn\SCN.h">
</File>
</Filter>
<Filter
Name="DDT"
Filter="">
<File
RelativePath=".\Ddt\DDT.cpp">
</File>
<File
RelativePath=".\Ddt\DDT.h">
</File>
</Filter>
<File
RelativePath=".\stdafx.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
<File
RelativePath=".\stdafx.h">
</File>
<File
RelativePath=".\Util.cpp">
</File>
<File
RelativePath=".\Util.h">
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>