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

[8791] Fixed problems with atomic_support.obj in x64 mode

Browse source 
* Place atomic_support.obj to porjtect dirs instaed bin dir
* This also fix build fail at clean solution (not need now restart build for finish).
This commit is contained in:
VladimirMangos 2009-11-08 18:15:20 +03:00
parent 1e9c672abd
commit a0141c7d2f
7 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "8790"
#define REVISION_NR "8791"
#endif // __REVISION_NR_H__

12
win/VC100/tbb.vcxproj
View file

@ -288,19 +288,19 @@
<CustomBuild Include="..\..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">building atomic_support.obj</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">building atomic_support.obj</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
<Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">building atomic_support.obj</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ml64 /Fo..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
</CustomBuild>
<MASM Include="..\..\dep\tbb\src\tbb\ia32-masm\lock_byte.asm">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/coff /Zi</AdditionalOptions>

12
win/VC100/tbbmalloc.vcxproj
View file

@ -289,19 +289,19 @@
<CustomBuild Include="..\..\dep\tbb\src\tbb\em64t-masm\atomic_support.asm">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">building atomic_support.obj</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">building atomic_support.obj</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
<Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">true</ExcludedFromBuild>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">building atomic_support.obj</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>

12
win/VC80/tbb.vcproj
View file

@ -544,8 +544,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
<FileConfiguration
@ -562,8 +562,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
<FileConfiguration
@ -580,8 +580,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
</File>

12
win/VC80/tbbmalloc.vcproj
View file

@ -604,8 +604,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
<FileConfiguration
@ -622,8 +622,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
<FileConfiguration
@ -640,8 +640,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
</File>

12
win/VC90/tbb.vcproj
View file

@ -585,8 +585,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
<FileConfiguration
@ -603,8 +603,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
<FileConfiguration
@ -621,8 +621,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbb__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
</File>

12
win/VC90/tbbmalloc.vcproj
View file

@ -553,8 +553,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
<FileConfiguration
@ -571,8 +571,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
<FileConfiguration
@ -589,8 +589,8 @@
<Tool
Name="VCCustomBuildTool"
Description="building atomic_support.obj"
CommandLine="ml64 /Fo&quot;..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
CommandLine="ml64 /Fo&quot;tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj&quot; /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm&#x0D;&#x0A;"
Outputs="tbbmalloc__$(PlatformName)_$(ConfigurationName)\atomic_support.obj"
/>
</FileConfiguration>
</File>