Commit b9b46fdd authored by callum_linden's avatar callum_linden

DRTVRW-418 Initial set of changes for Windows/Windows64 builds

parent 0e5a7ab1
......@@ -111,8 +111,6 @@
</map>
<key>manifest</key>
<array>
<string>lib/debug/*.pdb</string>
<string>lib/debug/*.lib</string>
<string>lib/release/*.pdb</string>
<string>lib/release/*.lib</string>
</array>
......
......@@ -26,22 +26,18 @@ eval "$("$AUTOBUILD" source_environment)"
top="$(pwd)"
stage="$(pwd)/stage"
build=${AUTOBUILD_BUILD_ID:=0}
echo "${OGG_VERSION}-${VORBIS_VERSION}.${build}" > "${stage}/VERSION.txt"
case "$AUTOBUILD_PLATFORM" in
"windows")
windows*)
pushd "$OGG_SOURCE_DIR"
packages="$(cygpath -m "$stage/packages")"
build_sln "win32/ogg.sln" "Debug|Win32" "ogg_static"
build_sln "win32/ogg.sln" "Release|Win32" "ogg_static"
build_sln "win32/ogg.sln" "Release|$AUTOBUILD_WIN_VSPLATFORM" "ogg_static"
mkdir -p "$stage/lib"/{debug,release}
cp "win32/Static_Debug/ogg_static_d.lib" "$stage/lib/debug/ogg_static_d.lib"
cp "win32/Static_Debug/vc120.pdb" "$stage/lib/debug/ogg_static_d.pdb"
mkdir -p "$stage/lib/release"
cp "win32/Static_Release/ogg_static.lib" "$stage/lib/release/ogg_static.lib"
cp "win32/Static_Release/vc120.pdb" "$stage/lib/release/ogg_static.pdb"
......@@ -51,23 +47,14 @@ case "$AUTOBUILD_PLATFORM" in
popd
pushd "$VORBIS_SOURCE_DIR"
build_sln "win32/vorbis.sln" "Debug|Win32" "vorbis_static"
build_sln "win32/vorbis.sln" "Release|Win32" "vorbis_static"
build_sln "win32/vorbis.sln" "Debug|Win32" "vorbisenc_static"
build_sln "win32/vorbis.sln" "Release|Win32" "vorbisenc_static"
build_sln "win32/vorbis.sln" "Debug|Win32" "vorbisfile_static"
build_sln "win32/vorbis.sln" "Release|Win32" "vorbisfile_static"
build_sln "win32/vorbis.sln" "Release|$AUTOBUILD_WIN_VSPLATFORM" "vorbis_static"
build_sln "win32/vorbis.sln" "Release|$AUTOBUILD_WIN_VSPLATFORM" "vorbisenc_static"
build_sln "win32/vorbis.sln" "Release|$AUTOBUILD_WIN_VSPLATFORM" "vorbisfile_static"
cp "win32/Vorbis_Static_Debug/vorbis_static_d.lib" "$stage/lib/debug/vorbis_static_d.lib"
cp "win32/Vorbis_Static_Debug/vc120.pdb" "$stage/lib/debug/vorbis_static_d.pdb"
cp "win32/Vorbis_Static_Release/vorbis_static.lib" "$stage/lib/release/vorbis_static.lib"
cp "win32/Vorbis_Static_Release/vc120.pdb" "$stage/lib/release/vorbis_static.pdb"
cp "win32/VorbisEnc_Static_Debug/vorbisenc_static_d.lib" "$stage/lib/debug/vorbisenc_static_d.lib"
cp "win32/VorbisEnc_Static_Debug/vc120.pdb" "$stage/lib/debug/vorbisenc_static_d.pdb"
cp "win32/VorbisEnc_Static_Release/vorbisenc_static.lib" "$stage/lib/release/vorbisenc_static.lib"
cp "win32/VorbisEnc_Static_Release/vc120.pdb" "$stage/lib/release/vorbis_static.pdb"
cp "win32/VorbisFile_Static_Debug/vorbisfile_static_d.lib" "$stage/lib/debug/vorbisfile_static_d.lib"
cp "win32/VorbisFile_Static_Debug/vc120.pdb" "$stage/lib/debug/vorbis_static_d.pdb"
cp "win32/VorbisFile_Static_Release/vorbisfile_static.lib" "$stage/lib/release/vorbisfile_static.lib"
cp "win32/VorbisFile_Static_Release/vc120.pdb" "$stage/lib/release/vorbis_static.pdb"
cp -a "include/vorbis/" "$stage/include/"
......
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg_dynamic", "ogg_dynamic.vcxproj", "{C19BD84B-81C0-EFE5-752C-009CABB0B7CE}"
EndProject
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40302.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg_static", "ogg_static.vcxproj", "{59517605-0613-E0B5-8A25-BE0A233CE6E7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
Template|Win32 = Template|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C19BD84B-81C0-EFE5-752C-009CABB0B7CE}.Debug|Win32.ActiveCfg = Debug|Win32
{C19BD84B-81C0-EFE5-752C-009CABB0B7CE}.Debug|Win32.Build.0 = Debug|Win32
{C19BD84B-81C0-EFE5-752C-009CABB0B7CE}.Release|Win32.ActiveCfg = Release|Win32
{C19BD84B-81C0-EFE5-752C-009CABB0B7CE}.Release|Win32.Build.0 = Release|Win32
{C19BD84B-81C0-EFE5-752C-009CABB0B7CE}.Template|Win32.ActiveCfg = Release|Win32
{C19BD84B-81C0-EFE5-752C-009CABB0B7CE}.Template|Win32.Build.0 = Release|Win32
{59517605-0613-E0B5-8A25-BE0A233CE6E7}.Debug|Win32.ActiveCfg = Debug|Win32
{59517605-0613-E0B5-8A25-BE0A233CE6E7}.Debug|Win32.Build.0 = Debug|Win32
{59517605-0613-E0B5-8A25-BE0A233CE6E7}.Release|Win32.ActiveCfg = Release|Win32
{59517605-0613-E0B5-8A25-BE0A233CE6E7}.Release|Win32.Build.0 = Release|Win32
{59517605-0613-E0B5-8A25-BE0A233CE6E7}.Template|Win32.ActiveCfg = Template|Win32
{59517605-0613-E0B5-8A25-BE0A233CE6E7}.Template|Win32.Build.0 = Template|Win32
{59517605-0613-E0B5-8A25-BE0A233CE6E7}.Release|x64.ActiveCfg = Release|x64
{59517605-0613-E0B5-8A25-BE0A233CE6E7}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
......@@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
......@@ -22,12 +30,24 @@
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
......@@ -35,21 +55,35 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Dynamic_Release\</OutDir>
<IntDir>.\Dynamic_Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Dynamic_Debug\</OutDir>
<IntDir>.\Dynamic_Debug\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
......@@ -91,6 +125,46 @@
<ModuleDefinitionFile>.\ogg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Dynamic_Release\</AssemblerListingLocation>
<PrecompiledHeaderOutputFile>.\Dynamic_Release\ogg_dynamic.pch</PrecompiledHeaderOutputFile>
<ObjectFileName>.\Dynamic_Release\</ObjectFileName>
<ProgramDataBaseFileName>.\Dynamic_Release\</ProgramDataBaseFileName>
</ClCompile>
<Midl>
<SuppressStartupBanner>true</SuppressStartupBanner>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TypeLibraryName>.\Dynamic_Release\ogg_dynamic.tlb</TypeLibraryName>
<MkTypLibCompatible>true</MkTypLibCompatible>
</Midl>
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Dynamic_Release\ogg_dynamic.bsc</OutputFile>
</Bscmake>
<Link>
<SuppressStartupBanner>true</SuppressStartupBanner>
<LinkDLL>true</LinkDLL>
<SubSystem>Console</SubSystem>
<OutputFile>Dynamic_Release/ogg.dll</OutputFile>
<ImportLibrary>.\Dynamic_Release\ogg.lib</ImportLibrary>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>.\ogg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
......@@ -136,6 +210,49 @@
<ModuleDefinitionFile>.\ogg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>Disabled</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Dynamic_Debug\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>.\Dynamic_Debug\ogg_dynamic.pch</PrecompiledHeaderOutputFile>
<ObjectFileName>.\Dynamic_Debug\</ObjectFileName>
<ProgramDataBaseFileName>.\Dynamic_Debug\</ProgramDataBaseFileName>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<Midl>
<SuppressStartupBanner>true</SuppressStartupBanner>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TypeLibraryName>.\Dynamic_Debug\ogg_dynamic.tlb</TypeLibraryName>
<MkTypLibCompatible>true</MkTypLibCompatible>
</Midl>
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Dynamic_Debug\ogg_dynamic.bsc</OutputFile>
</Bscmake>
<Link>
<SuppressStartupBanner>true</SuppressStartupBanner>
<LinkDLL>true</LinkDLL>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OutputFile>Dynamic_Debug/ogg_d.dll</OutputFile>
<ImportLibrary>.\Dynamic_Debug\ogg_d.lib</ImportLibrary>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>.\ogg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\bitwise.c" />
<ClCompile Include="..\src\framing.c" />
......
......@@ -5,14 +5,26 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Template|Win32">
<Configuration>Template</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Template|x64">
<Configuration>Template</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
......@@ -24,41 +36,70 @@
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Static_Debug\</OutDir>
<IntDir>.\Static_Debug\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Static_Release\</OutDir>
<IntDir>.\Static_Release\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
......@@ -90,6 +131,36 @@
<OutputFile>Static_Debug\ogg_static_d.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>Disabled</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Static_Debug\</AssemblerListingLocation>
<PrecompiledHeaderOutputFile>.\Static_Debug\ogg_static.pch</PrecompiledHeaderOutputFile>
<ObjectFileName>.\Static_Debug\</ObjectFileName>
<ProgramDataBaseFileName>.\Static_Debug\</ProgramDataBaseFileName>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Static_Debug\ogg_static.bsc</OutputFile>
</Bscmake>
<Lib>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>Static_Debug\ogg_static_d.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
......@@ -119,6 +190,35 @@
<OutputFile>.\Static_Release\ogg_static.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Static_Release\</AssemblerListingLocation>
<PrecompiledHeaderOutputFile>.\Static_Release\ogg_static.pch</PrecompiledHeaderOutputFile>
<ObjectFileName>.\Static_Release\</ObjectFileName>
<ProgramDataBaseFileName>.\Static_Release\</ProgramDataBaseFileName>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Static_Release\ogg_static.bsc</OutputFile>
</Bscmake>
<Lib>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Static_Release\ogg_static.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\bitwise.c" />
<ClCompile Include="..\src\framing.c" />
......
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis_dynamic", "vorbis_dynamic.vcxproj", "{B21ACDAE-6BE3-6ACA-B873-89BF57584972}"
EndProject
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40302.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis_static", "vorbis_static.vcxproj", "{0D5407D3-B967-C7B1-1EE6-99F713608C42}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisenc_dynamic", "vorbisenc_dynamic.vcxproj", "{4C6F9E36-54FE-EA7E-CB5F-B2D6A9FBA9C9}"
ProjectSection(ProjectDependencies) = postProject
{B21ACDAE-6BE3-6ACA-B873-89BF57584972} = {B21ACDAE-6BE3-6ACA-B873-89BF57584972}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisenc_static", "vorbisenc_static.vcxproj", "{1674EF9F-9461-2AC4-6656-7D72ACBD8C4E}"
ProjectSection(ProjectDependencies) = postProject
{0D5407D3-B967-C7B1-1EE6-99F713608C42} = {0D5407D3-B967-C7B1-1EE6-99F713608C42}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisfile_dynamic", "vorbisfile_dynamic.vcxproj", "{3B1C97C4-FDBD-22CC-8756-AD4EB3274C10}"
ProjectSection(ProjectDependencies) = postProject
{B21ACDAE-6BE3-6ACA-B873-89BF57584972} = {B21ACDAE-6BE3-6ACA-B873-89BF57584972}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisfile_static", "vorbisfile_static.vcxproj", "{D3FC0667-E15E-6242-AA18-B35AADA42B96}"
ProjectSection(ProjectDependencies) = postProject
{0D5407D3-B967-C7B1-1EE6-99F713608C42} = {0D5407D3-B967-C7B1-1EE6-99F713608C42}
......@@ -26,47 +16,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbisfile_static", "vorbis
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
Template|Win32 = Template|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B21ACDAE-6BE3-6ACA-B873-89BF57584972}.Debug|Win32.ActiveCfg = Debug|Win32
{B21ACDAE-6BE3-6ACA-B873-89BF57584972}.Debug|Win32.Build.0 = Debug|Win32
{B21ACDAE-6BE3-6ACA-B873-89BF57584972}.Release|Win32.ActiveCfg = Release|Win32
{B21ACDAE-6BE3-6ACA-B873-89BF57584972}.Release|Win32.Build.0 = Release|Win32
{B21ACDAE-6BE3-6ACA-B873-89BF57584972}.Template|Win32.ActiveCfg = Template|Win32
{B21ACDAE-6BE3-6ACA-B873-89BF57584972}.Template|Win32.Build.0 = Template|Win32
{0D5407D3-B967-C7B1-1EE6-99F713608C42}.Debug|Win32.ActiveCfg = Debug|Win32
{0D5407D3-B967-C7B1-1EE6-99F713608C42}.Debug|Win32.Build.0 = Debug|Win32
{0D5407D3-B967-C7B1-1EE6-99F713608C42}.Release|Win32.ActiveCfg = Release|Win32
{0D5407D3-B967-C7B1-1EE6-99F713608C42}.Release|Win32.Build.0 = Release|Win32
{0D5407D3-B967-C7B1-1EE6-99F713608C42}.Template|Win32.ActiveCfg = Template|Win32
{0D5407D3-B967-C7B1-1EE6-99F713608C42}.Template|Win32.Build.0 = Template|Win32
{4C6F9E36-54FE-EA7E-CB5F-B2D6A9FBA9C9}.Debug|Win32.ActiveCfg = Debug|Win32
{4C6F9E36-54FE-EA7E-CB5F-B2D6A9FBA9C9}.Debug|Win32.Build.0 = Debug|Win32
{4C6F9E36-54FE-EA7E-CB5F-B2D6A9FBA9C9}.Release|Win32.ActiveCfg = Release|Win32
{4C6F9E36-54FE-EA7E-CB5F-B2D6A9FBA9C9}.Release|Win32.Build.0 = Release|Win32
{4C6F9E36-54FE-EA7E-CB5F-B2D6A9FBA9C9}.Template|Win32.ActiveCfg = Template|Win32
{4C6F9E36-54FE-EA7E-CB5F-B2D6A9FBA9C9}.Template|Win32.Build.0 = Template|Win32
{1674EF9F-9461-2AC4-6656-7D72ACBD8C4E}.Debug|Win32.ActiveCfg = Debug|Win32
{1674EF9F-9461-2AC4-6656-7D72ACBD8C4E}.Debug|Win32.Build.0 = Debug|Win32
{0D5407D3-B967-C7B1-1EE6-99F713608C42}.Release|x64.ActiveCfg = Release|x64
{0D5407D3-B967-C7B1-1EE6-99F713608C42}.Release|x64.Build.0 = Release|x64
{1674EF9F-9461-2AC4-6656-7D72ACBD8C4E}.Release|Win32.ActiveCfg = Release|Win32
{1674EF9F-9461-2AC4-6656-7D72ACBD8C4E}.Release|Win32.Build.0 = Release|Win32
{1674EF9F-9461-2AC4-6656-7D72ACBD8C4E}.Template|Win32.ActiveCfg = Template|Win32
{1674EF9F-9461-2AC4-6656-7D72ACBD8C4E}.Template|Win32.Build.0 = Template|Win32
{3B1C97C4-FDBD-22CC-8756-AD4EB3274C10}.Debug|Win32.ActiveCfg = Debug|Win32
{3B1C97C4-FDBD-22CC-8756-AD4EB3274C10}.Debug|Win32.Build.0 = Debug|Win32
{3B1C97C4-FDBD-22CC-8756-AD4EB3274C10}.Release|Win32.ActiveCfg = Release|Win32
{3B1C97C4-FDBD-22CC-8756-AD4EB3274C10}.Release|Win32.Build.0 = Release|Win32
{3B1C97C4-FDBD-22CC-8756-AD4EB3274C10}.Template|Win32.ActiveCfg = Template|Win32
{3B1C97C4-FDBD-22CC-8756-AD4EB3274C10}.Template|Win32.Build.0 = Template|Win32
{D3FC0667-E15E-6242-AA18-B35AADA42B96}.Debug|Win32.ActiveCfg = Debug|Win32
{D3FC0667-E15E-6242-AA18-B35AADA42B96}.Debug|Win32.Build.0 = Debug|Win32
{1674EF9F-9461-2AC4-6656-7D72ACBD8C4E}.Release|x64.ActiveCfg = Release|x64
{1674EF9F-9461-2AC4-6656-7D72ACBD8C4E}.Release|x64.Build.0 = Release|x64
{D3FC0667-E15E-6242-AA18-B35AADA42B96}.Release|Win32.ActiveCfg = Release|Win32
{D3FC0667-E15E-6242-AA18-B35AADA42B96}.Release|Win32.Build.0 = Release|Win32
{D3FC0667-E15E-6242-AA18-B35AADA42B96}.Template|Win32.ActiveCfg = Template|Win32
{D3FC0667-E15E-6242-AA18-B35AADA42B96}.Template|Win32.Build.0 = Template|Win32
{D3FC0667-E15E-6242-AA18-B35AADA42B96}.Release|x64.ActiveCfg = Release|x64
{D3FC0667-E15E-6242-AA18-B35AADA42B96}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
......@@ -5,14 +5,26 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Template|Win32">
<Configuration>Template</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Template|x64">
<Configuration>Template</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName />
......@@ -24,43 +36,76 @@
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Vorbis_Dynamic_Release\</OutDir>
<IntDir>.\Vorbis_Dynamic_Release\</IntDir>