win32: Update VS2010 project files for ogg library name.

The ogg project changed the default target, making libogg.lib
a static library instead of libogg_static.lib. Update our
build to match.

The VS2005 and VS2008 projects are left as-is, because
I have no way to test them and they likely aren't in
active use.

6 files changed, 26 insertions, 26 deletions

diff --git a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
index 8011dec5..c806a53e 100644
--- a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
+++ b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
@@ -98,7 +98,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)libvorbis.dll</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>

@@ -128,7 +128,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)libvorbis.dll</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>

@@ -161,7 +161,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)libvorbis.dll</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>

@@ -198,7 +198,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)libvorbis.dll</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>

diff --git a/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
index 9dd881c8..503d609e 100644
--- a/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
+++ b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
@@ -95,7 +95,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>

@@ -124,7 +124,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>

@@ -147,7 +147,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>

@@ -174,7 +174,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>

diff --git a/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
index 3fb0e100..70097a3d 100644
--- a/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
+++ b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
@@ -97,7 +97,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisdec.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -125,7 +125,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisdec.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -155,7 +155,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisdec.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>false</GenerateDebugInformation>

@@ -189,7 +189,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisdec.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>false</GenerateDebugInformation>

diff --git a/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj b/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj
index b4661619..753a6b61 100644
--- a/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj
+++ b/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj
@@ -97,7 +97,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisdec_static.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -125,7 +125,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisdec_static.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -155,7 +155,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisdec_static.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>false</GenerateDebugInformation>

@@ -189,7 +189,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisdec_static.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>false</GenerateDebugInformation>

@@ -210,4 +210,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj b/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj
index 84e8e8f1..115f8b84 100644
--- a/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj
+++ b/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj
@@ -99,7 +99,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisenc.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -129,7 +129,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisenc.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -159,7 +159,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisenc.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>false</GenerateDebugInformation>

@@ -193,7 +193,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisenc.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>false</GenerateDebugInformation>

diff --git a/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj b/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj
index 45f09ac5..065ed568 100644
--- a/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj
+++ b/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj
@@ -99,7 +99,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisenc_static.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -129,7 +129,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisenc_static.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -159,7 +159,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisenc_static.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>false</GenerateDebugInformation>

@@ -193,7 +193,7 @@
       <CallingConvention>Cdecl</CallingConvention>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)vorbisenc_static.exe</OutputFile>

       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>false</GenerateDebugInformation>

@@ -214,4 +214,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>
\ No newline at end of file
+</Project>