Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Synchronized Github with private repository. * Removed GameProfile settings * Remove SDL and PortAudio backends * Fixed defaults * Readded SoundDriver * Fixed WASAPI implementation * Validated 64bit compile and fixed issues * Added VS2019 toolset (no longer xp compatible) * Added VS2010 project (for XP testing)
- Loading branch information
Showing
27 changed files
with
2,775 additions
and
248 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -219,4 +219,3 @@ FakesAssemblies/ | |
| AziAudio/Todo.txt | ||
| [Tt]arget/ | ||
| [Cc]onfig/ | ||
| [Aa]rchive/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 11.00 | ||
| # Visual Studio 2010 and later | ||
| #MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AziAudio", "AziAudio\AziAudio2010.vcxproj", "{835979AC-BC6A-45B7-A513-8EEE79B443DE}" | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{CC1EBB98-29E0-40BA-AF5D-299B6E03B756}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| PropertySheets\Debug.props = PropertySheets\Debug.props | ||
| PropertySheets\PlatformBase.props = PropertySheets\PlatformBase.props | ||
| PropertySheets\Release.props = PropertySheets\Release.props | ||
| PropertySheets\Win32.props = PropertySheets\Win32.props | ||
| PropertySheets\x64.props = PropertySheets\x64.props | ||
| EndProjectSection | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Win32 = Debug|Win32 | ||
| Debug|x64 = Debug|x64 | ||
| Release|Win32 = Release|Win32 | ||
| Release|x64 = Release|x64 | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {835979AC-BC6A-45B7-A513-8EEE79B443DE}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
| {835979AC-BC6A-45B7-A513-8EEE79B443DE}.Debug|Win32.Build.0 = Debug|Win32 | ||
| {835979AC-BC6A-45B7-A513-8EEE79B443DE}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {835979AC-BC6A-45B7-A513-8EEE79B443DE}.Debug|x64.Build.0 = Debug|x64 | ||
| {835979AC-BC6A-45B7-A513-8EEE79B443DE}.Release|Win32.ActiveCfg = Release|Win32 | ||
| {835979AC-BC6A-45B7-A513-8EEE79B443DE}.Release|Win32.Build.0 = Release|Win32 | ||
| {835979AC-BC6A-45B7-A513-8EEE79B443DE}.Release|x64.ActiveCfg = Release|x64 | ||
| {835979AC-BC6A-45B7-A513-8EEE79B443DE}.Release|x64.Build.0 = Release|x64 | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="4.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="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"> | ||
| <ProjectGuid>{835979AC-BC6A-45B7-A513-8EEE79B443DE}</ProjectGuid> | ||
| <RootNamespace>AziAudio</RootNamespace> | ||
| </PropertyGroup> | ||
| <PropertyGroup Label="Configuration"> | ||
| <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| <ImportGroup Label="PropertySheets"> | ||
| <Import Project="$(SolutionDir)PropertySheets\$(Platform).props" /> | ||
| <Import Project="$(SolutionDir)PropertySheets\$(Configuration).props" /> | ||
| </ImportGroup> | ||
| <PropertyGroup Label="Configuration"> | ||
| <IntDir>$(SolutionDir)Build\$(Platform)\$(Configuration)\</IntDir> | ||
| <OutDir>$(SolutionDir)Target\$(Platform)\$(Configuration)\</OutDir> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| <ItemDefinitionGroup> | ||
| <ClCompile> | ||
| <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
| <AdditionalIncludeDirectories>$(SolutionDir)3rd Party\directx\include</AdditionalIncludeDirectories> | ||
| </ClCompile> | ||
| <Link> | ||
| <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(SolutionDir)3rd Party\directx\lib\x86</AdditionalLibraryDirectories> | ||
| <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(SolutionDir)3rd Party\directx\lib\x64</AdditionalLibraryDirectories> | ||
| <AdditionalDependencies>dsound.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <ItemGroup> | ||
| <ClInclude Include="audiohle.h" /> | ||
| <ClInclude Include="AudioSpec.h" /> | ||
| <ClInclude Include="common.h" /> | ||
| <ClInclude Include="Configuration.h" /> | ||
| <ClInclude Include="DirectSoundDriver.h" /> | ||
| <ClInclude Include="DirectSoundDriverLegacy.h" /> | ||
| <ClInclude Include="Mupen64plusHLE\arithmetics.h" /> | ||
| <ClInclude Include="Mupen64plusHLE\audio.h" /> | ||
| <ClInclude Include="Mupen64plusHLE\common.h" /> | ||
| <ClInclude Include="Mupen64plusHLE\hle.h" /> | ||
| <ClInclude Include="Mupen64plusHLE\hle_external.h" /> | ||
| <ClInclude Include="Mupen64plusHLE\hle_internal.h" /> | ||
| <ClInclude Include="Mupen64plusHLE\memory.h" /> | ||
| <ClInclude Include="Mupen64plusHLE\ucodes.h" /> | ||
| <ClInclude Include="my_types.h" /> | ||
| <ClInclude Include="NoSoundDriver.h" /> | ||
| <ClInclude Include="resource.h" /> | ||
| <ClInclude Include="Settings.h" /> | ||
| <ClInclude Include="SoundDriver.h" /> | ||
| <ClInclude Include="SoundDriverFactory.h" /> | ||
| <ClInclude Include="SoundDriverInterface.h" /> | ||
| <ClInclude Include="SoundDriverLegacy.h" /> | ||
| <ClInclude Include="WASAPISoundDriver.h" /> | ||
| <ClInclude Include="WaveOut.h" /> | ||
| <ClInclude Include="WaveOutSoundDriver.h" /> | ||
| <ClInclude Include="XAudio2SoundDriver.h" /> | ||
| <ClInclude Include="XAudio2SoundDriverLegacy.h" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="ABI1.cpp" /> | ||
| <ClCompile Include="ABI2.cpp" /> | ||
| <ClCompile Include="ABI3.cpp" /> | ||
| <ClCompile Include="ABI3mp3.cpp" /> | ||
| <ClCompile Include="ABI_Adpcm.cpp" /> | ||
| <ClCompile Include="ABI_Buffers.cpp" /> | ||
| <ClCompile Include="ABI_Envmixer.cpp" /> | ||
| <ClCompile Include="ABI_Filters.cpp" /> | ||
| <ClCompile Include="ABI_MixerInterleave.cpp" /> | ||
| <ClCompile Include="ABI_Resample.cpp" /> | ||
| <ClCompile Include="Configuration.cpp" /> | ||
| <ClCompile Include="DirectSoundDriver.cpp" /> | ||
| <ClCompile Include="DirectSoundDriverLegacy.cpp" /> | ||
| <ClCompile Include="HLEMain.cpp" /> | ||
| <ClCompile Include="main.cpp" /> | ||
| <ClCompile Include="Mupen64plusHLE\audio.c" /> | ||
| <ClCompile Include="Mupen64plusHLE\memory.c" /> | ||
| <ClCompile Include="Mupen64plusHLE\Mupen64Support.c" /> | ||
| <ClCompile Include="Mupen64plusHLE\musyx.c" /> | ||
| <ClCompile Include="NoSoundDriver.cpp" /> | ||
| <ClCompile Include="SoundDriver.cpp" /> | ||
| <ClCompile Include="SoundDriverFactory.cpp" /> | ||
| <ClCompile Include="SoundDriverInterface.cpp" /> | ||
| <ClCompile Include="SoundDriverLegacy.cpp" /> | ||
| <ClCompile Include="WASAPISoundDriver.cpp" /> | ||
| <ClCompile Include="WaveOut.cpp" /> | ||
| <ClCompile Include="WaveOutSoundDriver.cpp" /> | ||
| <ClCompile Include="XAudio2SoundDriver.cpp" /> | ||
| <ClCompile Include="XAudio2SoundDriverLegacy.cpp" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Drawing" /> | ||
| <Reference Include="System.Windows.Forms" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ResourceCompile Include="resource.rc" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Text Include="readme.txt" /> | ||
| </ItemGroup> | ||
| <ProjectExtensions> | ||
| <VisualStudio> | ||
| <UserProperties RESOURCE_FILE="resource.rc" /> | ||
| </VisualStudio> | ||
| </ProjectExtensions> | ||
| <ItemGroup> | ||
| <FilesToDeploy Include="$(OutDir)AziAudio.dll" /> | ||
| </ItemGroup> | ||
| <!--Set Pj64Install as an environment variable or as an MSBuild command-line property.--> | ||
| <Target Name="Publish"> | ||
| <Message Text="Deploying to [$(Pj64Install)]" /> | ||
| <Message Text="Files to move: [@(FilesToDeploy)]" /> | ||
| <Copy SourceFiles="@(FilesToDeploy)" DestinationFolder="$(Pj64Install)\Plugin\$(PluginType)" Condition="'$(Platform)'=='Win32'" /> | ||
| <Copy SourceFiles="@(FilesToDeploy)" DestinationFolder="$(Pj64Install)\Plugin64\$(PluginType)" Condition="'$(Platform)'=='x64'" /> | ||
| </Target> | ||
| </Project> |
Oops, something went wrong.