diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/ExtractorToolsVC90.sln | 48 | ||||
| -rw-r--r-- | src/tools/map_extractor/VC90/VC90_ad.vcproj | 57 | ||||
| -rw-r--r-- | src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj | 61 | ||||
| -rw-r--r-- | src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj | 38 | ||||
| -rw-r--r-- | src/tools/vmap3_extractor/vmapexport.cpp | 2 |
5 files changed, 122 insertions, 84 deletions
diff --git a/src/tools/ExtractorToolsVC90.sln b/src/tools/ExtractorToolsVC90.sln index 6a31b5a1ddf..5887925dcf1 100644 --- a/src/tools/ExtractorToolsVC90.sln +++ b/src/tools/ExtractorToolsVC90.sln @@ -2,10 +2,36 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "map_extractor\VC90\VC90_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}" + ProjectSection(ProjectDependencies) = postProject + {03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "vmap3_assembler\VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}" + ProjectSection(ProjectDependencies) = postProject + {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3_extractor", "vmap3_extractor\VC90\vmap3_extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}" + ProjectSection(ProjectDependencies) = postProject + {03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "..\..\externals\libmpq\win\VC90\libmpq.vcproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}" + ProjectSection(ProjectDependencies) = postProject + {CE773400-763E-4B71-B5E2-C9B60A752EB1} = {CE773400-763E-4B71-B5E2-C9B60A752EB1} + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\externals\bzip2\win\VC90\bzip2.vcproj", "{CE773400-763E-4B71-B5E2-C9B60A752EB1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\externals\zlib\win\VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\externals\g3dlite\win\VC90\g3dlite.vcproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" + ProjectSection(ProjectDependencies) = postProject + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{69F789A6-BD04-454A-AC8E-A57AAE7FCF77}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,8 +51,30 @@ Global {502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32 {502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32 {502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32 + {03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32 + {03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32 + {03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32 + {03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.Build.0 = Release|Win32 + {CE773400-763E-4B71-B5E2-C9B60A752EB1}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE773400-763E-4B71-B5E2-C9B60A752EB1}.Debug|Win32.Build.0 = Debug|Win32 + {CE773400-763E-4B71-B5E2-C9B60A752EB1}.Release|Win32.ActiveCfg = Release|Win32 + {CE773400-763E-4B71-B5E2-C9B60A752EB1}.Release|Win32.Build.0 = Release|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {CE773400-763E-4B71-B5E2-C9B60A752EB1} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77} + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77} + {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77} + {03AB0F44-628E-4855-99A0-C98A1EB52C50} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77} + EndGlobalSection EndGlobal diff --git a/src/tools/map_extractor/VC90/VC90_ad.vcproj b/src/tools/map_extractor/VC90/VC90_ad.vcproj index 83480dd3912..e875137556c 100644 --- a/src/tools/map_extractor/VC90/VC90_ad.vcproj +++ b/src/tools/map_extractor/VC90/VC90_ad.vcproj @@ -17,8 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\ad__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\ad__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -49,12 +49,14 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE" + MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" PrecompiledHeaderFile="$(IntDir)\ad.pch" - AssemblerListingLocation="$(IntDir)\" + AssemblerListingLocation="" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" XMLDocumentationFileName="$(IntDir)\" @@ -62,7 +64,7 @@ BrowseInformationFile="" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -77,14 +79,13 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ad_debug.exe" - LinkIncremental="1" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe" + LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - IgnoreDefaultLibraryNames="LIBCD.lib;LIBCMTD.lib;MSVCRT.lib" + AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\ad.pdb" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" @@ -115,8 +116,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)\" - IntermediateDirectory="$(PlatformName)_$(ConfigurationName)\" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -145,16 +146,19 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="1" + Optimization="2" + InlineFunctionExpansion="0" AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - RuntimeLibrary="0" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" - PrecompiledHeaderFile="$(IntDir)\ad.pch" - AssemblerListingLocation="$(IntDir)\" + PrecompiledHeaderFile="" + AssemblerListingLocation="" ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc90.pdb" XMLDocumentationFileName="$(IntDir)\" BrowseInformation="0" WarningLevel="3" @@ -173,15 +177,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ad.exe" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - IgnoreDefaultLibraryNames="LIBCD.lib;LIBCMTD.lib;MSVCRT.lib" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\ad.pdb" + AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="false" + ProgramDatabaseFile="" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" TargetMachine="1" diff --git a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj index b7c0e7719b3..63a99dfa421 100644 --- a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj +++ b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj @@ -44,13 +44,14 @@ Optimization="0" AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" + MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="1" - EnableEnhancedInstructionSet="1" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -64,14 +65,13 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="g3dlite.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\vmap_assembler.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\externals\g3dlite\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe" + LinkIncremental="2" + AdditionalLibraryDirectories="" IgnoreAllDefaultLibraries="false" - IgnoreDefaultLibraryNames="MSVCPRTD.LIB" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/vmap_assembler.pdb" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" @@ -124,14 +124,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging" + AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" RuntimeLibrary="2" + EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" /> <Tool Name="VCManagedResourceCompilerTool" @@ -144,12 +146,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="g3dlite.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\vmap_assembler.exe" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\externals\g3dlite\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - IgnoreDefaultLibraryNames="MSVCPRTD.LIB" - GenerateDebugInformation="true" + AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -204,22 +205,10 @@ RelativePath="..\..\..\server\collision\BoundingIntervalHierarchy.h" > </File> - <File - RelativePath="..\..\..\src\shared\vmap\VMapTools.h" - > - </File> <Filter Name="Maps" > <File - RelativePath="..\..\..\server\collision\Maps\MapTree.cpp" - > - </File> - <File - RelativePath="..\..\..\server\collision\Maps\MapTree.h" - > - </File> - <File RelativePath="..\..\..\server\collision\Maps\TileAssembler.cpp" > </File> @@ -248,18 +237,6 @@ > </File> </Filter> - <Filter - Name="Management" - > - <File - RelativePath="..\..\..\server\collision\Management\VMapManager2.cpp" - > - </File> - <File - RelativePath="..\..\..\server\collision\Management\VMapManager2.h" - > - </File> - </Filter> </Filter> </Files> <Globals> diff --git a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj index 3e0000b6249..34665937c9a 100644 --- a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj +++ b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj @@ -18,8 +18,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\vmap3_extractor__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\vmap3_extractor__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > @@ -43,12 +43,13 @@ Optimization="0" AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -61,12 +62,14 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe" LinkIncremental="2" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories="" GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -93,11 +96,11 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\vmap3_extractor__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\vmap3_extractor__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" - WholeProgramOptimization="1" + WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" @@ -117,14 +120,17 @@ <Tool Name="VCCLCompilerTool" Optimization="2" - EnableIntrinsicFunctions="true" + EnableIntrinsicFunctions="false" + WholeProgramOptimization="false" AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="3" + DebugInformationFormat="0" /> <Tool Name="VCManagedResourceCompilerTool" @@ -137,14 +143,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - GenerateDebugInformation="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + LinkTimeCodeGeneration="0" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp index ff81da52219..b3da5065f96 100644 --- a/src/tools/vmap3_extractor/vmapexport.cpp +++ b/src/tools/vmap3_extractor/vmapexport.cpp @@ -103,7 +103,7 @@ void ReadLiquidTypeTableDBC() printf("Done! (%u LiqTypes loaded)\n", (unsigned int)LiqType_count); } -int ExtractWmo() +bool ExtractWmo() { char szLocalFile[1024] = ""; bool success=true; |