Merge commit 'origin/master' into 310

This commit is contained in:
tomrus88 2009-05-11 15:11:02 +04:00
commit c86290fa50
183 changed files with 689 additions and 21043 deletions

View file

@ -79,6 +79,7 @@
Name="VCLibrarianTool"
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib user32.lib"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
SuppressStartupBanner="true"
/>
<Tool
@ -161,6 +162,7 @@
Name="VCLibrarianTool"
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib user32.lib"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
SuppressStartupBanner="true"
/>
<Tool
@ -239,6 +241,7 @@
Name="VCLibrarianTool"
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib user32.lib"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
SuppressStartupBanner="true"
/>
<Tool
@ -317,6 +320,7 @@
Name="VCLibrarianTool"
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib user32.lib"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
SuppressStartupBanner="true"
/>
<Tool
@ -397,6 +401,7 @@
Name="VCLibrarianTool"
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib user32.lib"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)"
SuppressStartupBanner="true"
/>
<Tool
@ -477,6 +482,7 @@
Name="VCLibrarianTool"
AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib user32.lib"
OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib"
AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug"
SuppressStartupBanner="true"
/>
<Tool
@ -859,6 +865,10 @@
RelativePath="..\..\src\shared\Common.h"
>
</File>
<File
RelativePath="..\..\src\shared\LockedQueue.h"
>
</File>
<File
RelativePath="..\..\src\shared\revision.h"
>
@ -963,6 +973,14 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\shared\Threading.cpp"
>
</File>
<File
RelativePath="..\..\src\shared\Threading.h"
>
</File>
</Files>
<Globals>
</Globals>