TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compiling with VS2012

Browse source 
- updated nasm binaries;
- updated template files to reflect new paths to nasm binaries;

Now .asm files compile with /safeseh option.
This commit is contained in:
Nick-IronTower 2013-04-18 13:31:18 +03:00
parent 38a1eca0be
commit 4543e85d76
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Engine/bin/nasm/nasm.exe Normal file
View file

Binary file not shown.

BIN
Engine/bin/nasm/nasmw.exe
View file

Binary file not shown.

BIN
Engine/bin/nasm/ndisasm.exe Normal file
View file

Binary file not shown.

BIN
Engine/bin/nasm/ndisasmw.exe
View file

Binary file not shown.

6
Tools/projectGenerator/templates/vc2010_fileRecurse.tpl
View file

@ -27,11 +27,11 @@
{else}
{if substr($dirWalk->path, -4, 4) == ".asm"}
<CustomBuild Include="{$dirWalk->path|replace:'//':'/'|replace:'/':'\\'}">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename).obj;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Optimized Debug|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Optimized Debug|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Optimized Debug|Win32'">$(IntDir)%(Filename).obj;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename).obj;%(Outputs)</Outputs>
</CustomBuild>
{elseif $projOutput->isSourceFile( $dirWalk->path ) }

6
Tools/projectGenerator/templates/vc2k8_fileRecurse.tpl
View file

@ -65,21 +65,21 @@
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
Outputs="$(IntDir)/$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Optimized Debug|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
Outputs="$(IntDir)/$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
Outputs="$(IntDir)/$(InputName).obj"/>
</FileConfiguration>
{/if}{* if path == "*.asm" *}