ref: 821ff96c70d80934cad191dc9630c5a885354361
parent: ee425ec78522b7862ca61af246b1f86b46e7f0db
parent: c2cde65ac9b154f08e8ea7bc00c89ecfa835ccdb
author: zhilwang <zhilwang@cisco.com>
date: Fri Jul 4 17:40:08 EDT 2014
Merge pull request #1085 from mstorsjo/fix-msvc-autobuild-script Fix running the MSVC autobuild bat script
--- a/codec/build/win32/enc/WelsEncPlus.vcproj
+++ b/codec/build/win32/enc/WelsEncPlus.vcproj
@@ -76,7 +76,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(OutDir)\welsecore.lib"
+ AdditionalDependencies="$(OutDir)\welsecore.lib $(OutDir)\welsvp.lib"
OutputFile="$(OutDir)\welsenc.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\libs"
@@ -171,7 +171,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(OutDir)\welsecore.lib"
+ AdditionalDependencies="$(OutDir)\welsecore.lib $(OutDir)\welsvp.lib"
OutputFile="$(OutDir)\welsenc.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\libs"
@@ -270,7 +270,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(OutDir)\welsecore.lib"
+ AdditionalDependencies="$(OutDir)\welsecore.lib $(OutDir)\welsvp.lib"
OutputFile="$(OutDir)\welsenc.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\libs"
@@ -370,7 +370,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(OutDir)\welsecore.lib"
+ AdditionalDependencies="$(OutDir)\welsecore.lib $(OutDir)\welsvp.lib"
OutputFile="$(OutDir)\welsenc.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\libs"
--- a/testbin/AutoBuild_Windows_VS2008.bat
+++ b/testbin/AutoBuild_Windows_VS2008.bat
@@ -9,7 +9,7 @@
SET CurDir=%~dp0
SET EncoderProjectDir="..\codec\build\win32\enc\"
SET DecoderProjectDir="..\codec\build\win32\dec\"
-SET VPProjectDir="..\processing\build\win32\"
+SET VPProjectDir="..\codec\processing\build\win32\"
SET CodecBinDir="..\codec\build\win32\bin\"
SET VPBinDir="..\processing\bin\"