From 39efc81a2d61b2fcb680768d45c3ad7f01725a23 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Thu, 8 Sep 2016 12:38:57 -0700 Subject: [PATCH] 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. --- appveyor.yml | 15 +++++++++++++++ win32/VS2010/README | 8 ++++---- win32/VS2010/libogg.props | 8 ++++---- win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj | 10 +++++----- win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj | 10 +++++----- win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj | 10 +++++----- win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj | 10 +++++----- 7 files changed, 43 insertions(+), 28 deletions(-) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 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 --- a/win32/VS2010/README +++ b/win32/VS2010/README @@ -3,14 +3,14 @@ compiled beforehand. Lets say you have libogg and libvorbis in the same directory: -libogg-1.1.3 -libvorbis-1.2.0 +libogg-1.3.2 +libvorbis-1.4.0 Because there is no automatic library detection you have to, either: -1. Rename libogg-1.1.3 to libogg +1. Rename libogg-1.3.2 to libogg. 2. Open libogg.props with a text editor (even notepad.exe will suffice) and see if LIBOGG_VERSION is set to the correct -version, in this case "1.1.3" +version, in this case "1.3.2". diff --git a/win32/VS2010/libogg.props b/win32/VS2010/libogg.props index 4e1373e..27b0860 100644 --- a/win32/VS2010/libogg.props +++ b/win32/VS2010/libogg.props @@ -1,17 +1,17 @@  - 1.2.0 + 1.3.2 <_ProjectFileVersion>10.0.30319.1 - ..\..\..\..\libogg-$(LIBOGG_VERSION)\include;..\..\..\..\ogg\include;..\..\..\..\..\..\..\core\ogg\libogg\include;%(AdditionalIncludeDirectories) + ..\..\..\..\libogg-$(LIBOGG_VERSION)\include;..\..\..\..\libogg\include;..\..\..\..\..\..\..\core\ogg\libogg\include;%(AdditionalIncludeDirectories) - ..\..\..\..\libogg-$(LIBOGG_VERSION)\win32\VS2010\$(PlatformName)\$(ConfigurationName);..\..\..\..\ogg\win32\VS2010\$(PlatformName)\$(ConfigurationName);..\..\..\..\..\..\..\core\ogg\libogg\win32\VS2010\$(PlatformName)\$(ConfigurationName) + ..\..\..\..\libogg-$(LIBOGG_VERSION)\win32\VS2015\$(PlatformName)\$(ConfigurationName);..\..\..\..\libogg\win32\VS2015\$(PlatformName)\$(ConfigurationName);..\..\..\..\..\..\..\core\ogg\libogg\win32\VS2015\$(PlatformName)\$(ConfigurationName) @@ -19,4 +19,4 @@ $(LIBOGG_VERSION) - \ No newline at end of file + diff --git a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj index 6346a44..8011dec 100644 --- a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj +++ b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj @@ -98,7 +98,7 @@ Cdecl - libogg.lib;%(AdditionalDependencies) + libogg_static.lib;%(AdditionalDependencies) $(OutDir)libvorbis.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbis.def @@ -128,7 +128,7 @@ Cdecl - libogg.lib;%(AdditionalDependencies) + libogg_static.lib;%(AdditionalDependencies) $(OutDir)libvorbis.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbis.def @@ -161,7 +161,7 @@ Cdecl - libogg.lib;%(AdditionalDependencies) + libogg_static.lib;%(AdditionalDependencies) $(OutDir)libvorbis.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbis.def @@ -198,7 +198,7 @@ Cdecl - libogg.lib;%(AdditionalDependencies) + libogg_static.lib;%(AdditionalDependencies) $(OutDir)libvorbis.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbis.def @@ -283,4 +283,4 @@ - \ No newline at end of file + diff --git a/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj index a57a165..9dd881c 100644 --- a/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj +++ b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj @@ -95,7 +95,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)libvorbisfile.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbisfile.def @@ -124,7 +124,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)libvorbisfile.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbisfile.def @@ -147,7 +147,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)libvorbisfile.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbisfile.def @@ -174,7 +174,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)libvorbisfile.dll ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ..\..\vorbisfile.def @@ -200,4 +200,4 @@ - \ No newline at end of file + diff --git a/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj index f89a1e8..3fb0e10 100644 --- a/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj +++ b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj @@ -97,7 +97,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisdec.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -125,7 +125,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisdec.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -155,7 +155,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisdec.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false @@ -189,7 +189,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisdec.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 b8d1530..84e8e8f 100644 --- a/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj +++ b/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj @@ -99,7 +99,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisenc.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -129,7 +129,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisenc.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisenc.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false @@ -193,7 +193,7 @@ Cdecl - libogg.lib;libvorbis.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis.lib;%(AdditionalDependencies) $(OutDir)vorbisenc.exe ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false @@ -214,4 +214,4 @@ - \ No newline at end of file + -- 2.7.4