From ef3a5daec5020b78ecf936afa79a21e2292d73a2 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Wed, 8 Apr 2020 13:27:26 -0700 Subject: 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. --- win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj | 8 ++++---- win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj | 8 ++++---- win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj | 8 ++++---- win32/VS2010/vorbisdec/vorbisdec_static.vcxproj | 10 +++++----- win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj | 8 ++++---- win32/VS2010/vorbisenc/vorbisenc_static.vcxproj | 10 +++++----- 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 @@ Cdecl - libogg_static.lib;%(AdditionalDependencies) + libogg.lib;%(AdditionalDependencies) $(OutDir)libvorbis.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbis.def @@ -128,7 +128,7 @@ Cdecl - libogg_static.lib;%(AdditionalDependencies) + libogg.lib;%(AdditionalDependencies) $(OutDir)libvorbis.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbis.def @@ -161,7 +161,7 @@ Cdecl - libogg_static.lib;%(AdditionalDependencies) + libogg.lib;%(AdditionalDependencies) $(OutDir)libvorbis.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbis.def @@ -198,7 +198,7 @@ Cdecl - libogg_static.lib;%(AdditionalDependencies) + libogg.lib;%(AdditionalDependencies) $(OutDir)libvorbis.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbis.def 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 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)libvorbisfile.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbisfile.def @@ -124,7 +124,7 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)libvorbisfile.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbisfile.def @@ -147,7 +147,7 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)libvorbisfile.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbisfile.def @@ -174,7 +174,7 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)libvorbisfile.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbisfile.def 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 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisdec.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -125,7 +125,7 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisdec.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -155,7 +155,7 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisdec.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false @@ -189,7 +189,7 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisdec.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false 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 @@ Cdecl - libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies) + libogg.lib;libvorbis_static.lib;%(AdditionalDependencies) $(OutDir)vorbisdec_static.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -125,7 +125,7 @@ Cdecl - libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies) + libogg.lib;libvorbis_static.lib;%(AdditionalDependencies) $(OutDir)vorbisdec_static.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -155,7 +155,7 @@ Cdecl - libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies) + libogg.lib;libvorbis_static.lib;%(AdditionalDependencies) $(OutDir)vorbisdec_static.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false @@ -189,7 +189,7 @@ Cdecl - libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies) + libogg.lib;libvorbis_static.lib;%(AdditionalDependencies) $(OutDir)vorbisdec_static.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false @@ -210,4 +210,4 @@ - \ No newline at end of file + 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 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisenc.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -129,7 +129,7 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisenc.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisenc.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false @@ -193,7 +193,7 @@ Cdecl - libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) + libogg.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisenc.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false 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 @@ Cdecl - libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies) + libogg.lib;libvorbis_static.lib;%(AdditionalDependencies) $(OutDir)vorbisenc_static.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -129,7 +129,7 @@ Cdecl - libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies) + libogg.lib;libvorbis_static.lib;%(AdditionalDependencies) $(OutDir)vorbisenc_static.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ Cdecl - libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies) + libogg.lib;libvorbis_static.lib;%(AdditionalDependencies) $(OutDir)vorbisenc_static.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false @@ -193,7 +193,7 @@ Cdecl - libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies) + libogg.lib;libvorbis_static.lib;%(AdditionalDependencies) $(OutDir)vorbisenc_static.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false @@ -214,4 +214,4 @@ - \ No newline at end of file + -- cgit v1.2.1