Skip to content

Commit 39efc81

Browse files
rillianrillian
committed
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.
1 parent 8f2e0d9 commit 39efc81

File tree

7 files changed

+43
-28
lines changed

7 files changed

+43
-28
lines changed

‎appveyor.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
image: Visual Studio 2015
2+
configuration:
3+
- Debug
4+
5+
platform:
6+
- Win32
7+
8+
install:
9+
- git clone -q https://github.com/xiph/ogg.git %APPVEYOR_BUILD_FOLDER%\..\libogg
10+
- 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%
11+
12+
build:
13+
project: win32\VS2010\vorbis_dynamic.sln
14+
parallel: true
15+
verbosity: minimal

‎win32/VS2010/README‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ compiled beforehand.
33

44
Lets say you have libogg and libvorbis in the same directory:
55

6-
libogg-1.1.3
7-
libvorbis-1.2.0
6+
libogg-1.3.2
7+
libvorbis-1.4.0
88

99
Because there is no automatic library detection you have to,
1010
either:
1111

12-
1. Rename libogg-1.1.3 to libogg
12+
1. Rename libogg-1.3.2 to libogg.
1313

1414
2. Open libogg.props with a text editor (even notepad.exe
1515
will suffice) and see if LIBOGG_VERSION is set to the correct
16-
version, in this case "1.1.3"
16+
version, in this case "1.3.2".

‎win32/VS2010/libogg.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Label="UserMacros">
4-
<LIBOGG_VERSION>1.2.0</LIBOGG_VERSION>
4+
<LIBOGG_VERSION>1.3.2</LIBOGG_VERSION>
55
</PropertyGroup>
66
<PropertyGroup>
77
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
88
</PropertyGroup>
99
<ItemDefinitionGroup>
1010
<ClCompile>
11-
<AdditionalIncludeDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\include;..\..\..\..\ogg\include;..\..\..\..\..\..\..\core\ogg\libogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11+
<AdditionalIncludeDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\include;..\..\..\..\libogg\include;..\..\..\..\..\..\..\core\ogg\libogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1212
</ClCompile>
1313
<Link>
14-
<AdditionalLibraryDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\win32\VS2010\$(PlatformName)\$(ConfigurationName);..\..\..\..\ogg\win32\VS2010\$(PlatformName)\$(ConfigurationName);..\..\..\..\..\..\..\core\ogg\libogg\win32\VS2010\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
14+
<AdditionalLibraryDirectories>..\..\..\..\libogg-$(LIBOGG_VERSION)\win32\VS2015\$(PlatformName)\$(ConfigurationName);..\..\..\..\libogg\win32\VS2015\$(PlatformName)\$(ConfigurationName);..\..\..\..\..\..\..\core\ogg\libogg\win32\VS2015\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
1515
</Link>
1616
</ItemDefinitionGroup>
1717
<ItemGroup>
1818
<BuildMacro Include="LIBOGG_VERSION">
1919
<Value>$(LIBOGG_VERSION)</Value>
2020
</BuildMacro>
2121
</ItemGroup>
22-
</Project>
22+
</Project>

‎win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<CallingConvention>Cdecl</CallingConvention>
9999
</ClCompile>
100100
<Link>
101-
<AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>
101+
<AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
102102
<OutputFile>$(OutDir)libvorbis.dll</OutputFile>
103103
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
104104
<ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>
@@ -128,7 +128,7 @@
128128
<CallingConvention>Cdecl</CallingConvention>
129129
</ClCompile>
130130
<Link>
131-
<AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>
131+
<AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
132132
<OutputFile>$(OutDir)libvorbis.dll</OutputFile>
133133
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
134134
<ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>
@@ -161,7 +161,7 @@
161161
<CallingConvention>Cdecl</CallingConvention>
162162
</ClCompile>
163163
<Link>
164-
<AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>
164+
<AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
165165
<OutputFile>$(OutDir)libvorbis.dll</OutputFile>
166166
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
167167
<ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>
@@ -198,7 +198,7 @@
198198
<CallingConvention>Cdecl</CallingConvention>
199199
</ClCompile>
200200
<Link>
201-
<AdditionalDependencies>libogg.lib;%(AdditionalDependencies)</AdditionalDependencies>
201+
<AdditionalDependencies>libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
202202
<OutputFile>$(OutDir)libvorbis.dll</OutputFile>
203203
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
204204
<ModuleDefinitionFile>..\..\vorbis.def</ModuleDefinitionFile>
@@ -283,4 +283,4 @@
283283
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
284284
<ImportGroup Label="ExtensionTargets">
285285
</ImportGroup>
286-
</Project>
286+
</Project>

