mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-14 03:09:08 +00:00
Changed: #964 Added wmap tools to ryzom tool sln and fixed stuff.
This commit is contained in:
kaetemi
parent
74b6430afb
commit
f157610a73
5 changed files with 118 additions and 111 deletions
|
|
@ -210,24 +210,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "named_items_2_csv", "leveld
|
|||
{44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "master", "leveldesign\master\master.vcproj", "{D53B297E-01B6-4E9A-9753-BBF18A6EB332}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
|
||||
{577230FF-399C-4C9D-9495-CEC106326441} = {577230FF-399C-4C9D-9495-CEC106326441}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "georges_plugin_test", "leveldesign\georges_plugin_test\georges_plugin_test.vcproj", "{36DE80C1-0519-4177-847C-17A8D846D365}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "georges_convert", "leveldesign\georges_convert\georges_convert.vcproj", "{3539CE53-2596-4BC4-A177-045BBAFF4A82}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "export", "leveldesign\export\export.vcproj", "{577230FF-399C-4C9D-9495-CEC106326441}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
|
||||
{9D284C6B-BE12-4549-87E5-2337D64F31BE} = {9D284C6B-BE12-4549-87E5-2337D64F31BE}
|
||||
{2B48BE83-108B-4E8E-8A55-6627CF09AC5A} = {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}
|
||||
{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C} = {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patch_gen", "patch_gen\patch_gen.vcproj", "{E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
|
||||
|
|
@ -235,6 +221,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patch_gen", "patch_gen\patc
|
|||
{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9} = {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_world_packed_col", "server\build_world_packed_col\build_world_packed_col.vcproj", "{55C4C415-AF43-4092-818A-FD758EF0AD29}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7} = {792FF016-D048-44E3-BDA8-59C00D1480F7}
|
||||
{44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52} = {E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}
|
||||
{4B320F68-0B9B-4065-A2ED-AF5D4B163006} = {4B320F68-0B9B-4065-A2ED-AF5D4B163006}
|
||||
{9D284C6B-BE12-4549-87E5-2337D64F31BE} = {9D284C6B-BE12-4549-87E5-2337D64F31BE}
|
||||
{C5253970-8728-4A6F-8BF2-E1D9CF0F3861} = {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}
|
||||
{2B48BE83-108B-4E8E-8A55-6627CF09AC5A} = {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ai_share", "..\server\src\ai_share\ai_share.vcproj", "{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server_share", "..\server\src\server_share\server_share.vcproj", "{792FF016-D048-44E3-BDA8-59C00D1480F7}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ai_build_wmap", "server\ai_build_wmap\ai_build_wmap.vcproj", "{E4E8363C-14E3-4C4E-9E65-CA3465DCD5D8}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7} = {792FF016-D048-44E3-BDA8-59C00D1480F7}
|
||||
{44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52} = {E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}
|
||||
{9D284C6B-BE12-4549-87E5-2337D64F31BE} = {9D284C6B-BE12-4549-87E5-2337D64F31BE}
|
||||
{C5253970-8728-4A6F-8BF2-E1D9CF0F3861} = {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
|
|
@ -540,14 +550,6 @@ Global
|
|||
{B253223D-5E94-41B7-92A1-4E27461C91F8}.Release|Win32.Build.0 = Release|Win32
|
||||
{B253223D-5E94-41B7-92A1-4E27461C91F8}.Release|x64.ActiveCfg = Release|x64
|
||||
{B253223D-5E94-41B7-92A1-4E27461C91F8}.Release|x64.Build.0 = Release|x64
|
||||
{D53B297E-01B6-4E9A-9753-BBF18A6EB332}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{D53B297E-01B6-4E9A-9753-BBF18A6EB332}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{D53B297E-01B6-4E9A-9753-BBF18A6EB332}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D53B297E-01B6-4E9A-9753-BBF18A6EB332}.Debug|x64.Build.0 = Debug|x64
|
||||
{D53B297E-01B6-4E9A-9753-BBF18A6EB332}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{D53B297E-01B6-4E9A-9753-BBF18A6EB332}.Release|Win32.Build.0 = Release|Win32
|
||||
{D53B297E-01B6-4E9A-9753-BBF18A6EB332}.Release|x64.ActiveCfg = Release|x64
|
||||
{D53B297E-01B6-4E9A-9753-BBF18A6EB332}.Release|x64.Build.0 = Release|x64
|
||||
{36DE80C1-0519-4177-847C-17A8D846D365}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{36DE80C1-0519-4177-847C-17A8D846D365}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{36DE80C1-0519-4177-847C-17A8D846D365}.Debug|x64.ActiveCfg = Debug|x64
|
||||
|
|
@ -563,14 +565,6 @@ Global
|
|||
{3539CE53-2596-4BC4-A177-045BBAFF4A82}.Release|Win32.Build.0 = Release|Win32
|
||||
{3539CE53-2596-4BC4-A177-045BBAFF4A82}.Release|x64.ActiveCfg = Release|x64
|
||||
{3539CE53-2596-4BC4-A177-045BBAFF4A82}.Release|x64.Build.0 = Release|x64
|
||||
{577230FF-399C-4C9D-9495-CEC106326441}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{577230FF-399C-4C9D-9495-CEC106326441}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{577230FF-399C-4C9D-9495-CEC106326441}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{577230FF-399C-4C9D-9495-CEC106326441}.Debug|x64.Build.0 = Debug|x64
|
||||
{577230FF-399C-4C9D-9495-CEC106326441}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{577230FF-399C-4C9D-9495-CEC106326441}.Release|Win32.Build.0 = Release|Win32
|
||||
{577230FF-399C-4C9D-9495-CEC106326441}.Release|x64.ActiveCfg = Release|x64
|
||||
{577230FF-399C-4C9D-9495-CEC106326441}.Release|x64.Build.0 = Release|x64
|
||||
{E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|x64.ActiveCfg = Debug|x64
|
||||
|
|
@ -579,6 +573,38 @@ Global
|
|||
{E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|Win32.Build.0 = Release|Win32
|
||||
{E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|x64.ActiveCfg = Release|x64
|
||||
{E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|x64.Build.0 = Release|x64
|
||||
{55C4C415-AF43-4092-818A-FD758EF0AD29}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{55C4C415-AF43-4092-818A-FD758EF0AD29}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{55C4C415-AF43-4092-818A-FD758EF0AD29}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{55C4C415-AF43-4092-818A-FD758EF0AD29}.Debug|x64.Build.0 = Debug|x64
|
||||
{55C4C415-AF43-4092-818A-FD758EF0AD29}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{55C4C415-AF43-4092-818A-FD758EF0AD29}.Release|Win32.Build.0 = Release|Win32
|
||||
{55C4C415-AF43-4092-818A-FD758EF0AD29}.Release|x64.ActiveCfg = Release|x64
|
||||
{55C4C415-AF43-4092-818A-FD758EF0AD29}.Release|x64.Build.0 = Release|x64
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}.Debug|x64.Build.0 = Debug|x64
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}.Release|Win32.Build.0 = Release|Win32
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}.Release|x64.ActiveCfg = Release|x64
|
||||
{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}.Release|x64.Build.0 = Release|x64
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7}.Debug|x64.Build.0 = Debug|x64
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7}.Release|Win32.Build.0 = Release|Win32
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7}.Release|x64.ActiveCfg = Release|x64
|
||||
{792FF016-D048-44E3-BDA8-59C00D1480F7}.Release|x64.Build.0 = Release|x64
|
||||
{E4E8363C-14E3-4C4E-9E65-CA3465DCD5D8}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{E4E8363C-14E3-4C4E-9E65-CA3465DCD5D8}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E4E8363C-14E3-4C4E-9E65-CA3465DCD5D8}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{E4E8363C-14E3-4C4E-9E65-CA3465DCD5D8}.Debug|x64.Build.0 = Debug|x64
|
||||
{E4E8363C-14E3-4C4E-9E65-CA3465DCD5D8}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E4E8363C-14E3-4C4E-9E65-CA3465DCD5D8}.Release|Win32.Build.0 = Release|Win32
|
||||
{E4E8363C-14E3-4C4E-9E65-CA3465DCD5D8}.Release|x64.ActiveCfg = Release|x64
|
||||
{E4E8363C-14E3-4C4E-9E65-CA3465DCD5D8}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -19,11 +19,9 @@
|
|||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="..\..\obj\$(ConfigurationName)\$(ProjectName)"
|
||||
IntermediateDirectory="..\..\obj\$(ConfigurationName)\$(ProjectName)"
|
||||
OutputDirectory="obj\$(ConfigurationName)\$(ProjectName)"
|
||||
IntermediateDirectory="obj\$(ConfigurationName)\$(ProjectName)"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
|
|
@ -40,23 +38,21 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\../sheets_packer.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="4"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\client\src;..\..\common\src"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
|
||||
PreprocessorDefinitions="LIBXML_STATIC;WIN32;_DEBUG;_CONSOLE"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="2"
|
||||
BasicRuntimeChecks="3"
|
||||
SmallerTypeCheck="true"
|
||||
RuntimeLibrary="3"
|
||||
BufferSecurityCheck="true"
|
||||
EnableFunctionLevelLinking="true"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -64,21 +60,20 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1036"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="../../nel/lib"
|
||||
IgnoreDefaultLibraryNames="msvcrt.lib"
|
||||
AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib"
|
||||
OutputFile="$(RootNamespace)_d.exe"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrt"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
|
||||
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
ImportLibrary="$(RootNamespace)_d.lib"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -105,11 +100,9 @@
|
|||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="..\..\obj64\$(ConfigurationName)\$(ProjectName)"
|
||||
IntermediateDirectory="..\..\obj64\$(ConfigurationName)\$(ProjectName)"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
|
|
@ -126,23 +119,22 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="3"
|
||||
TypeLibraryName=".\../sheets_packer.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="4"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\client\src;..\..\common\src"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
|
||||
PreprocessorDefinitions="LIBXML_STATIC;WIN32;_DEBUG;_CONSOLE"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="2"
|
||||
BasicRuntimeChecks="3"
|
||||
SmallerTypeCheck="true"
|
||||
RuntimeLibrary="3"
|
||||
BufferSecurityCheck="true"
|
||||
EnableFunctionLevelLinking="true"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -150,21 +142,20 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1036"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="../../nel/lib64"
|
||||
IgnoreDefaultLibraryNames="msvcrt.lib"
|
||||
AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib"
|
||||
OutputFile="$(RootNamespace)_d.exe"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrt"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
|
||||
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
ImportLibrary="$(RootNamespace)_d.lib"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -191,11 +182,9 @@
|
|||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="..\..\obj\$(ConfigurationName)\$(ProjectName)"
|
||||
IntermediateDirectory="..\..\obj\$(ConfigurationName)\$(ProjectName)"
|
||||
OutputDirectory="obj\$(ConfigurationName)\$(ProjectName)"
|
||||
IntermediateDirectory="obj\$(ConfigurationName)\$(ProjectName)"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
|
|
@ -212,27 +201,22 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\../sheets_packer.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="3"
|
||||
Optimization="4"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
AdditionalIncludeDirectories="..\..\client\src;..\..\common\src"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
|
||||
PreprocessorDefinitions="LIBXML_STATIC;WIN32;NDEBUG;ASSERT_THROW_EXCEPTION;_CONSOLE"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="2"
|
||||
RuntimeLibrary="2"
|
||||
BufferSecurityCheck="false"
|
||||
DisableLanguageExtensions="false"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -240,22 +224,21 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1036"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\$(ProjectName)_r.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
|
||||
AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib"
|
||||
OutputFile="$(RootNamespace)_r.exe"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrtd"
|
||||
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
ImportLibrary="$(RootNamespace)_r.lib"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -282,11 +265,9 @@
|
|||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="..\..\obj64\$(ConfigurationName)\$(ProjectName)"
|
||||
IntermediateDirectory="..\..\obj64\$(ConfigurationName)\$(ProjectName)"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
|
|
@ -303,27 +284,23 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="3"
|
||||
TypeLibraryName=".\../sheets_packer.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="3"
|
||||
Optimization="4"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
AdditionalIncludeDirectories="..\..\client\src;..\..\common\src"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
|
||||
PreprocessorDefinitions="LIBXML_STATIC;WIN32;NDEBUG;ASSERT_THROW_EXCEPTION;_CONSOLE"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="2"
|
||||
RuntimeLibrary="2"
|
||||
BufferSecurityCheck="false"
|
||||
WarningLevel="2"
|
||||
DisableLanguageExtensions="false"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -331,21 +308,21 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1036"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\$(ProjectName)_r.exe"
|
||||
AdditionalLibraryDirectories="../../nel/lib64"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
|
||||
AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib"
|
||||
OutputFile="$(RootNamespace)_r.exe"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrtd"
|
||||
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
ImportLibrary="$(RootNamespace)_r.lib"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
|
||||
#include "nel/misc/types_nl.h"
|
||||
#include "nel/misc/common.h"
|
||||
#include "nel/misc/debug.h"
|
||||
#include "nel/misc/command.h"
|
||||
#include "nel/misc/config_file.h"
|
||||
|
|
@ -33,6 +34,8 @@ extern vector<string> LookupNoRecursePath;
|
|||
|
||||
sint main(sint argc, char **argv)
|
||||
{
|
||||
createDebug();
|
||||
|
||||
CConfigFile cf;
|
||||
CConfigFile::CVar *var;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ OutputPath = "D:/islands_col_meshes";
|
|||
EntryPointsFile = "r2_islands.xml";
|
||||
SearchPaths =
|
||||
{
|
||||
"r:/code/ryzom/data",
|
||||
"r:/code/ryzom/client/data",
|
||||
"D:/islands_list",
|
||||
"D:/cwmap",
|
||||
"r:/code/ryzom/data_common/r2"
|
||||
"r:/code/ryzom/common/data_common/r2"
|
||||
};
|
||||
|
||||
Fly = 1;
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ static void getIslandsInside(sint32 xmin, sint32 xmax, sint32 ymin, sint32 ymax,
|
|||
int main(int argc, char* argv[])
|
||||
{
|
||||
//////////////////
|
||||
createDebug();
|
||||
registerSerial3d();
|
||||
|
||||
if (argc != 2)
|
||||
|
|
@ -187,7 +188,7 @@ int main(int argc, char* argv[])
|
|||
// the same zones were found -> now check their dates against the island one
|
||||
uint32 packedIslandDate = CFile::getFileModificationDate(islandPath);
|
||||
mustRebuild = false;
|
||||
for(uint l = 0; l < presentZonePathes.size(); ++l)
|
||||
for(uint k = 0; k < presentZonePathes.size(); ++k)
|
||||
{
|
||||
if (CFile::getFileModificationDate(presentZonePathes[l]) > packedIslandDate)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue