From 2c828d7918bb52db6da761ab965a86ea11e57a20 Mon Sep 17 00:00:00 2001 From: volvet Date: Fri, 3 Jan 2014 16:12:47 +0800 Subject: [PATCH] merge VS2012 makefile for 64bits assembly --- build/platform-darwin.mk | 4 + build/platform-linux.mk | 3 + .../build/win32/dec/WelsDecCore_2012.vcxproj | 363 ++++------ .../build/win32/dec/WelsDecPlus_2012.vcxproj | 110 ++- codec/build/win32/dec/WelsDecoder_2012.sln | 54 +- codec/build/win32/dec/decConsole_2012.vcxproj | 124 ++-- .../build/win32/enc/WelsEncCore_2012.vcxproj | 675 +++++++++++------- .../build/win32/enc/WelsEncPlus_2012.vcxproj | 107 +-- codec/build/win32/enc/WelsEncoder_2012.sln | 78 +- codec/build/win32/enc/encConsole_2012.vcxproj | 126 ++-- codec/processing/build/win32/WelsVP_2012.sln | 16 +- .../build/win32/WelsVP_2012.v11.suo | Bin 18944 -> 19968 bytes .../build/win32/WelsVP_2012.vcxproj | 219 +++--- 13 files changed, 984 insertions(+), 895 deletions(-) diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk index 84be9349..4cdc09b3 100644 --- a/build/platform-darwin.mk +++ b/build/platform-darwin.mk @@ -2,7 +2,11 @@ ASM = nasm CFLAGS += -Werror -fPIC LDFLAGS += -lpthread +<<<<<<< HEAD +ASMFLAGS += --prefix _ +======= ASMFLAGS += --prefix _ -DNOPREFIX +>>>>>>> 64bits_Support ifeq ($(ENABLE64BIT), Yes) ASMFLAGS += -f macho64 else diff --git a/build/platform-linux.mk b/build/platform-linux.mk index 43d5656b..ea499983 100644 --- a/build/platform-linux.mk +++ b/build/platform-linux.mk @@ -1,7 +1,10 @@ ASM = nasm CFLAGS += -Werror -fPIC -DLINUX -D__NO_CTYPE LDFLAGS += -lpthread +<<<<<<< HEAD +======= ASMFLAGS += -DNOPREFIX +>>>>>>> 64bits_Support ifeq ($(ENABLE64BIT), Yes) ASMFLAGS += -f elf64 else diff --git a/codec/build/win32/dec/WelsDecCore_2012.vcxproj b/codec/build/win32/dec/WelsDecCore_2012.vcxproj index e3c61773..6fbca845 100644 --- a/codec/build/win32/dec/WelsDecCore_2012.vcxproj +++ b/codec/build/win32/dec/WelsDecCore_2012.vcxproj @@ -19,32 +19,32 @@ - {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5} + {8F8F8443-3C71-4427-8949-BD2EAEC1E709} StaticLibrary - v110 false MultiByte + v110 StaticLibrary - v110 false MultiByte + v110 StaticLibrary - v110 false MultiByte + v110 StaticLibrary - v110 false MultiByte + v110 @@ -68,64 +68,38 @@ - <_ProjectFileVersion>11.0.61030.0 - - - .\..\..\..\..\bin\win32\Release - .\..\..\..\obj\decoder\core\release\ - welsdcore - - - welsdcore - .\..\..\..\..\bin\win64\Release - .\..\..\..\obj\decoder\core\release\ - - - .\..\..\..\..\bin\win32\Debug - .\..\..\..\obj\decoder\core\debug\ - welsdcore - - - welsdcore - .\..\..\..\..\bin\win64\Debug - .\..\..\..\obj\decoder\core\debug\ + <_ProjectFileVersion>10.0.40219.1 + .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\decoder\core\release\ + .\..\..\..\obj\decoder\core\release\ + .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\decoder\core\debug\ + .\..\..\..\obj\decoder\core\debug\ + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + welsdcore + welsdcore + welsdcore + welsdcore MaxSpeed OnlyExplicitInline - ..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\..\..\..\obj\decoder\core\release/WelsDecCore.pch - .\..\..\..\obj\decoder\core\release/ - .\..\..\..\obj\decoder\core\release/ - .\..\..\..\obj\decoder\core\release/ - Level3 - true - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\welsdcore.lib - true - - - true - $(OutDir)\welsdcore.bsc - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_LIB;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + ..\..\..\decoder\core\inc;..\..\..\common;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;X86_ASM;_LIB;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -148,13 +122,48 @@ true - $(OutDir)\welsdcore.bsc + $(OutDir)\WelsDecCore.bsc + + + MaxSpeed + OnlyExplicitInline + ..\..\..\decoder\core\inc;..\..\..\common;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;X86_ASM;_LIB;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\..\..\..\obj\decoder\core\release/WelsDecCore.pch + .\..\..\..\obj\decoder\core\release/ + .\..\..\..\obj\decoder\core\release/ + .\..\..\..\obj\decoder\core\release/ + Level3 + true + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\welsdcore.lib + true + + + true + $(OutDir)\WelsDecCore.bsc + + + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + Disabled - ..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) + ..\..\..\decoder\core\inc;..\..\..\common;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;X86_ASM;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) true EnableFastChecks @@ -177,13 +186,13 @@ true - $(OutDir)\welsdcore.bsc + $(OutDir)\WelsDecCore.bsc Disabled - ..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) + ..\..\..\decoder\core\inc;..\..\..\common;..\..\..\api\svc;..\..\..\hwDecoder\core\inc;..\..\..\hwDecoder\dxva\inc;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_LIB;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -205,178 +214,47 @@ true - $(OutDir)\welsdcore.bsc + $(OutDir)\WelsDecCore.bsc + + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true + @@ -418,6 +296,7 @@ + @@ -440,6 +319,68 @@ + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + + diff --git a/codec/build/win32/dec/WelsDecPlus_2012.vcxproj b/codec/build/win32/dec/WelsDecPlus_2012.vcxproj index 400128ae..c0365a6d 100644 --- a/codec/build/win32/dec/WelsDecPlus_2012.vcxproj +++ b/codec/build/win32/dec/WelsDecPlus_2012.vcxproj @@ -19,33 +19,33 @@ - {1131558A-9986-4F4B-A13F-8B7F4C8438BF} + {29B1A0B9-45A2-4329-A4D3-5E9375EE888C} WelsDecPlus DynamicLibrary - v110 false MultiByte + v110 DynamicLibrary - v110 false MultiByte + v110 DynamicLibrary - v110 false MultiByte + v110 DynamicLibrary - v110 false MultiByte + v110 @@ -68,31 +68,35 @@ - <_ProjectFileVersion>11.0.61030.0 - - - .\..\..\..\..\bin\win32\Release - .\..\..\..\obj\decoder\plus\Release\ - false - welsdec - - - false - welsdec - .\..\..\..\..\bin\win64\Release - .\..\..\..\obj\decoder\plus\Release\ - - - .\..\..\..\..\bin\win32\Debug - .\..\..\..\obj\decoder\plus\debug\ - false - welsdec - - - false - welsdec - .\..\..\..\..\bin\win64\Debug - .\..\..\..\obj\decoder\plus\debug\ + <_ProjectFileVersion>10.0.40219.1 + .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\decoder\plus\Release\ + .\..\..\..\obj\decoder\plus\Release\ + false + false + .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\decoder\plus\debug\ + .\..\..\..\obj\decoder\plus\debug\ + false + false + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + welsdec + welsdec + welsdec + welsdec @@ -101,12 +105,13 @@ true Win32 .\..\..\..\..\..\bin\Release/WelsDecPlus.tlb - + + MaxSpeed OnlyExplicitInline - ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + ..\..\..\common;..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -124,7 +129,7 @@ 0x0409 - .\..\..\..\..\bin\win32\Release\welsdcore.lib;%(AdditionalDependencies) + $(OutDir)\welsdcore.lib;%(AdditionalDependencies) $(OutDir)\welsdec.dll true .\..\..\..\libs\Release\;%(AdditionalLibraryDirectories) @@ -137,11 +142,10 @@ true $(OutDir)\welsdec.lib MachineX86 - $(OutDir)\welsdec.pgd true - $(OutDir)\welsdec.bsc + $(OutDir)\WelsDecPlus.bsc @@ -156,8 +160,8 @@ MaxSpeed OnlyExplicitInline - ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) + ..\..\..\common;..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -174,7 +178,7 @@ 0x0409 - .\..\..\..\..\bin\win64\Release\welsdcore.lib;%(AdditionalDependencies) + $(OutDir)\welsdcore.lib;%(AdditionalDependencies) $(OutDir)\welsdec.dll true .\..\..\..\libs\Release\;%(AdditionalLibraryDirectories) @@ -186,11 +190,10 @@ false true $(OutDir)\welsdec.lib - $(OutDir)\welsdec.pgd true - $(OutDir)\welsdec.bsc + $(OutDir)\WelsDecPlus.bsc @@ -200,11 +203,12 @@ true Win32 .\..\..\..\..\..\bin\Debug/WelsDecPlus.tlb - + + Disabled - ..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) + ..\..\..\common;..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common;..\..\..\hwDecoder\plus\inc;..\..\..\hwDecoder\core\inc;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WELSDECPLUS_EXPORTS;HAVE_CACHE_LINE_ALIGN;%(PreprocessorDefinitions) true EnableFastChecks @@ -222,7 +226,7 @@ 0x0409 - .\..\..\..\..\bin\win32\Debug\welsdcore.lib;%(AdditionalDependencies) + $(OutDir)\welsdcore.lib;%(AdditionalDependencies) $(OutDir)\welsdec.dll true ..\..\..\libs\debug;%(AdditionalLibraryDirectories) @@ -233,12 +237,10 @@ true $(OutDir)\welsdec.lib MachineX86 - $(OutDir)\welsdec.map - $(OutDir)\welsdec.pgd true - $(OutDir)\welsdec.bsc + $(OutDir)\WelsDecPlus.bsc @@ -269,7 +271,7 @@ 0x0409 - .\..\..\..\..\bin\win64\Debug\welsdcore.lib;%(AdditionalDependencies) + $(OutDir)\welsdcore.lib;%(AdditionalDependencies) $(OutDir)\welsdec.dll true ..\..\..\libs\debug;%(AdditionalLibraryDirectories) @@ -279,18 +281,20 @@ false true $(OutDir)\welsdec.lib - $(OutDir)\welsdec.map - $(OutDir)\welsdec.pgd true - $(OutDir)\welsdec.bsc + $(OutDir)\WelsDecPlus.bsc + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) \SVN_project_https\trunk\codec\Wels\project\decoder\plus\res;%(AdditionalIncludeDirectories) @@ -307,12 +311,6 @@ - - - {01b4ae41-6ad6-4caf-aeb3-c42f7f9121d5} - false - - diff --git a/codec/build/win32/dec/WelsDecoder_2012.sln b/codec/build/win32/dec/WelsDecoder_2012.sln index 04f5af34..717b5816 100644 --- a/codec/build/win32/dec/WelsDecoder_2012.sln +++ b/codec/build/win32/dec/WelsDecoder_2012.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsDecCore_2012", "WelsDecCore_2012.vcxproj", "{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decConsole_2012", "decConsole_2012.vcxproj", "{211F1AF2-F757-43D3-AE27-F0B2B7E86B71}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsDecPlus_2012", "WelsDecPlus_2012.vcxproj", "{1131558A-9986-4F4B-A13F-8B7F4C8438BF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsDecCore_2012", "WelsDecCore_2012.vcxproj", "{8F8F8443-3C71-4427-8949-BD2EAEC1E709}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decConsole_2012", "decConsole_2012.vcxproj", "{71973A8E-103D-4FB7-951F-55E35E7F60FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsDecPlus_2012", "WelsDecPlus_2012.vcxproj", "{29B1A0B9-45A2-4329-A4D3-5E9375EE888C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,30 +15,30 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.ActiveCfg = Debug|Win32 - {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.Build.0 = Debug|Win32 - {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.ActiveCfg = Debug|x64 - {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.Build.0 = Debug|x64 - {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.ActiveCfg = Release|Win32 - {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.Build.0 = Release|Win32 - {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.ActiveCfg = Release|x64 - {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.Build.0 = Release|x64 - {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.ActiveCfg = Debug|Win32 - {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.Build.0 = Debug|Win32 - {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.ActiveCfg = Debug|x64 - {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.Build.0 = Debug|x64 - {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.ActiveCfg = Release|Win32 - {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.Build.0 = Release|Win32 - {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.ActiveCfg = Release|x64 - {1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.Build.0 = Release|x64 - {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.ActiveCfg = Debug|Win32 - {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.Build.0 = Debug|Win32 - {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.ActiveCfg = Debug|x64 - {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.Build.0 = Debug|x64 - {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.ActiveCfg = Release|Win32 - {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.Build.0 = Release|Win32 - {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.ActiveCfg = Release|x64 - {71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.Build.0 = Release|x64 + {211F1AF2-F757-43D3-AE27-F0B2B7E86B71}.Debug|Win32.ActiveCfg = Debug|Win32 + {211F1AF2-F757-43D3-AE27-F0B2B7E86B71}.Debug|Win32.Build.0 = Debug|Win32 + {211F1AF2-F757-43D3-AE27-F0B2B7E86B71}.Debug|x64.ActiveCfg = Debug|x64 + {211F1AF2-F757-43D3-AE27-F0B2B7E86B71}.Debug|x64.Build.0 = Debug|x64 + {211F1AF2-F757-43D3-AE27-F0B2B7E86B71}.Release|Win32.ActiveCfg = Release|Win32 + {211F1AF2-F757-43D3-AE27-F0B2B7E86B71}.Release|Win32.Build.0 = Release|Win32 + {211F1AF2-F757-43D3-AE27-F0B2B7E86B71}.Release|x64.ActiveCfg = Release|x64 + {211F1AF2-F757-43D3-AE27-F0B2B7E86B71}.Release|x64.Build.0 = Release|x64 + {8F8F8443-3C71-4427-8949-BD2EAEC1E709}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F8F8443-3C71-4427-8949-BD2EAEC1E709}.Debug|Win32.Build.0 = Debug|Win32 + {8F8F8443-3C71-4427-8949-BD2EAEC1E709}.Debug|x64.ActiveCfg = Debug|x64 + {8F8F8443-3C71-4427-8949-BD2EAEC1E709}.Debug|x64.Build.0 = Debug|x64 + {8F8F8443-3C71-4427-8949-BD2EAEC1E709}.Release|Win32.ActiveCfg = Release|Win32 + {8F8F8443-3C71-4427-8949-BD2EAEC1E709}.Release|Win32.Build.0 = Release|Win32 + {8F8F8443-3C71-4427-8949-BD2EAEC1E709}.Release|x64.ActiveCfg = Release|x64 + {8F8F8443-3C71-4427-8949-BD2EAEC1E709}.Release|x64.Build.0 = Release|x64 + {29B1A0B9-45A2-4329-A4D3-5E9375EE888C}.Debug|Win32.ActiveCfg = Debug|Win32 + {29B1A0B9-45A2-4329-A4D3-5E9375EE888C}.Debug|Win32.Build.0 = Debug|Win32 + {29B1A0B9-45A2-4329-A4D3-5E9375EE888C}.Debug|x64.ActiveCfg = Debug|x64 + {29B1A0B9-45A2-4329-A4D3-5E9375EE888C}.Debug|x64.Build.0 = Debug|x64 + {29B1A0B9-45A2-4329-A4D3-5E9375EE888C}.Release|Win32.ActiveCfg = Release|Win32 + {29B1A0B9-45A2-4329-A4D3-5E9375EE888C}.Release|Win32.Build.0 = Release|Win32 + {29B1A0B9-45A2-4329-A4D3-5E9375EE888C}.Release|x64.ActiveCfg = Release|x64 + {29B1A0B9-45A2-4329-A4D3-5E9375EE888C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/codec/build/win32/dec/decConsole_2012.vcxproj b/codec/build/win32/dec/decConsole_2012.vcxproj index 7d5b4f5b..2030a407 100644 --- a/codec/build/win32/dec/decConsole_2012.vcxproj +++ b/codec/build/win32/dec/decConsole_2012.vcxproj @@ -19,32 +19,32 @@ - {71973A8E-103D-4FB7-951F-55E35E7F60FA} + {211F1AF2-F757-43D3-AE27-F0B2B7E86B71} Application - v110 false MultiByte + v110 Application - v110 false MultiByte + v110 Application - v110 false MultiByte + v110 Application - v110 false MultiByte + v110 @@ -67,41 +67,46 @@ - <_ProjectFileVersion>11.0.61030.0 - - - .\..\..\..\..\bin\win32\Release - .\..\..\..\obj\decConsole\Release\ - false - decConsole - - - false - decConsole - .\..\..\..\..\bin\win64\Release - .\..\..\..\obj\decConsole\Release\ - - - .\..\..\..\..\bin\win32\Debug - .\..\..\..\obj\decConsole\Debug\ - true - decConsole - - - true - decConsole - .\..\..\..\..\bin\win64\Debug - .\..\..\..\obj\decConsole\Debug\ + <_ProjectFileVersion>10.0.40219.1 + .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\decConsole\Release\ + .\..\..\..\obj\decConsole\Release\ + false + false + .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win32\Debug + .\..\..\..\obj\decConsole\Debug\ + .\..\..\..\obj\decConsole\Debug\ + true + true + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + decConsole + decConsole + decConsole + decConsole .\..\..\..\..\bin\Release/decConsole.tlb - + + MaxSpeed OnlyExplicitInline - ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) + ..\..\..\common;..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -127,8 +132,7 @@ false true MachineX86 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsdec.lib;%(AdditionalDependencies) - $(OutDir)\decConsole.pgd + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win32\Release\welsdec.lib;%(AdditionalDependencies) true @@ -144,8 +148,8 @@ MaxSpeed OnlyExplicitInline - ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\..\common;..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -169,8 +173,7 @@ Console false true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsdec.lib;%(AdditionalDependencies) - $(OutDir)\decConsole.pgd + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win64\Release\welsdec.lib;%(AdditionalDependencies) true @@ -180,7 +183,8 @@ .\..\..\..\..\bin\Debug/decConsole.tlb - + + Disabled @@ -207,14 +211,12 @@ true ..\..\..\..\bin;%(AdditionalLibraryDirectories) true - $(OutDir)\decConsole.pdb + $(OutDir)\decConsoled.pdb Console false true MachineX86 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsdec.lib;%(AdditionalDependencies) - $(OutDir)\decConsole.map - $(OutDir)\decConsole.pgd + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win32\debug\welsdec.lib;%(AdditionalDependencies) true @@ -229,7 +231,7 @@ Disabled - ..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) + ..\..\..\common;..\..\..\console\dec\inc;..\..\..\api\svc;..\..\..\common;..\..\..\encoder\core\inc;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -251,13 +253,11 @@ true ..\..\..\..\bin;%(AdditionalLibraryDirectories) true - $(OutDir)\decConsole.pdb + $(OutDir)\decConsoled.pdb Console false true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsdec.lib;%(AdditionalDependencies) - $(OutDir)\decConsole.map - $(OutDir)\decConsole.pgd + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win64\debug\welsdec.lib;%(AdditionalDependencies) true @@ -266,8 +266,26 @@ - - + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + @@ -277,12 +295,6 @@ - - - {1131558a-9986-4f4b-a13f-8b7f4c8438bf} - false - - diff --git a/codec/build/win32/enc/WelsEncCore_2012.vcxproj b/codec/build/win32/enc/WelsEncCore_2012.vcxproj index cf008926..275c1920 100644 --- a/codec/build/win32/enc/WelsEncCore_2012.vcxproj +++ b/codec/build/win32/enc/WelsEncCore_2012.vcxproj @@ -19,33 +19,33 @@ - {59208004-1774-4816-AC24-31FF44C324B4} + {4BD24F30-FC28-4F24-874D-90F8C9286390} WelsEncCore StaticLibrary - v110 false MultiByte + v110 StaticLibrary - v110 false MultiByte + v110 StaticLibrary - v110 false MultiByte + v110 StaticLibrary - v110 false MultiByte + v110 @@ -69,27 +69,31 @@ - <_ProjectFileVersion>11.0.61030.0 - - - .\..\..\..\..\bin\win32\Debug - .\..\..\..\obj\encoder\core\Debug\ - welsecore - - - welsecore - .\..\..\..\..\bin\win64\Debug - .\..\..\..\obj\encoder\core\Debug\ - - - .\..\..\..\..\bin\win32\Release - .\..\..\..\obj\encoder\core\Release\ - welsecore - - - welsecore - .\..\..\..\..\bin\win64\Release - .\..\..\..\obj\encoder\core\Release\ + <_ProjectFileVersion>10.0.40219.1 + .\..\..\..\..\bin\win32\Debug\ + .\..\..\..\..\bin\win64\Debug\ + .\..\..\..\obj\encoder\core\Debug\ + .\..\..\..\obj\encoder\core\Debug\ + .\..\..\..\..\bin\win32\Release\ + .\..\..\..\..\bin\win64\Release\ + .\..\..\..\obj\encoder\core\Release\ + .\..\..\..\obj\encoder\core\Release\ + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + welsecore + welsecore + welsecore + welsecore @@ -112,12 +116,12 @@ 0x0409 - $(OutDir)\welsecore.lib + ..\..\..\..\libs\welsecore.lib true true - $(OutDir)\welsecore.bsc + .\..\..\..\..\..\bin\Debug/WelsEncCore.bsc IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ @@ -127,7 +131,7 @@ Disabled ..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + WIN64;_DEBUG;X86_ASM;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL .\..\..\..\obj\encoder\core\Debug/WelsEncCore.pch @@ -143,12 +147,12 @@ 0x0409 - $(OutDir)\welsecore.lib + ..\..\..\..\libs\welsecore.lib true true - $(OutDir)\welsecore.bsc + .\..\..\..\..\..\bin\Debug/WelsEncCore.bsc IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ @@ -179,12 +183,12 @@ /LTCG %(AdditionalOptions) - $(OutDir)\welsecore.lib + ..\..\..\..\libs\welsecore.lib true true - $(OutDir)\welsecore.bsc + .\..\..\..\..\..\bin\Release/WelsEncCore.bsc IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ @@ -197,7 +201,7 @@ Speed true ..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\WelsThreadLib\api;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) + WIN64;NDEBUG;X86_ASM;_LIB;WELS_SVC;ENCODER_CORE;HAVE_CACHE_LINE_ALIGN;MT_ENABLED;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -215,51 +219,291 @@ /LTCG %(AdditionalOptions) - $(OutDir)\welsecore.lib + ..\..\..\..\libs\welsecore.lib true true - $(OutDir)\welsecore.bsc + .\..\..\..\..\..\bin\Release/WelsEncCore.bsc IF EXIST "$(SolutionDir)..\..\bin\$(Configuration)" copy $(SolutionDir)..\..\bin\$(Configuration)\*.* $(SolutionDir)\..\..\..\..\..\bin\$(Configuration)\ - - - - - + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) OUPUT_REF_PIC;%(PreprocessorDefinitions) OUPUT_REF_PIC;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) - - - - - - - - - - - - + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + - + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + - - - - - - - - + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + @@ -325,255 +569,154 @@ - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -O3 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) - true - true + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) diff --git a/codec/build/win32/enc/WelsEncPlus_2012.vcxproj b/codec/build/win32/enc/WelsEncPlus_2012.vcxproj index 429d8ccd..325eb1aa 100644 --- a/codec/build/win32/enc/WelsEncPlus_2012.vcxproj +++ b/codec/build/win32/enc/WelsEncPlus_2012.vcxproj @@ -19,33 +19,33 @@ - {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F} + {B5988995-D15F-479C-BD4D-CA41A26871E0} WelsEncPlus DynamicLibrary - v110 false MultiByte + v110 DynamicLibrary - v110 false MultiByte + v110 DynamicLibrary - v110 false MultiByte + v110 DynamicLibrary - v110 false MultiByte + v110 @@ -68,31 +68,35 @@ - <_ProjectFileVersion>11.0.61030.0 - - - .\..\..\..\..\bin\win32\Debug - .\..\..\..\obj\encoder\plus\Debug\ - true - welsenc - - - true - welsenc - .\..\..\..\..\bin\win64\Debug - .\..\..\..\obj\encoder\plus\Debug\ - - - .\..\..\..\..\bin\win32\Release - .\..\..\..\obj\encoder\plus\Release\ - false - welsenc - - - false - welsenc - .\..\..\..\..\bin\win64\Release - .\..\..\..\obj\encoder\plus\Release\ + <_ProjectFileVersion>10.0.40219.1 + .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\encoder\plus\Debug\ + .\..\..\..\obj\encoder\plus\Debug\ + true + true + .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\encoder\plus\Release\ + .\..\..\..\obj\encoder\plus\Release\ + false + false + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + welsenc + welsenc + welsenc + welsenc @@ -101,7 +105,8 @@ true Win32 .\..\..\..\..\..\bin\Debug/WelsEncPlus.tlb - + + Disabled @@ -123,7 +128,7 @@ 0x0409 - $(OutDir)\welsecore.lib;%(AdditionalDependencies) + welsecore.lib;%(AdditionalDependencies) $(OutDir)\welsenc.dll true ..\..\..\..\libs;%(AdditionalLibraryDirectories) @@ -134,11 +139,10 @@ true $(OutDir)\welsenc.lib MachineX86 - $(OutDir)\welsenc.pgd true - $(OutDir)\welsenc.bsc + .\..\..\..\..\..\bin\Debug/WelsEncPlus.bsc @@ -169,7 +173,7 @@ 0x0409 - $(OutDir)\welsecore.lib;%(AdditionalDependencies) + welsecore.lib;%(AdditionalDependencies) $(OutDir)\welsenc.dll true ..\..\..\..\libs;%(AdditionalLibraryDirectories) @@ -179,11 +183,10 @@ false true $(OutDir)\welsenc.lib - $(OutDir)\welsenc.pgd true - $(OutDir)\welsenc.bsc + .\..\..\..\..\..\bin\Debug/WelsEncPlus.bsc @@ -193,7 +196,8 @@ true Win32 .\..\..\..\..\..\bin\Release/WelsEncPlus.tlb - + + Full @@ -220,7 +224,7 @@ /MAPINFO:exports /LTCG %(AdditionalOptions) - $(OutDir)\welsecore.lib;%(AdditionalDependencies) + welsecore.lib;%(AdditionalDependencies) $(OutDir)\welsenc.dll true ..\..\..\..\libs;%(AdditionalLibraryDirectories) @@ -234,11 +238,10 @@ true $(OutDir)\welsenc.lib MachineX86 - $(OutDir)\welsenc.pgd true - $(OutDir)\welsenc.bsc + .\..\..\..\..\..\bin\Release/WelsEncPlus.bsc @@ -275,7 +278,7 @@ /MAPINFO:exports /LTCG %(AdditionalOptions) - $(OutDir)\welsecore.lib;%(AdditionalDependencies) + welsecore.lib;%(AdditionalDependencies) $(OutDir)\welsenc.dll true ..\..\..\..\libs;%(AdditionalLibraryDirectories) @@ -288,15 +291,23 @@ false true $(OutDir)\welsenc.lib - $(OutDir)\welsenc.pgd true - $(OutDir)\welsenc.bsc + .\..\..\..\..\..\bin\Release/WelsEncPlus.bsc - + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + @@ -305,13 +316,17 @@ - + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) \Project\svc_perf_opt_b\codec\Wels\project\encoder\plus\res;%(AdditionalIncludeDirectories) diff --git a/codec/build/win32/enc/WelsEncoder_2012.sln b/codec/build/win32/enc/WelsEncoder_2012.sln index 48cdcfe9..99d161fe 100644 --- a/codec/build/win32/enc/WelsEncoder_2012.sln +++ b/codec/build/win32/enc/WelsEncoder_2012.sln @@ -1,19 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsEncPlus_2012", "WelsEncPlus_2012.vcxproj", "{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}" - ProjectSection(ProjectDependencies) = postProject - {59208004-1774-4816-AC24-31FF44C324B4} = {59208004-1774-4816-AC24-31FF44C324B4} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encConsole_2012", "encConsole_2012.vcxproj", "{B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsEncCore_2012", "WelsEncCore_2012.vcxproj", "{59208004-1774-4816-AC24-31FF44C324B4}" - ProjectSection(ProjectDependencies) = postProject - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562} = {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsEncCore_2012", "WelsEncCore_2012.vcxproj", "{4BD24F30-FC28-4F24-874D-90F8C9286390}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsVP_2012", "..\..\..\..\processing\build\win32\WelsVP_2012.vcxproj", "{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsEncPlus_2012", "WelsEncPlus_2012.vcxproj", "{B5988995-D15F-479C-BD4D-CA41A26871E0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encConsole_2012", "encConsole_2012.vcxproj", "{8509E2A8-2CBD-49E2-B564-3EFF1E927459}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsVP_2012", "..\..\..\processing\build\win32\WelsVP_2012.vcxproj", "{094088DB-29CC-4DAB-9C28-DEE18A672946}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,38 +17,38 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.ActiveCfg = Debug|Win32 - {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.Build.0 = Debug|Win32 - {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.ActiveCfg = Debug|x64 - {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.Build.0 = Debug|x64 - {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.ActiveCfg = Release|Win32 - {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.Build.0 = Release|Win32 - {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.ActiveCfg = Release|x64 - {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.Build.0 = Release|x64 - {59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.ActiveCfg = Debug|Win32 - {59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.Build.0 = Debug|Win32 - {59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.ActiveCfg = Debug|x64 - {59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.Build.0 = Debug|x64 - {59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.ActiveCfg = Release|Win32 - {59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.Build.0 = Release|Win32 - {59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.ActiveCfg = Release|x64 - {59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.Build.0 = Release|x64 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.ActiveCfg = Debug|Win32 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.Build.0 = Debug|Win32 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.ActiveCfg = Debug|x64 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.Build.0 = Debug|x64 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.ActiveCfg = Release|Win32 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.Build.0 = Release|Win32 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.ActiveCfg = Release|x64 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.Build.0 = Release|x64 - {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.ActiveCfg = Debug|Win32 - {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.Build.0 = Debug|Win32 - {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.ActiveCfg = Debug|x64 - {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.Build.0 = Debug|x64 - {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.ActiveCfg = Release|Win32 - {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.Build.0 = Release|Win32 - {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.ActiveCfg = Release|x64 - {8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.Build.0 = Release|x64 + {B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C}.Debug|Win32.ActiveCfg = Debug|Win32 + {B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C}.Debug|Win32.Build.0 = Debug|Win32 + {B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C}.Debug|x64.ActiveCfg = Debug|x64 + {B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C}.Debug|x64.Build.0 = Debug|x64 + {B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C}.Release|Win32.ActiveCfg = Release|Win32 + {B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C}.Release|Win32.Build.0 = Release|Win32 + {B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C}.Release|x64.ActiveCfg = Release|x64 + {B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C}.Release|x64.Build.0 = Release|x64 + {4BD24F30-FC28-4F24-874D-90F8C9286390}.Debug|Win32.ActiveCfg = Debug|Win32 + {4BD24F30-FC28-4F24-874D-90F8C9286390}.Debug|Win32.Build.0 = Debug|Win32 + {4BD24F30-FC28-4F24-874D-90F8C9286390}.Debug|x64.ActiveCfg = Debug|x64 + {4BD24F30-FC28-4F24-874D-90F8C9286390}.Debug|x64.Build.0 = Debug|x64 + {4BD24F30-FC28-4F24-874D-90F8C9286390}.Release|Win32.ActiveCfg = Release|Win32 + {4BD24F30-FC28-4F24-874D-90F8C9286390}.Release|Win32.Build.0 = Release|Win32 + {4BD24F30-FC28-4F24-874D-90F8C9286390}.Release|x64.ActiveCfg = Release|x64 + {4BD24F30-FC28-4F24-874D-90F8C9286390}.Release|x64.Build.0 = Release|x64 + {B5988995-D15F-479C-BD4D-CA41A26871E0}.Debug|Win32.ActiveCfg = Debug|Win32 + {B5988995-D15F-479C-BD4D-CA41A26871E0}.Debug|Win32.Build.0 = Debug|Win32 + {B5988995-D15F-479C-BD4D-CA41A26871E0}.Debug|x64.ActiveCfg = Debug|x64 + {B5988995-D15F-479C-BD4D-CA41A26871E0}.Debug|x64.Build.0 = Debug|x64 + {B5988995-D15F-479C-BD4D-CA41A26871E0}.Release|Win32.ActiveCfg = Release|Win32 + {B5988995-D15F-479C-BD4D-CA41A26871E0}.Release|Win32.Build.0 = Release|Win32 + {B5988995-D15F-479C-BD4D-CA41A26871E0}.Release|x64.ActiveCfg = Release|x64 + {B5988995-D15F-479C-BD4D-CA41A26871E0}.Release|x64.Build.0 = Release|x64 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Debug|Win32.ActiveCfg = Debug|Win32 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Debug|Win32.Build.0 = Debug|Win32 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Debug|x64.ActiveCfg = Debug|x64 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Debug|x64.Build.0 = Debug|x64 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Release|Win32.ActiveCfg = Release|Win32 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Release|Win32.Build.0 = Release|Win32 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Release|x64.ActiveCfg = Release|x64 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/codec/build/win32/enc/encConsole_2012.vcxproj b/codec/build/win32/enc/encConsole_2012.vcxproj index bdc8ca89..490857e6 100644 --- a/codec/build/win32/enc/encConsole_2012.vcxproj +++ b/codec/build/win32/enc/encConsole_2012.vcxproj @@ -19,33 +19,33 @@ - {8509E2A8-2CBD-49E2-B564-3EFF1E927459} + {B74BF0F6-B6A2-474C-B828-5AF6CBB29E1C} encConsole Application - v110 false MultiByte + v110 Application - v110 false MultiByte + v110 Application - v110 false MultiByte + v110 Application - v110 false MultiByte + v110 @@ -68,36 +68,41 @@ - <_ProjectFileVersion>11.0.61030.0 - - - .\..\..\..\..\bin\win32\Debug - .\..\..\..\obj\encConsole\Debug - true - encConsole - - - true - encConsole - .\..\..\..\..\bin\win64\Debug - .\..\..\..\obj\encConsole\Debug - - - .\..\..\..\..\bin\win32\Release - .\..\..\..\obj\encConsole\Release - false - encConsole - - - false - encConsole - .\..\..\..\..\bin\win64\Release - .\..\..\..\obj\encConsole\Release + <_ProjectFileVersion>10.0.40219.1 + .\..\..\..\..\bin\win32\Debug + .\..\..\..\..\bin\win64\Debug + .\..\..\..\obj\encConsole\Debug\ + .\..\..\..\obj\encConsole\Debug\ + true + true + .\..\..\..\..\bin\win32\Release + .\..\..\..\..\bin\win64\Release + .\..\..\..\obj\encConsole\Release\ + .\..\..\..\obj\encConsole\Release\ + false + false + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + encConsole + encConsole + encConsole + encConsole .\..\..\..\..\..\bin\Debug/encConsole.tlb - + + Disabled @@ -128,13 +133,11 @@ false true MachineX86 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsvp.lib;$(OutDir)welsenc.lib;%(AdditionalDependencies) - $(OutDir)\encConsole.map - $(OutDir)\encConsole.pgd + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win32\Debug\welsenc.lib;%(AdditionalDependencies) true - $(OutDir)\encConsole.bsc + .\..\..\..\..\..\bin\Debug/encConsole.bsc @@ -170,19 +173,18 @@ Console false true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsvp.lib;$(OutDir)welsenc.lib;%(AdditionalDependencies) - $(OutDir)\encConsole.map - $(OutDir)\encConsole.pgd + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win64\Debug\welsenc.lib;%(AdditionalDependencies) true - $(OutDir)\encConsole.bsc + .\..\..\..\..\..\bin\Debug/encConsole.bsc .\..\..\..\..\..\bin\Release/encConsole.tlb - + + MaxSpeed @@ -211,19 +213,17 @@ ..\..\..\bin;%(AdditionalLibraryDirectories) true $(OutDir)\encConsole.pdb - true + false false Console false true MachineX86 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsvp.lib;$(OutDir)welsenc.lib;%(AdditionalDependencies) - $(OutDir)\encConsole.map - $(OutDir)\encConsole.pgd + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win32\Release\welsenc.lib;%(AdditionalDependencies) true - $(OutDir)\encConsole.bsc + .\..\..\..\..\..\bin\Release/encConsole.bsc @@ -259,34 +259,44 @@ ..\..\..\bin;%(AdditionalLibraryDirectories) true $(OutDir)\encConsole.pdb - true + false false Console false true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)welsvp.lib;$(OutDir)welsenc.lib;%(AdditionalDependencies) - $(OutDir)\encConsole.map - $(OutDir)\encConsole.pgd + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;.\..\..\..\..\bin\win64\Release\welsenc.lib;%(AdditionalDependencies) true - $(OutDir)\encConsole.bsc + .\..\..\..\..\..\bin\Release/encConsole.bsc - - + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + - - - {1e7b4e9a-986e-4167-8c70-6e4f60eaee7f} - false - - diff --git a/codec/processing/build/win32/WelsVP_2012.sln b/codec/processing/build/win32/WelsVP_2012.sln index 70912806..f32918fe 100644 --- a/codec/processing/build/win32/WelsVP_2012.sln +++ b/codec/processing/build/win32/WelsVP_2012.sln @@ -1,18 +1,24 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsVP_2012", "WelsVP_2012.vcxproj", "{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsVP_2012", "WelsVP_2012.vcxproj", "{094088DB-29CC-4DAB-9C28-DEE18A672946}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.ActiveCfg = Debug|Win32 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.Build.0 = Debug|Win32 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.ActiveCfg = Release|Win32 - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.Build.0 = Release|Win32 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Debug|Win32.ActiveCfg = Debug|Win32 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Debug|Win32.Build.0 = Debug|Win32 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Debug|x64.ActiveCfg = Debug|x64 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Debug|x64.Build.0 = Debug|x64 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Release|Win32.ActiveCfg = Release|Win32 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Release|Win32.Build.0 = Release|Win32 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Release|x64.ActiveCfg = Release|x64 + {094088DB-29CC-4DAB-9C28-DEE18A672946}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/codec/processing/build/win32/WelsVP_2012.v11.suo b/codec/processing/build/win32/WelsVP_2012.v11.suo index d5e3198ab11c8d6ad686adf51b0149aeedde2bc3..d60b311c101116ab65abdb91468b6aa90a88bbef 100644 GIT binary patch literal 19968 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 diff --git a/codec/processing/build/win32/WelsVP_2012.vcxproj b/codec/processing/build/win32/WelsVP_2012.vcxproj index 2a9eae3d..09ba197e 100644 --- a/codec/processing/build/win32/WelsVP_2012.vcxproj +++ b/codec/processing/build/win32/WelsVP_2012.vcxproj @@ -19,34 +19,34 @@ - {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562} + {094088DB-29CC-4DAB-9C28-DEE18A672946} WelsVP Win32Proj DynamicLibrary - v110 Unicode true + v110 DynamicLibrary - v110 Unicode true + v110 DynamicLibrary - v110 Unicode false + v110 DynamicLibrary - v110 Unicode false + v110 @@ -66,46 +66,54 @@ - <_ProjectFileVersion>11.0.61030.0 - - - .\..\..\..\bin\win32\Debug\ - .\..\..\..\obj\vp\Debug\ - true - welsvp - - - true - welsvp - .\..\..\..\bin\win64\Debug\ - .\..\..\..\obj\vp\Debug\ - - - .\..\..\..\bin\win32\Release\ - .\..\..\..\obj\vp\Release\ - false - false - welsvp - - - false - false - welsvp - .\..\..\..\bin\win64\Release\ - .\..\..\..\obj\vp\Release\ + <_ProjectFileVersion>10.0.40219.1 + ..\..\..\..\bin\win32\Debug\ + ..\..\..\..\bin\win64\Debug\ + ..\..\..\..\obj\vp\Debug\ + ..\..\..\..\obj\vp\Debug\ + true + true + ..\..\..\..\bin\win32\Release\ + ..\..\..\..\bin\win64\Release\ + ..\..\..\..\obj\vp\Release\ + ..\..\..\..\obj\vp\Release\ + false + false + false + false + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + welsvp + welsvp + welsvp + welsvp - + + Disabled + %(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug - - + + + + Level3 EditAndContinue @@ -113,7 +121,7 @@ true - $(OutDir)\welsvp.dll + $(OutDir)welsvp.dll ../../src/common/WelsVP.def true true @@ -139,7 +147,8 @@ Disabled - WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + WIN64;_DEBUG;X86_ASM;_WINDOWS;_USRDLL;WELSVP_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -153,7 +162,7 @@ true - $(OutDir)\welsvp.dll + $(OutDir)welsvp.dll ../../src/common/WelsVP.def true true @@ -177,7 +186,8 @@ - + + Full @@ -186,12 +196,14 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM;%(PreprocessorDefinitions) MultiThreaded false - + + Level3 - + + - $(OutDir)\welsvp.dll + $(OutDir)welsvp.dll false ../../src/common/WelsVP.def false @@ -202,8 +214,8 @@ true true MachineX86 - $(OutDir)\welsvp.pdb $(OutDir)\welsvp.lib + $(OutDir)\welsvp.pdb $(OutDir)\welsvp.pgd @@ -227,7 +239,7 @@ Full false Speed - WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;X86_ASM;_WINDOWS;_USRDLL;WELSVP_EXPORTS;%(PreprocessorDefinitions) MultiThreaded false @@ -237,7 +249,7 @@ - $(OutDir)\welsvp.dll + $(OutDir)welsvp.dll false ../../src/common/WelsVP.def false @@ -247,8 +259,8 @@ Windows true true - $(OutDir)\welsvp.pdb $(OutDir)\welsvp.lib + $(OutDir)\welsvp.pdb $(OutDir)\welsvp.pgd @@ -307,117 +319,68 @@ - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - true - true - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - - nasm -I%(RootDir)%(Directory) -f win32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) - + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) $(IntDir)%(Filename).obj;%(Outputs) $(IntDir)%(Filename).obj;%(Outputs) - true - true + + + + + Document + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win32 -DX86_32 -DPREFIX -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs) + nasm -I ..\..\..\common\ -I%(RootDir)%(Directory) -f win64 -DWIN64 -o $(IntDir)%(Filename).obj %(FullPath) + $(IntDir)%(Filename).obj;%(Outputs)