Initial appveyor config to test the Windows build.

This makes the minimal changes necessary to build
the dynamic solution Win32|Debug target with VS2015
and against the static solution from the ogg master
branch.

The other targets can be added after updating the
project files for VS2015.

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644 (file)
index 0000000..3d6f745
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,15 @@
+image: Visual Studio 2015
+configuration:
+- Debug
+
+platform:
+- Win32
+
+install:
+- git clone -q https://github.com/xiph/ogg.git %APPVEYOR_BUILD_FOLDER%\..\libogg
+- msbuild "%APPVEYOR_BUILD_FOLDER%\..\libogg\win32\VS2015\libogg_static.sln" /m /v:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /property:Configuration=%CONFIGURATION%;Platform=%PLATFORM%
+
+build:
+  project: win32\VS2010\vorbis_dynamic.sln
+  parallel: true
+  verbosity: minimal

diff --git a/win32/VS2010/README b/win32/VS2010/README
index 8f22624..69489a1 100644 (file)
--- a/win32/VS2010/README
+++ b/win32/VS2010/README
@@ -3,14 +3,14 @@ compiled beforehand.
 \r
 Lets say you have libogg and libvorbis in the same directory:\r
 \r
-libogg-1.1.3 \r
-libvorbis-1.2.0\r
+libogg-1.3.2 \r
+libvorbis-1.4.0\r
 \r
 Because there is no automatic library detection you have to,\r
 either:\r
 \r
-1. Rename libogg-1.1.3 to libogg\r
+1. Rename libogg-1.3.2 to libogg.\r
 \r
 2. Open libogg.props with a text editor (even notepad.exe\r
 will suffice) and see if LIBOGG_VERSION is set to the correct\r
-version, in this case "1.1.3"\r
+version, in this case "1.3.2".\r

diff --git a/win32/VS2010/libogg.props b/win32/VS2010/libogg.props
index 4e1373e..27b0860 100644 (file)
--- a/win32/VS2010/libogg.props
+++ b/win32/VS2010/libogg.props
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup Label="UserMacros">\r
-    <LIBOGG_VERSION>1.2.0</LIBOGG_VERSION>\r
+    <LIBOGG_VERSION>1.3.2</LIBOGG_VERSION>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\include;..\..\..\..\ogg\include;..\..\..\..\..\..\..\core\ogg\libogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\include;..\..\..\..\libogg\include;..\..\..\..\..\..\..\core\ogg\libogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalLibraryDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\win32\VS2010\$(PlatformName)\$(ConfigurationName);..\..\..\..\ogg\win32\VS2010\$(PlatformName)\$(ConfigurationName);..\..\..\..\..\..\..\core\ogg\libogg\win32\VS2010\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\win32\VS2015\$(PlatformName)\$(ConfigurationName);..\..\..\..\libogg\win32\VS2015\$(PlatformName)\$(ConfigurationName);..\..\..\..\..\..\..\core\ogg\libogg\win32\VS2015\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
@@ -19,4 +19,4 @@
       <Value>$(LIBOGG_VERSION)</Value>\r
     </BuildMacro>\r
   </ItemGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
index 6346a44..8011dec 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.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)libvorbis.dll</OutputFile>\r
       <AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>\r
@@ -283,4 +283,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/libvorbisfile/libvorbisfile_dynamic.vcxproj b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
index a57a165..9dd881c 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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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
@@ -200,4 +200,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/vorbisdec/vorbisdec_dynamic.vcxproj b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
index f89a1e8..3fb0e10 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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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
@@ -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 b8d1530..84e8e8f 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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>libogg_static.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
@@ -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