mirror of
https://github.com/mangosfour/server.git
synced 2025-12-24 01:37:02 +00:00
Merge commit 'origin/master' into 310
This commit is contained in:
commit
c86290fa50
183 changed files with 689 additions and 21043 deletions
|
|
@ -80,6 +80,7 @@
|
|||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
|
||||
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -162,6 +163,7 @@
|
|||
Name="VCLibrarianTool"
|
||||
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
|
||||
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
|
||||
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -241,6 +243,7 @@
|
|||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
|
||||
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -322,6 +325,7 @@
|
|||
Name="VCLibrarianTool"
|
||||
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
|
||||
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
|
||||
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -401,6 +405,7 @@
|
|||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
|
||||
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -482,6 +487,7 @@
|
|||
Name="VCLibrarianTool"
|
||||
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib"
|
||||
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
|
||||
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -864,6 +870,10 @@
|
|||
RelativePath="..\..\src\shared\Common.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\shared\LockedQueue.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\shared\revision.h"
|
||||
>
|
||||
|
|
@ -1010,6 +1020,14 @@
|
|||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\shared\Threading.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\shared\Threading.h"
|
||||
>
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue