diff options
Diffstat (limited to 'src/tools/vmap3_assembler/VC90')
| -rw-r--r-- | src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj (renamed from src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj) | 128 |
1 files changed, 63 insertions, 65 deletions
diff --git a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj b/src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj index aff990d01cc..1f3376e71b7 100644 --- a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj +++ b/src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" - Name="vmap_assembler" + Version="9,00" + Name="vmap3assembler" ProjectGUID="{572FFF74-480C-4472-8ABF-81733BB4049D}" RootNamespace="vmap_assembler" Keyword="Win32Proj" @@ -18,8 +18,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\" - IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -42,16 +42,18 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" + AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging" + MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="1" - EnableEnhancedInstructionSet="1" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" UsePrecompiledHeader="0" + ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\" WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -64,11 +66,13 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/vmap_assembler.exe" - LinkIncremental="1" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe" + LinkIncremental="2" + AdditionalLibraryDirectories="" + IgnoreAllDefaultLibraries="false" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/vmap_assembler.pdb" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" @@ -98,8 +102,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\bin\$(PlatformName)_$(ConfigurationName)\" - IntermediateDirectory="bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -121,13 +125,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging" + StringPooling="true" RuntimeLibrary="2" + EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" + ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -141,9 +148,12 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/vmap_assembler.exe" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" LinkIncremental="1" + AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -183,7 +193,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath=".\..\vmap_assembler.cpp" + RelativePath="..\VMapAssembler.cpp" > </File> </Filter> @@ -191,57 +201,45 @@ Name="vmaplib" > <File - RelativePath="..\..\..\src\shared\vmap\BIH.cpp" - > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\BIH.h" - > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\MapTree.cpp" + RelativePath="..\..\..\server\collision\BoundingIntervalHierarchy.cpp" > </File> <File - RelativePath="..\..\..\src\shared\vmap\MapTree.h" + RelativePath="..\..\..\server\collision\BoundingIntervalHierarchy.h" > </File> - <File - RelativePath="..\..\..\src\shared\vmap\ModelInstance.cpp" + <Filter + Name="Maps" > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\ModelInstance.h" + <File + RelativePath="..\..\..\server\collision\Maps\TileAssembler.cpp" + > + </File> + <File + RelativePath="..\..\..\server\collision\Maps\TileAssembler.h" + > + </File> + </Filter> + <Filter + Name="Models" > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\TileAssembler.cpp" - > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\TileAssembler.h" - > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\VMapManager2.cpp" - > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\VMapManager2.h" - > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\VMapTools.h" - > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\WorldModel.cpp" - > - </File> - <File - RelativePath="..\..\..\src\shared\vmap\WorldModel.h" - > - </File> + <File + RelativePath="..\..\..\server\collision\Models\ModelInstance.cpp" + > + </File> + <File + RelativePath="..\..\..\server\collision\Models\ModelInstance.h" + > + </File> + <File + RelativePath="..\..\..\server\collision\Models\WorldModel.cpp" + > + </File> + <File + RelativePath="..\..\..\server\collision\Models\WorldModel.h" + > + </File> + </Filter> </Filter> </Files> <Globals> |