ref: 3f19534dd6118b96ce73073ae1e047490c71b6e6
parent: 09518da5457fcf0960ed0e233e26c5bcfaa02a14
parent: 87b73257cb2ab78623bd2a4e930db84b91d26786
author: sijchen <sijchen@cisco.com>
date: Fri Feb 6 04:49:49 EST 2015
Merge pull request #1790 from mstorsjo/simplify-vcproj Remove the intermediate SW folder in the decoder vcproj files
--- a/codec/build/win32/dec/WelsDecCore.vcproj
+++ b/codec/build/win32/dec/WelsDecCore.vcproj
@@ -312,639 +312,635 @@
</References>
<Files>
<Filter
- Name="SW"
+ Name="asm"
+ Filter="*.asm;*.inc"
>
- <Filter
- Name="asm"
- Filter="*.asm;*.inc"
+ <File
+ RelativePath="..\..\..\common\x86\cpuid.asm"
>
- <File
- RelativePath="..\..\..\common\x86\cpuid.asm"
+ <FileConfiguration
+ Name="Release|Win32"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\x86\dct.asm"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\common\x86\deblock.asm"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\common\x86\expand_picture.asm"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\x86\intra_pred.asm"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\x86\dct.asm"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\common\x86\mb_copy.asm"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\common\x86\mc_chroma.asm"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\common\x86\mc_luma.asm"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
- Outputs="$(IntDir)\$(InputName).obj"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\..\common\x86\deblock.asm"
>
- <File
- RelativePath="..\..\..\decoder\core\inc\as264_common.h"
+ <FileConfiguration
+ Name="Release|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\au_parser.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\bit_stream.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\cabac_decoder.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
>
- </File>
- <File
- RelativePath="..\..\..\common\inc\copy_mb.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\..\common\x86\expand_picture.asm"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\common\inc\cpu.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
>
- </File>
- <File
- RelativePath="..\..\..\common\inc\cpu_core.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\deblocking.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
>
- </File>
- <File
- RelativePath="..\..\..\common\inc\deblocking_common.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\x86\intra_pred.asm"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\dec_frame.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\dec_golomb.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\decode_mb_aux.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\decode_slice.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\..\common\x86\mb_copy.asm"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\decoder.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\decoder_context.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\decoder_core.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\error_code.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\..\common\x86\mc_chroma.asm"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\error_concealment.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
>
- </File>
- <File
- RelativePath="..\..\..\common\inc\expand_pic.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\fmo.h"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\get_intra_predictor.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\ls_defines.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\macros.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\manage_dec_ref.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\mb_cache.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\mc.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\measure_time.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\memory_align.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\memmgr_nal_unit.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\mv_pred.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\nal_prefix.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\nalu.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\parameter_sets.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\parse_mb_syn_cabac.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\parse_mb_syn_cavlc.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\pic_queue.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\picture.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\rec_mb.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\slice.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\typedefs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\utils.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\vlc_decoder.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\wels_common_basis.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\wels_common_defs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\inc\wels_const.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\wels_const_common.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\..\common\x86\mc_luma.asm"
>
- <File
- RelativePath="..\..\..\decoder\core\src\au_parser.cpp"
+ <FileConfiguration
+ Name="Release|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\bit_stream.cpp"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
>
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\cabac_decoder.cpp"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\common\src\common_tables.cpp"
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
>
- </File>
- <File
- RelativePath="..\..\..\common\src\copy_mb.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\common\src\cpu.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\common\src\crt_util_safe_x.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\deblocking.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\common\src\deblocking_common.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\decode_mb_aux.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\decode_slice.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\decoder.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\decoder_core.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\decoder_data_tables.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\error_concealment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\common\src\expand_pic.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\fmo.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\get_intra_predictor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\manage_dec_ref.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\common\src\mc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\common\src\memory_align.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\memmgr_nal_unit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\mv_pred.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\parse_mb_syn_cabac.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\parse_mb_syn_cavlc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\pic_queue.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\core\src\rec_mb.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\common\src\utils.cpp"
- >
- </File>
- </Filter>
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)
"
+ Outputs="$(IntDir)\$(InputName).obj"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\..\..\decoder\core\inc\as264_common.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\au_parser.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\bit_stream.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\cabac_decoder.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\copy_mb.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\cpu.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\cpu_core.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\deblocking.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\deblocking_common.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\dec_frame.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\dec_golomb.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\decode_mb_aux.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\decode_slice.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\decoder.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\decoder_context.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\decoder_core.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\error_code.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\error_concealment.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\expand_pic.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\fmo.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\get_intra_predictor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\ls_defines.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\macros.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\manage_dec_ref.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\mb_cache.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\mc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\measure_time.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\memmgr_nal_unit.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\memory_align.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\mv_pred.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\nal_prefix.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\nalu.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\parameter_sets.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\parse_mb_syn_cabac.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\parse_mb_syn_cavlc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\pic_queue.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\picture.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\rec_mb.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\slice.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\typedefs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\utils.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\vlc_decoder.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\wels_common_basis.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\wels_common_defs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\inc\wels_const.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\wels_const_common.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\..\..\decoder\core\src\au_parser.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\bit_stream.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\cabac_decoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\common_tables.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\copy_mb.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\cpu.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\crt_util_safe_x.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\deblocking.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\deblocking_common.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\decode_mb_aux.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\decode_slice.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\decoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\decoder_core.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\decoder_data_tables.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\error_concealment.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\expand_pic.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\fmo.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\get_intra_predictor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\manage_dec_ref.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\mc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\memmgr_nal_unit.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\memory_align.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\mv_pred.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\parse_mb_syn_cabac.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\parse_mb_syn_cavlc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\pic_queue.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\core\src\rec_mb.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\utils.cpp"
+ >
+ </File>
</Filter>
</Files>
<Globals>
--- a/codec/build/win32/dec/WelsDecPlus.vcproj
+++ b/codec/build/win32/dec/WelsDecPlus.vcproj
@@ -351,51 +351,47 @@
</References>
<Files>
<Filter
- Name="SW"
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ <File
+ RelativePath="..\..\..\common\inc\mem_align.h"
>
- <File
- RelativePath="..\..\..\decoder\plus\res\welsdec.rc"
- >
- </File>
- </Filter>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ </File>
+ <File
+ RelativePath="..\..\..\common\inc\welsCodecTrace.h"
>
- <File
- RelativePath="..\..\..\decoder\plus\src\wels_dec_export.def"
- >
- </File>
- <File
- RelativePath="..\..\..\common\src\welsCodecTrace.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\plus\src\welsDecoderExt.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\plus\inc\welsDecoderExt.h"
>
- <File
- RelativePath="..\..\..\common\inc\mem_align.h"
- >
- </File>
- <File
- RelativePath="..\..\..\common\inc\welsCodecTrace.h"
- >
- </File>
- <File
- RelativePath="..\..\..\decoder\plus\inc\welsDecoderExt.h"
- >
- </File>
- </Filter>
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\..\..\decoder\plus\res\welsdec.rc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\..\..\decoder\plus\src\wels_dec_export.def"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\common\src\welsCodecTrace.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\decoder\plus\src\welsDecoderExt.cpp"
+ >
+ </File>
</Filter>
</Files>
<Globals>