First pass at getting core and square to compile against VS2015. Not …

…really working yet, and most plugins are broken. OGG playback seems to work!
clangen · Apr 27, 2016 · a6b588f · a6b588f
1 parent 8b67aff
commit a6b588f
Show file tree

Hide file tree

Showing 58 changed files with 1,712 additions and 304 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,15 @@
+**/*.vcxproj.filters
+**/*.vcxproj.user
+**/*.VC.db
+**/*.VC.opendb
+**/*.suo
+bin
+obj
+ipch
+src/3rdparty/bin
+src/3rdparty/obj
+src/core/obj
+src/square/obj
+src/contrib/oggdecoder/obj
+src/contrib/waveout/obj
+src/contrib/taglib_plugin/obj
diff --git a/audioengine.sln b/audioengine.sln
@@ -1,32 +1,26 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp3decoder", "src\contrib\mp3decoder\mp3decoder.vcproj", "{293471C3-93F8-4C70-AC2B-9F9211529C3B}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp3decoder", "src\contrib\mp3decoder\mp3decoder.vcxproj", "{293471C3-93F8-4C70-AC2B-9F9211529C3B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "player", "src\square\player.vcproj", "{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B2165720-B4B2-4F4B-8888-8C390C3CB4DB} = {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}
-		{B2165720-B4B2-4F4B-9634-8C390C3CB4DB} = {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "square", "src\square\player.vcxproj", "{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oggdecoder", "src\contrib\oggdecoder\oggdecoder.vcproj", "{292974B0-C8B7-41EF-B603-554A2B25CB90}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oggdecoder", "src\contrib\oggdecoder\oggdecoder.vcxproj", "{292974B0-C8B7-41EF-B603-554A2B25CB90}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apedecoder", "src\contrib\apedecoder\apedecoder.vcproj", "{A6923E38-7B13-4394-93E6-005CE3E80DA4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apedecoder", "src\contrib\apedecoder\apedecoder.vcxproj", "{A6923E38-7B13-4394-93E6-005CE3E80DA4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aacdecoder", "src\contrib\aacdecoder\aacdecoder.vcproj", "{4993E68D-E97A-4CD2-AC8E-168AE315BAC5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aacdecoder", "src\contrib\aacdecoder\aacdecoder.vcxproj", "{4993E68D-E97A-4CD2-AC8E-168AE315BAC5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cddadecoder", "src\contrib\cddadecoder\cddadecoder.vcproj", "{54764854-5A73-4329-9BAD-9AF22C72D9E2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cddadecoder", "src\contrib\cddadecoder\cddadecoder.vcxproj", "{54764854-5A73-4329-9BAD-9AF22C72D9E2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3rdparty", "src\3rdparty\3rdparty.vcproj", "{B2165720-B4B2-4F4B-8888-8C390C3CB4DB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3rdparty", "src\3rdparty\3rdparty.vcxproj", "{B2165720-B4B2-4F4B-8888-8C390C3CB4DB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcproj", "{B2165720-B4B2-4F4B-9634-8C390C3CB4DB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B2165720-B4B2-4F4B-8888-8C390C3CB4DB} = {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcxproj", "{B2165720-B4B2-4F4B-9634-8C390C3CB4DB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taglib_plugin", "src\contrib\taglib_plugin\taglib_plugin.vcproj", "{7CD00EC4-D090-48BE-9388-FA4857AC332C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B2165720-B4B2-4F4B-9634-8C390C3CB4DB} = {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taglib_plugin", "src\contrib\taglib_plugin\taglib_plugin.vcxproj", "{7CD00EC4-D090-48BE-9388-FA4857AC332C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "waveout", "src\contrib\waveout\waveout.vcxproj", "{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -70,6 +64,10 @@ Global
 		{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug|Win32.Build.0 = Debug|Win32
 		{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release|Win32.ActiveCfg = Release|Win32
 		{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release|Win32.Build.0 = Release|Win32
+		{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug|Win32.Build.0 = Debug|Win32
+		{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release|Win32.ActiveCfg = Release|Win32
+		{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/3rdparty/3rdparty.vcxproj b/src/3rdparty/3rdparty.vcxproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B2165720-B4B2-4F4B-8888-8C390C3CB4DB}</ProjectGuid>
+    <RootNamespace>doe</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin/$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj/$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin/$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj/$(Configuration)\</IntDir>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>./include/;./include/sqlite/;./include/expat;./include/md5;./include/jpeg-6b;../../../boost_1_60_0/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>./include/;./include/sqlite/;./include/expat;./include/md5;./include/jpeg-6b;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\sqlite\sqlite3.c">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level1</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="src\expat\xmlparse.c" />
+    <ClCompile Include="src\expat\xmlrole.c" />
+    <ClCompile Include="src\expat\xmltok.c" />
+    <ClCompile Include="src\expat\xmltok_impl.c" />
+    <ClCompile Include="src\expat\xmltok_ns.c" />
+    <ClCompile Include="src\md5\md5.c" />
+    <ClCompile Include="src\jpeg-6b\jcapimin.c" />
+    <ClCompile Include="src\jpeg-6b\jcapistd.c" />
+    <ClCompile Include="src\jpeg-6b\jccoefct.c" />
+    <ClCompile Include="src\jpeg-6b\jccolor.c" />
+    <ClCompile Include="src\jpeg-6b\jcdctmgr.c" />
+    <ClCompile Include="src\jpeg-6b\jchuff.c" />
+    <ClCompile Include="src\jpeg-6b\jcinit.c" />
+    <ClCompile Include="src\jpeg-6b\jcmainct.c" />
+    <ClCompile Include="src\jpeg-6b\jcmarker.c" />
+    <ClCompile Include="src\jpeg-6b\jcmaster.c" />
+    <ClCompile Include="src\jpeg-6b\jcomapi.c" />
+    <ClCompile Include="src\jpeg-6b\jcparam.c" />
+    <ClCompile Include="src\jpeg-6b\jcphuff.c" />
+    <ClCompile Include="src\jpeg-6b\jcprepct.c" />
+    <ClCompile Include="src\jpeg-6b\jcsample.c" />
+    <ClCompile Include="src\jpeg-6b\jctrans.c" />
+    <ClCompile Include="src\jpeg-6b\jdapimin.c" />
+    <ClCompile Include="src\jpeg-6b\jdapistd.c" />
+    <ClCompile Include="src\jpeg-6b\jdatadst.c" />
+    <ClCompile Include="src\jpeg-6b\jdatasrc.c" />
+    <ClCompile Include="src\jpeg-6b\jdcoefct.c" />
+    <ClCompile Include="src\jpeg-6b\jdcolor.c" />
+    <ClCompile Include="src\jpeg-6b\jddctmgr.c" />
+    <ClCompile Include="src\jpeg-6b\jdhuff.c" />
+    <ClCompile Include="src\jpeg-6b\jdinput.c" />
+    <ClCompile Include="src\jpeg-6b\jdmainct.c" />
+    <ClCompile Include="src\jpeg-6b\jdmarker.c" />
+    <ClCompile Include="src\jpeg-6b\jdmaster.c" />
+    <ClCompile Include="src\jpeg-6b\jdmerge.c" />
+    <ClCompile Include="src\jpeg-6b\jdphuff.c" />
+    <ClCompile Include="src\jpeg-6b\jdpostct.c" />
+    <ClCompile Include="src\jpeg-6b\jdsample.c" />
+    <ClCompile Include="src\jpeg-6b\jdtrans.c" />
+    <ClCompile Include="src\jpeg-6b\jerror.c" />
+    <ClCompile Include="src\jpeg-6b\jfdctflt.c" />
+    <ClCompile Include="src\jpeg-6b\jfdctfst.c" />
+    <ClCompile Include="src\jpeg-6b\jfdctint.c" />
+    <ClCompile Include="src\jpeg-6b\jidctflt.c" />
+    <ClCompile Include="src\jpeg-6b\jidctfst.c" />
+    <ClCompile Include="src\jpeg-6b\jidctint.c" />
+    <ClCompile Include="src\jpeg-6b\jidctred.c" />
+    <ClCompile Include="src\jpeg-6b\jmemmgr.c" />
+    <ClCompile Include="src\jpeg-6b\jmemnobs.c" />
+    <ClCompile Include="src\jpeg-6b\jpegtran.c" />
+    <ClCompile Include="src\jpeg-6b\jquant1.c" />
+    <ClCompile Include="src\jpeg-6b\jquant2.c" />
+    <ClCompile Include="src\jpeg-6b\jutils.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\sqlite\sqlite3.h" />
+    <ClInclude Include="include\sqlite\sqlite3ext.h" />
+    <ClInclude Include="include\sigslot\sigslot.h" />
+    <ClInclude Include="include\expat\ascii.h" />
+    <ClInclude Include="include\expat\asciitab.h" />
+    <ClInclude Include="include\expat\expat.h" />
+    <ClInclude Include="include\expat\expat_external.h" />
+    <ClInclude Include="include\expat\iasciitab.h" />
+    <ClInclude Include="include\expat\internal.h" />
+    <ClInclude Include="include\expat\latin1tab.h" />
+    <ClInclude Include="include\expat\nametab.h" />
+    <ClInclude Include="include\expat\utf8tab.h" />
+    <ClInclude Include="include\expat\winconfig.h" />
+    <ClInclude Include="include\expat\xmlrole.h" />
+    <ClInclude Include="include\expat\xmltok.h" />
+    <ClInclude Include="include\expat\xmltok_impl.h" />
+    <ClInclude Include="include\md5\md5.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>