diff options
author | Ralph Giles <giles@thaumas.net> | 2016-09-08 12:38:57 -0700 |
---|---|---|
committer | Ralph Giles <giles@thaumas.net> | 2016-09-08 12:38:57 -0700 |
commit | 39efc81a2d61b2fcb680768d45c3ad7f01725a23 (patch) | |
tree | 7bea0aca8fbe146cccf9b00f50f9160f952889bc | |
parent | 8f2e0d9c09f943e1fb299a6548a9dbc40f2052c5 (diff) | |
download | libvorbis-git-39efc81a2d61b2fcb680768d45c3ad7f01725a23.tar.gz |
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.
-rw-r--r-- | appveyor.yml | 15 | ||||
-rw-r--r-- | win32/VS2010/README | 8 | ||||
-rw-r--r-- | win32/VS2010/libogg.props | 8 | ||||
-rw-r--r-- | win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj | 10 | ||||
-rw-r--r-- | win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj | 10 | ||||
-rw-r--r-- | win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj | 10 | ||||
-rw-r--r-- | win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj | 10 |
7 files changed, 43 insertions, 28 deletions
diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..3d6f7450 --- /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 8f22624e..69489a14 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 4e1373e1..27b0860b 100644 --- a/win32/VS2010/libogg.props +++ b/win32/VS2010/libogg.props @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
- <LIBOGG_VERSION>1.2.0</LIBOGG_VERSION>
+ <LIBOGG_VERSION>1.3.2</LIBOGG_VERSION>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\include;..\..\..\..\ogg\include;..\..\..\..\..\..\..\core\ogg\libogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\include;..\..\..\..\libogg\include;..\..\..\..\..\..\..\core\ogg\libogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\win32\VS2010\$(PlatformName)\$(ConfigurationName);..\..\..\..\ogg\win32\VS2010\$(PlatformName)\$(ConfigurationName);..\..\..\..\..\..\..\core\ogg\libogg\win32\VS2010\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\win32\VS2015\$(PlatformName)\$(ConfigurationName);..\..\..\..\libogg\win32\VS2015\$(PlatformName)\$(ConfigurationName);..\..\..\..\..\..\..\core\ogg\libogg\win32\VS2015\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -19,4 +19,4 @@ <Value>$(LIBOGG_VERSION)</Value>
</BuildMacro>
</ItemGroup>
-</Project>
\ No newline at end of file +</Project>
diff --git a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj index 6346a446..8011dec5 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.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)libvorbis.dll</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>
@@ -283,4 +283,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file +</Project>
diff --git a/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj index a57a1650..9dd881c8 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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>
@@ -200,4 +200,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file +</Project>
diff --git a/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj index f89a1e88..3fb0e100 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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)vorbisdec.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 b8d15303..84e8e8f1 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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.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.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)vorbisenc.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>
|