hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-23 18:14:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Workaround for compiling .asm files in Visual Studio 2017

Browse source
This commit is contained in:
Ari Lemmetti 2018-04-06 15:18:08 +03:00
parent f033ad0ad0
commit 6be81959d5
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/kvazaar_lib/kvazaar_lib.vcxproj
View file

@ -83,11 +83,13 @@
</Lib> </Lib>
<YASM> <YASM>
<Defines>ARCH_X86_64=1;%(Defines)</Defines> <Defines>ARCH_X86_64=1;%(Defines)</Defines>
<IncludePaths>$(SolutionDir)..\src\extras;%(IncludePaths);$(SolutionDir)..\src\strategies\x86-asm;</IncludePaths>
</YASM> </YASM>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<YASM> <YASM>
<Defines>ARCH_X86_64=0;PREFIX</Defines> <Defines>ARCH_X86_64=0;PREFIX</Defines>
<IncludePaths>$(SolutionDir)..\src\extras;%(IncludePaths);$(SolutionDir)..\src\strategies\x86-asm;</IncludePaths>
</YASM> </YASM>
<Lib> <Lib>
<AdditionalLibraryDirectories>$(SolutionDir)..\..\pthreads.2\lib\x86</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SolutionDir)..\..\pthreads.2\lib\x86</AdditionalLibraryDirectories>
@ -101,6 +103,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<YASM> <YASM>
<Defines>ARCH_X86_64=0;PREFIX</Defines> <Defines>ARCH_X86_64=0;PREFIX</Defines>
<IncludePaths>$(SolutionDir)..\src\extras;%(IncludePaths);$(SolutionDir)..\src\strategies\x86-asm;</IncludePaths>
</YASM> </YASM>
<Lib> <Lib>
<AdditionalLibraryDirectories>$(SolutionDir)..\..\pthreads.2\lib\x86</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SolutionDir)..\..\pthreads.2\lib\x86</AdditionalLibraryDirectories>
@ -114,6 +117,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<YASM> <YASM>
<Defines>ARCH_X86_64=1;%(Defines)</Defines> <Defines>ARCH_X86_64=1;%(Defines)</Defines>
<IncludePaths>$(SolutionDir)..\src\extras;%(IncludePaths);$(SolutionDir)..\src\strategies\x86-asm;</IncludePaths>
</YASM> </YASM>
<Lib> <Lib>
<AdditionalLibraryDirectories>$(SolutionDir)..\..\pthreads.2\lib\x64</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SolutionDir)..\..\pthreads.2\lib\x64</AdditionalLibraryDirectories>

9
build/yasm/vsyasm.targets
View file

@ -20,7 +20,7 @@
AfterTargets="$(YASMAfterTargets)" AfterTargets="$(YASMAfterTargets)"
Condition="'@(YASM)' != ''" Condition="'@(YASM)' != ''"
DependsOnTargets="$(YASMDependsOn);ComputeYASMOutput" DependsOnTargets="$(YASMDependsOn);ComputeYASMOutput"
Outputs="@(YASM->'%(ObjectFile)')" Outputs="@(YASM->'$(ProjectDir)$(IntDir)%(Filename).obj')"
Inputs="@(YASM);%(YASM.AdditionalDependencies);$(MSBuildProjectFile)"> Inputs="@(YASM);%(YASM.AdditionalDependencies);$(MSBuildProjectFile)">
<ItemGroup <ItemGroup
Condition="'@(SelectedFiles)' != ''"> Condition="'@(SelectedFiles)' != ''">
@ -32,7 +32,7 @@
<YASM_tlog <YASM_tlog
Include="%(YASM.ObjectFile)" Include="%(YASM.ObjectFile)"
Condition="'%(YASM.ObjectFile)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"> Condition="'%(YASM.ObjectFile)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">
<Source>@(YASM, '|')</Source> <Source>@(YASM->'%(FullPath)', '|')</Source>
</YASM_tlog> </YASM_tlog>
</ItemGroup> </ItemGroup>
<Message <Message
@ -40,8 +40,9 @@
Text="%(YASM.ExecutionDescription)" /> Text="%(YASM.ExecutionDescription)" />
<WriteLinesToFile <WriteLinesToFile
Condition="'@(YASM_tlog)' != '' and '%(YASM_tlog.ExcludedFromBuild)' != 'true'" Condition="'@(YASM_tlog)' != '' and '%(YASM_tlog.ExcludedFromBuild)' != 'true'"
File="$(IntDir)$(ProjectName).write.1.tlog" File="$(TLogLocation)$(ProjectName).write.1.tlog"
Lines="^%(YASM_tlog.Source);@(YASM_tlog->'%(Fullpath)')" /> Lines="^%(YASM_tlog.Source);@(YASM->'$(ProjectDir)$(IntDir)%(Filename).obj')"
Encoding="Unicode" />
<YASM <YASM
Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'" Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"
CommandLineTemplate="%(YASM.CommandLineTemplate)" CommandLineTemplate="%(YASM.CommandLineTemplate)"