‎win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<CallingConvention>Cdecl</CallingConvention>
9696
</ClCompile>
9797
<Link>
98-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
98+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
9999
<OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>
100100
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
101101
<ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>
@@ -124,7 +124,7 @@
124124
<CallingConvention>Cdecl</CallingConvention>
125125
</ClCompile>
126126
<Link>
127-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
127+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
128128
<OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>
129129
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
130130
<ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>
@@ -147,7 +147,7 @@
147147
<CallingConvention>Cdecl</CallingConvention>
148148
</ClCompile>
149149
<Link>
150-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
150+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
151151
<OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>
152152
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
153153
<ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>
@@ -174,7 +174,7 @@
174174
<CallingConvention>Cdecl</CallingConvention>
175175
</ClCompile>
176176
<Link>
177-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
177+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
178178
<OutputFile>$(OutDir)libvorbisfile.dll</OutputFile>
179179
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
180180
<ModuleDefinitionFile>..\..\vorbisfile.def</ModuleDefinitionFile>
@@ -200,4 +200,4 @@
200200
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
201201
<ImportGroup Label="ExtensionTargets">
202202
</ImportGroup>
203-
</Project>
203+
</Project>

‎win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<CallingConvention>Cdecl</CallingConvention>
9898
</ClCompile>
9999
<Link>
100-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
100+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
101101
<OutputFile>$(OutDir)vorbisdec.exe</OutputFile>
102102
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
103103
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -125,7 +125,7 @@
125125
<CallingConvention>Cdecl</CallingConvention>
126126
</ClCompile>
127127
<Link>
128-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
128+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
129129
<OutputFile>$(OutDir)vorbisdec.exe</OutputFile>
130130
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
131131
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -155,7 +155,7 @@
155155
<CallingConvention>Cdecl</CallingConvention>
156156
</ClCompile>
157157
<Link>
158-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
158+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
159159
<OutputFile>$(OutDir)vorbisdec.exe</OutputFile>
160160
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
161161
<GenerateDebugInformation>false</GenerateDebugInformation>
@@ -189,7 +189,7 @@
189189
<CallingConvention>Cdecl</CallingConvention>
190190
</ClCompile>
191191
<Link>
192-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
192+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
193193
<OutputFile>$(OutDir)vorbisdec.exe</OutputFile>
194194
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
195195
<GenerateDebugInformation>false</GenerateDebugInformation>
@@ -210,4 +210,4 @@
210210
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
211211
<ImportGroup Label="ExtensionTargets">
212212
</ImportGroup>
213-
</Project>
213+
</Project>

‎win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<CallingConvention>Cdecl</CallingConvention>
100100
</ClCompile>
101101
<Link>
102-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
102+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
103103
<OutputFile>$(OutDir)vorbisenc.exe</OutputFile>
104104
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
105105
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -129,7 +129,7 @@
129129
<CallingConvention>Cdecl</CallingConvention>
130130
</ClCompile>
131131
<Link>
132-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
132+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
133133
<OutputFile>$(OutDir)vorbisenc.exe</OutputFile>
134134
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135135
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -159,7 +159,7 @@
159159
<CallingConvention>Cdecl</CallingConvention>
160160
</ClCompile>
161161
<Link>
162-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
162+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
163163
<OutputFile>$(OutDir)vorbisenc.exe</OutputFile>
164164
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
165165
<GenerateDebugInformation>false</GenerateDebugInformation>
@@ -193,7 +193,7 @@
193193
<CallingConvention>Cdecl</CallingConvention>
194194
</ClCompile>
195195
<Link>
196-
<AdditionalDependencies>libogg.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
196+
<AdditionalDependencies>libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)</AdditionalDependencies>
197197
<OutputFile>$(OutDir)vorbisenc.exe</OutputFile>
198198
<AdditionalLibraryDirectories>..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
199199
<GenerateDebugInformation>false</GenerateDebugInformation>
@@ -214,4 +214,4 @@
214214
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
215215
<ImportGroup Label="ExtensionTargets">
216216
</ImportGroup>
217-
</Project>
217+
</Project>

0 commit comments

Comments
 (0)