mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 16:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10826] Fix vmap_assembler compilation after vmap folder move

Browse source 
Also make vmap_assembler compile sucessfuly with VC80.

Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2010-12-05 10:10:40 +01:00
parent 80712b928a
commit c7c5449545
5 changed files with 57 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

14
contrib/vmap_assembler/CMakeLists.txt
View file

@ -22,7 +22,7 @@ ADD_DEFINITIONS("-ggdb")
ADD_DEFINITIONS("-O3") ADD_DEFINITIONS("-O3")
include_directories(../../src/shared) include_directories(../../src/shared)
include_directories(../../src/shared/vmap/) include_directories(../../src/game/vmap/)
include_directories(../../dep/include/g3dlite/) include_directories(../../dep/include/g3dlite/)
include_directories(../../dep/ACE_wrappers/) include_directories(../../dep/ACE_wrappers/)
include_directories(../../objdir/dep/ACE_wrappers) include_directories(../../objdir/dep/ACE_wrappers)
@ -69,12 +69,12 @@ add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
) )
add_library(vmap add_library(vmap
../../src/shared/vmap/BIH.cpp ../../src/game/vmap/BIH.cpp
../../src/shared/vmap/VMapManager2.cpp ../../src/game/vmap/VMapManager2.cpp
../../src/shared/vmap/MapTree.cpp ../../src/game/vmap/MapTree.cpp
../../src/shared/vmap/TileAssembler.cpp ../../src/game/vmap/TileAssembler.cpp
../../src/shared/vmap/WorldModel.cpp ../../src/game/vmap/WorldModel.cpp
../../src/shared/vmap/ModelInstance.cpp ../../src/game/vmap/ModelInstance.cpp
) )
target_link_libraries(vmap g3dlite z) target_link_libraries(vmap g3dlite z)

34
contrib/vmap_assembler/VC100/vmap_assembler.vcxproj
View file

@ -78,7 +78,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -110,7 +110,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -137,7 +137,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
@ -160,7 +160,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
@ -182,21 +182,21 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\vmap_assembler.cpp" /> <ClCompile Include="..\vmap_assembler.cpp" />
<ClCompile Include="..\..\..\src\shared\vmap\BIH.cpp" /> <ClCompile Include="..\..\..\src\game\vmap\BIH.cpp" />
<ClCompile Include="..\..\..\src\shared\vmap\MapTree.cpp" /> <ClCompile Include="..\..\..\src\game\vmap\MapTree.cpp" />
<ClCompile Include="..\..\..\src\shared\vmap\ModelInstance.cpp" /> <ClCompile Include="..\..\..\src\game\vmap\ModelInstance.cpp" />
<ClCompile Include="..\..\..\src\shared\vmap\TileAssembler.cpp" /> <ClCompile Include="..\..\..\src\game\vmap\TileAssembler.cpp" />
<ClCompile Include="..\..\..\src\shared\vmap\VMapManager2.cpp" /> <ClCompile Include="..\..\..\src\game\vmap\VMapManager2.cpp" />
<ClCompile Include="..\..\..\src\shared\vmap\WorldModel.cpp" /> <ClCompile Include="..\..\..\src\game\vmap\WorldModel.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\src\shared\vmap\BIH.h" /> <ClInclude Include="..\..\..\src\game\vmap\BIH.h" />
<ClInclude Include="..\..\..\src\shared\vmap\MapTree.h" /> <ClInclude Include="..\..\..\src\game\vmap\MapTree.h" />
<ClInclude Include="..\..\..\src\shared\vmap\ModelInstance.h" /> <ClInclude Include="..\..\..\src\game\vmap\ModelInstance.h" />
<ClInclude Include="..\..\..\src\shared\vmap\TileAssembler.h" /> <ClInclude Include="..\..\..\src\game\vmap\TileAssembler.h" />
<ClInclude Include="..\..\..\src\shared\vmap\VMapManager2.h" /> <ClInclude Include="..\..\..\src\game\vmap\VMapManager2.h" />
<ClInclude Include="..\..\..\src\shared\vmap\VMapTools.h" /> <ClInclude Include="..\..\..\src\game\vmap\VMapTools.h" />
<ClInclude Include="..\..\..\src\shared\vmap\WorldModel.h" /> <ClInclude Include="..\..\..\src\game\vmap\WorldModel.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\win\VC100\g3dlite.vcxproj"> <ProjectReference Include="..\..\..\win\VC100\g3dlite.vcxproj">

