From 56abd3c15bd265dbccb092f67a63cd5bd1c78828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 8 Apr 2014 10:26:25 +0300 Subject: [PATCH] Link the encoder core directly to the VP library This avoids using the codepaths for dynamically loading the DLL, letting the linker resolve it as any other function. --- codec/build/win32/enc/WelsEncCore.vcproj | 8 ++++---- codec/processing/src/common/WelsVP.def | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/codec/build/win32/enc/WelsEncCore.vcproj b/codec/build/win32/enc/WelsEncCore.vcproj index 308d85fb..b1461ec0 100644 --- a/codec/build/win32/enc/WelsEncCore.vcproj +++ b/codec/build/win32/enc/WelsEncCore.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;X86_ASM" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;X86_ASM;NO_DYNAMIC_VP" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -133,7 +133,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" - PreprocessorDefinitions="WIN64;_DEBUG;_LIB;X86_ASM" + PreprocessorDefinitions="WIN64;_DEBUG;_LIB;X86_ASM;NO_DYNAMIC_VP" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -215,7 +215,7 @@ FavorSizeOrSpeed="1" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;X86_ASM;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;X86_ASM;NO_DYNAMIC_VP" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -299,7 +299,7 @@ FavorSizeOrSpeed="1" WholeProgramOptimization="true" AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface" - PreprocessorDefinitions="WIN64;NDEBUG;_LIB;X86_ASM" + PreprocessorDefinitions="WIN64;NDEBUG;_LIB;X86_ASM;NO_DYNAMIC_VP" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/codec/processing/src/common/WelsVP.def b/codec/processing/src/common/WelsVP.def index 35613576..6e5d7035 100644 --- a/codec/processing/src/common/WelsVP.def +++ b/codec/processing/src/common/WelsVP.def @@ -32,5 +32,5 @@ LIBRARY welsvp.dll EXPORTS - CreateVpInterface PRIVATE - DestroyVpInterface PRIVATE \ No newline at end of file + CreateVpInterface + DestroyVpInterface \ No newline at end of file