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.

diff --git a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
index 8011dec..c806a53 100644 (file)
--- a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
+++ b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
@@ -98,7 +98,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)libvorbis.dll</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>\r
@@ -128,7 +128,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)libvorbis.dll</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>\r
@@ -161,7 +161,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)libvorbis.dll</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>\r
@@ -198,7 +198,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)libvorbis.dll</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>\r

diff --git a/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
index 9dd881c..503d609 100644 (file)
--- a/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
+++ b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
@@ -95,7 +95,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>\r
@@ -124,7 +124,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>\r
@@ -147,7 +147,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>\r
@@ -174,7 +174,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>\r

diff --git a/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
index 3fb0e10..70097a3 100644 (file)
--- a/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
+++ b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
@@ -97,7 +97,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisdec.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -125,7 +125,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisdec.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -155,7 +155,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisdec.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r
@@ -189,7 +189,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisdec.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r

diff --git a/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj b/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj
index b466161..753a6b6 100644 (file)
--- a/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj
+++ b/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj
@@ -97,7 +97,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisdec_static.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -125,7 +125,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisdec_static.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -155,7 +155,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisdec_static.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r
@@ -189,7 +189,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisdec_static.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r
@@ -210,4 +210,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj b/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj
index 84e8e8f..115f8b8 100644 (file)
--- a/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj
+++ b/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj
@@ -99,7 +99,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisenc.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -129,7 +129,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisenc.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -159,7 +159,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisenc.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r
@@ -193,7 +193,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisenc.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r

diff --git a/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj b/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj
index 45f09ac..065ed56 100644 (file)
--- a/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj
+++ b/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj
@@ -99,7 +99,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisenc_static.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -129,7 +129,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisenc_static.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -159,7 +159,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisenc_static.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r
@@ -193,7 +193,7 @@
       <CallingConvention>Cdecl</CallingConvention>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)vorbisenc_static.exe</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>false</GenerateDebugInformation>\r
@@ -214,4 +214,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r