34
contrib/vmap_assembler/VC80/vmap_assembler.vcproj
View file

@ -40,8 +40,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;" AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -119,8 +119,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared\vmap;" AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -190,55 +190,55 @@
Name="vmaplib" Name="vmaplib"
> >
<File <File
RelativePath="..\..\..\src\shared\vmap\BIH.cpp" RelativePath="..\..\..\src\game\vmap\BIH.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\BIH.h" RelativePath="..\..\..\src\game\vmap\BIH.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\MapTree.cpp" RelativePath="..\..\..\src\game\vmap\MapTree.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\MapTree.h" RelativePath="..\..\..\src\game\vmap\MapTree.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\ModelInstance.cpp" RelativePath="..\..\..\src\game\vmap\ModelInstance.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\ModelInstance.h" RelativePath="..\..\..\src\game\vmap\ModelInstance.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\TileAssembler.cpp" RelativePath="..\..\..\src\game\vmap\TileAssembler.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\TileAssembler.h" RelativePath="..\..\..\src\game\vmap\TileAssembler.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\VMapManager2.cpp" RelativePath="..\..\..\src\game\vmap\VMapManager2.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\VMapManager2.h" RelativePath="..\..\..\src\game\vmap\VMapManager2.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\VMapTools.h" RelativePath="..\..\..\src\game\vmap\VMapTools.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\WorldModel.cpp" RelativePath="..\..\..\src\game\vmap\WorldModel.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\WorldModel.h" RelativePath="..\..\..\src\game\vmap\WorldModel.h"
> >
</File> </File>
</Filter> </Filter>

30
contrib/vmap_assembler/VC90/vmap_assembler.vcproj
View file

@ -42,7 +42,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers" AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -121,7 +121,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\shared\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers" AdditionalIncludeDirectories="..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
@ -191,55 +191,55 @@
Name="vmaplib" Name="vmaplib"
> >
<File <File
RelativePath="..\..\..\src\shared\vmap\BIH.cpp" RelativePath="..\..\..\src\game\vmap\BIH.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\BIH.h" RelativePath="..\..\..\src\game\vmap\BIH.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\MapTree.cpp" RelativePath="..\..\..\src\game\vmap\MapTree.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\MapTree.h" RelativePath="..\..\..\src\game\vmap\MapTree.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\ModelInstance.cpp" RelativePath="..\..\..\src\game\vmap\ModelInstance.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\ModelInstance.h" RelativePath="..\..\..\src\game\vmap\ModelInstance.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\TileAssembler.cpp" RelativePath="..\..\..\src\game\vmap\TileAssembler.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\TileAssembler.h" RelativePath="..\..\..\src\game\vmap\TileAssembler.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\VMapManager2.cpp" RelativePath="..\..\..\src\game\vmap\VMapManager2.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\VMapManager2.h" RelativePath="..\..\..\src\game\vmap\VMapManager2.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\VMapTools.h" RelativePath="..\..\..\src\game\vmap\VMapTools.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\WorldModel.cpp" RelativePath="..\..\..\src\game\vmap\WorldModel.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\shared\vmap\WorldModel.h" RelativePath="..\..\..\src\game\vmap\WorldModel.h"
> >
</File> </File>
</Filter> </Filter>

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10825" #define REVISION_NR "10826"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__