ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU2: windows: fix most build issues, linker issues left

This commit is contained in:
GovanifY 2020-09-26 01:03:05 +02:00 committed by refractionpcsx2
parent d393116fb9
commit 1727c863fe
39 changed files with 210 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/SPU2/ADSR.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
static const s32 ADSR_MAX_VOL = 0x7fffffff; static const s32 ADSR_MAX_VOL = 0x7fffffff;

3
pcsx2/SPU2/Config.h
View File

@ -16,6 +16,9 @@
#pragma once #pragma once
#include "Global.h" #include "Global.h"
#ifdef _WIN32
#include <soundtouch\soundtouch\SoundTouch.h>
#endif
extern bool DebugEnabled; extern bool DebugEnabled;

1
pcsx2/SPU2/Debug.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
int crazy_debug = 0; int crazy_debug = 0;

1
pcsx2/SPU2/Dma.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#include "Dma.h" #include "Dma.h"

1
pcsx2/SPU2/DplIIdecoder.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
// FIXME Not yet used so let's comment it out. // FIXME Not yet used so let's comment it out.

2
pcsx2/SPU2/Global.h
View File

@ -15,6 +15,7 @@
#pragma once #pragma once
#define NOMINMAX #define NOMINMAX
extern bool psxmode; extern bool psxmode;
@ -99,4 +100,5 @@ extern void SysMessage(const wchar_t* fmt, ...);
#include "Config.h" #include "Config.h"
#include "Debug.h" #include "Debug.h"
#include "Mixer.h"
#include "SndOut.h" #include "SndOut.h"

1
pcsx2/SPU2/Lowpass.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#include "Lowpass.h" #include "Lowpass.h"
#include <math.h> #include <math.h>

1
pcsx2/SPU2/Mixer.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
// Games have turned out to be surprisingly sensitive to whether a parked, silent voice is being fully emulated. // Games have turned out to be surprisingly sensitive to whether a parked, silent voice is being fully emulated.

2
pcsx2/SPU2/Mixer.h
View File

@ -15,6 +15,8 @@
#pragma once #pragma once
#include "Pcsx2Types.h"
// Implemented in Config.cpp // Implemented in Config.cpp
extern float VolumeAdjustFL; extern float VolumeAdjustFL;
extern float VolumeAdjustFR; extern float VolumeAdjustFR;

1
pcsx2/SPU2/ReadInput.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#include "Dma.h" #include "Dma.h"
#include "IopDma.h" #include "IopDma.h"

1
pcsx2/SPU2/RegLog.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
const char* ParamNames[8] = {"VOLL", "VOLR", "PITCH", "ADSR1", "ADSR2", "ENVX", "VOLXL", "VOLXR"}; const char* ParamNames[8] = {"VOLL", "VOLR", "PITCH", "ADSR1", "ADSR2", "ENVX", "VOLXL", "VOLXR"};

1
pcsx2/SPU2/RegTable.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#define PCORE(c, p) \ #define PCORE(c, p) \

1
pcsx2/SPU2/Reverb.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
__forceinline s32 V_Core::RevbGetIndexer(s32 offset) __forceinline s32 V_Core::RevbGetIndexer(s32 offset)

5
pcsx2/SPU2/SndOut.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
@ -86,11 +87,11 @@ SndOutModule* mods[] =
DSoundOut, DSoundOut,
WaveOut, WaveOut,
#endif #endif
#if defined(_WIN32) || defined(SPU2X_PORTAUDIO) #if defined(SPU2X_PORTAUDIO)
PortaudioOut, PortaudioOut,
#endif #endif
SDLOut,
#if defined(__linux__) /* && defined(__ALSA__)*/ #if defined(__linux__) /* && defined(__ALSA__)*/
SDLOut,
AlsaOut, AlsaOut,
#endif #endif
NULL // signals the end of our list NULL // signals the end of our list

2
pcsx2/SPU2/SndOut.h
View File

@ -670,7 +670,7 @@ extern SndOutModule* WaveOut;
extern SndOutModule* DSoundOut; extern SndOutModule* DSoundOut;
extern SndOutModule* XAudio2Out; extern SndOutModule* XAudio2Out;
#endif #endif
#if defined(_WIN32) || defined(SPU2X_PORTAUDIO) #if defined(SPU2X_PORTAUDIO)
extern SndOutModule* PortaudioOut; extern SndOutModule* PortaudioOut;
#endif #endif
extern SndOutModule* const SDLOut; extern SndOutModule* const SDLOut;

12
pcsx2/SPU2/SndOut_Portaudio.cpp
View File

@ -13,10 +13,17 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Mixer.h"
#include "Global.h" #include "Global.h"
#include "SndOut.h"
#define _WIN32_DCOM #define _WIN32_DCOM
#include "Dialogs.h" #ifdef _WIN32
#include "Windows/Dialogs.h"
#elif defined __linux
#include "Linux/Dialogs.h"
#endif
#include "portaudio.h" #include "portaudio.h"
@ -25,8 +32,9 @@
#include <vector> #include <vector>
#ifdef _WIN32 #ifdef _WIN32
#include "pa_win_wasapi.h" #include <portaudio/include/pa_win_wasapi.h>
#endif #endif
#include "Debug.h"
int PaCallback(const void* inputBuffer, void* outputBuffer, int PaCallback(const void* inputBuffer, void* outputBuffer,
unsigned long framesPerBuffer, unsigned long framesPerBuffer,

1
pcsx2/SPU2/Timestretcher.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#include "soundtouch/SoundTouch.h" #include "soundtouch/SoundTouch.h"
#include <wx/datetime.h> #include <wx/datetime.h>

1
pcsx2/SPU2/WavFile.cpp
View File

@ -16,6 +16,7 @@
// Note the file is mostly a copy paste of the WavFile.h from SoundTouch library. It was // Note the file is mostly a copy paste of the WavFile.h from SoundTouch library. It was
// shrunken to support only output 16 bits wav files // shrunken to support only output 16 bits wav files
#include "PrecompiledHeader.h"
#include <stdio.h> #include <stdio.h>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>

1
pcsx2/SPU2/Wavedump_wav.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#ifdef __POSIX__ #ifdef __POSIX__
#include "WavFile.h" #include "WavFile.h"

3
pcsx2/SPU2/Windows/CfgHelpers.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#include "Utilities/StringHelpers.h" #include "Utilities/StringHelpers.h"

9
pcsx2/SPU2/Windows/Config.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#include <math.h> #include <math.h>
@ -140,7 +141,6 @@ void ReadSettings()
Config_WaveOut.NumBuffers = CfgReadInt(L"WAVEOUT", L"Buffer_Count", 4); Config_WaveOut.NumBuffers = CfgReadInt(L"WAVEOUT", L"Buffer_Count", 4);
DSoundOut->ReadSettings(); DSoundOut->ReadSettings();
PortaudioOut->ReadSettings();
SoundtouchCfg::ReadSettings(); SoundtouchCfg::ReadSettings();
DebugConfig::ReadSettings(); DebugConfig::ReadSettings();
@ -195,7 +195,6 @@ void WriteSettings()
CfgWriteInt(L"DSP PLUGIN", L"ModuleNum", dspPluginModule); CfgWriteInt(L"DSP PLUGIN", L"ModuleNum", dspPluginModule);
CfgWriteBool(L"DSP PLUGIN", L"Enabled", dspPluginEnabled); CfgWriteBool(L"DSP PLUGIN", L"Enabled", dspPluginEnabled);
PortaudioOut->WriteSettings();
DSoundOut->WriteSettings(); DSoundOut->WriteSettings();
SoundtouchCfg::WriteSettings(); SoundtouchCfg::WriteSettings();
DebugConfig::WriteSettings(); DebugConfig::WriteSettings();
@ -205,13 +204,11 @@ void CheckOutputModule(HWND window)
{ {
OutputModule = SendMessage(GetDlgItem(window, IDC_OUTPUT), CB_GETCURSEL, 0, 0); OutputModule = SendMessage(GetDlgItem(window, IDC_OUTPUT), CB_GETCURSEL, 0, 0);
const bool IsConfigurable = const bool IsConfigurable =
mods[OutputModule] == PortaudioOut ||
mods[OutputModule] == WaveOut || mods[OutputModule] == WaveOut ||
mods[OutputModule] == DSoundOut; mods[OutputModule] == DSoundOut;
const bool AudioExpansion = const bool AudioExpansion =
mods[OutputModule] == XAudio2Out || mods[OutputModule] == XAudio2Out;
mods[OutputModule] == PortaudioOut;
EnableWindow(GetDlgItem(window, IDC_OUTCONF), IsConfigurable); EnableWindow(GetDlgItem(window, IDC_OUTCONF), IsConfigurable);
EnableWindow(GetDlgItem(window, IDC_SPEAKERS), AudioExpansion); EnableWindow(GetDlgItem(window, IDC_SPEAKERS), AudioExpansion);

3
pcsx2/SPU2/Windows/ConfigDebug.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#include "Utilities\Path.h" #include "Utilities\Path.h"

3
pcsx2/SPU2/Windows/ConfigSoundtouch.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#include "soundtouch/SoundTouch.h" #include "soundtouch/SoundTouch.h"

3
pcsx2/SPU2/Windows/RealtimeDebugger.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#include "Dialogs.h" #include "Dialogs.h"
bool debugDialogOpen = false; bool debugDialogOpen = false;

4
pcsx2/SPU2/Windows/SndOut_DSound.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#define _WIN32_DCOM #define _WIN32_DCOM
#include "Dialogs.h" #include "Dialogs.h"
@ -416,6 +417,7 @@ public:
MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND); MessageBox((HWND)parent, L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND);
return; return;
} }
} }
s32 Test() const s32 Test() const

3
pcsx2/SPU2/Windows/SndOut_XAudio2.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#undef _WIN32_WINNT #undef _WIN32_WINNT

3
pcsx2/SPU2/Windows/SndOut_waveOut.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#include "Dialogs.h" #include "Dialogs.h"

3
pcsx2/SPU2/Windows/UIHelpers.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#include "Dialogs.h" #include "Dialogs.h"
int SendDialogMsg(HWND hwnd, int dlgId, UINT code, WPARAM wParam, LPARAM lParam) int SendDialogMsg(HWND hwnd, int dlgId, UINT code, WPARAM wParam, LPARAM lParam)

3
pcsx2/SPU2/Windows/dsp.cpp
View File

@ -13,7 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "PrecompiledHeader.h"
#include "../Global.h"
#define _WIN32_WINNT 0x0600 #define _WIN32_WINNT 0x0600
#include <windows.h> #include <windows.h>

1
pcsx2/SPU2/defs.h
View File

@ -17,6 +17,7 @@
#include "Mixer.h" #include "Mixer.h"
#include "SndOut.h" #include "SndOut.h"
#include "Global.h"
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// SPU2 Memory Indexers // SPU2 Memory Indexers

2
pcsx2/SPU2/regs.h
View File

@ -15,6 +15,8 @@
#pragma once #pragma once
#include "Pcsx2Types.h"
#define SPU2_CORE0 0x00000000 #define SPU2_CORE0 0x00000000
#define SPU2_CORE1 0x00000400 #define SPU2_CORE1 0x00000400

2
pcsx2/SPU2/spdif.h
View File

@ -104,4 +104,4 @@ typedef struct _chstatus
u8 reservd1 : 4; u8 reservd1 : 4;
u8 category; u8 category;
u8 reservd2[22]; u8 reservd2[22];
} chstatus: } chstatus;

1
pcsx2/SPU2/spu2.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#include "spu2.h" #include "spu2.h"
#include "Dma.h" #include "Dma.h"

1
pcsx2/SPU2/spu2freeze.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#include "spu2.h" // hopefully temporary, until I resolve lClocks depdendency #include "spu2.h" // hopefully temporary, until I resolve lClocks depdendency

4
pcsx2/SPU2/spu2replay.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#include "spu2.h" #include "spu2.h"
@ -199,8 +200,7 @@ BOOL WINAPI HandlerRoutine(DWORD dwCtrlType)
#endif #endif
#include "Windows/Dialogs.h" #include "Windows/Dialogs.h"
EXPORT_C_(void) void s2r_replay(HWND hwnd, HINSTANCE hinst, LPSTR filename, int nCmdShow)
s2r_replay(HWND hwnd, HINSTANCE hinst, LPSTR filename, int nCmdShow)
{ {
int events = 0; int events = 0;

1
pcsx2/SPU2/spu2sys.cpp
View File

@ -20,6 +20,7 @@
// Contents should be cross-platform compatible whenever possible. // Contents should be cross-platform compatible whenever possible.
#include "PrecompiledHeader.h"
#include "Global.h" #include "Global.h"
#include "Dma.h" #include "Dma.h"
#include "IopDma.h" #include "IopDma.h"

1
pcsx2/SPU2/wx/wxConfig.cpp
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PrecompiledHeader.h"
#include "../Config.h" #include "../Config.h"
#ifdef __linux__ #ifdef __linux__
#include "../Linux/Config.h" #include "../Linux/Config.h"

95
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -65,6 +65,7 @@
</ClCompile> </ClCompile>
<Link> <Link>
<LargeAddressAware>Yes</LargeAddressAware> <LargeAddressAware>Yes</LargeAddressAware>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@ -267,52 +268,42 @@
<ClCompile Include="..\..\IopGte.cpp" /> <ClCompile Include="..\..\IopGte.cpp" />
<ClCompile Include="..\..\IPC.cpp" /> <ClCompile Include="..\..\IPC.cpp" />
<ClCompile Include="..\..\FW.cpp" /> <ClCompile Include="..\..\FW.cpp" />
<ClCompile Include="..\..\SPU2\ADSR.cpp" />
<ClCompile Include="..\..\SPU2\Debug.cpp" />
<ClCompile Include="..\..\SPU2\DplIIdecoder.cpp" /> <ClCompile Include="..\..\SPU2\DplIIdecoder.cpp" />
<ClCompile Include="..\..\SPU2\Dma.cpp" /> <ClCompile Include="..\..\SPU2\debug.cpp" />
<ClCompile Include="..\..\SPU2\Lowpass.cpp" />
<ClCompile Include="..\..\SPU2\Mixer.cpp" />
<ClCompile Include="..\..\SPU2\spu2.cpp" />
<ClCompile Include="..\..\SPU2\ReadInput.cpp" />
<ClCompile Include="..\..\SPU2\RegLog.cpp" /> <ClCompile Include="..\..\SPU2\RegLog.cpp" />
<ClCompile Include="..\..\SPU2\RegTable.cpp" />
<ClCompile Include="..\..\SPU2\Reverb.cpp" />
<ClCompile Include="..\..\SPU2\SndOut.cpp" />
<ClCompile Include="..\..\SPU2\spu2freeze.cpp" />
<ClCompile Include="..\..\SPU2\spu2replay.cpp" /> <ClCompile Include="..\..\SPU2\spu2replay.cpp" />
<ClCompile Include="..\..\SPU2\spu2sys.cpp" /> <ClCompile Include="..\..\SPU2\wavedump_wav.cpp" />
<ClCompile Include="..\..\SPU2\Lowpass.cpp" />
<ClCompile Include="..\..\SPU2\SndOut.cpp" />
<ClCompile Include="..\..\SPU2\Timestretcher.cpp" /> <ClCompile Include="..\..\SPU2\Timestretcher.cpp" />
<ClCompile Include="..\..\SPU2\Wavedump_wav.cpp" /> <ClCompile Include="..\..\SPU2\Windows\SndOut_DSound.cpp" />
<ClCompile Include="..\..\SPU2\WavFile.cpp" /> <ClCompile Include="..\..\SPU2\Windows\SndOut_waveOut.cpp" />
<ClCompile Include="..\..\SPU2\Windows\SndOut_XAudio2.cpp" />
<ClCompile Include="..\..\SPU2\Linux\Alsa.cpp"> <ClCompile Include="..\..\SPU2\Linux\Alsa.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Linux\CfgHelpers.cpp"> <ClCompile Include="..\..\SPU2\dma.cpp" />
<ExcludedFromBuild>true</ExcludedFromBuild> <ClCompile Include="..\..\SPU2\RegTable.cpp" />
</ClCompile> <ClCompile Include="..\..\SPU2\spu2freeze.cpp" />
<ClCompile Include="..\..\SPU2\spu2sys.cpp" />
<ClCompile Include="..\..\SPU2\ADSR.cpp" />
<ClCompile Include="..\..\SPU2\Mixer.cpp" />
<ClCompile Include="..\..\SPU2\ReadInput.cpp" />
<ClCompile Include="..\..\SPU2\Reverb.cpp" />
<ClCompile Include="..\..\SPU2\Windows\dsp.cpp" />
<ClCompile Include="..\..\SPU2\Linux\Config.cpp"> <ClCompile Include="..\..\SPU2\Linux\Config.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Linux\ConfigDebug.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\SPU2\Linux\ConfigSoundTouch.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\SPU2\Linux\Dialogs.cpp"> <ClCompile Include="..\..\SPU2\Linux\Dialogs.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\wx\wxConfig.cpp"> <ClCompile Include="..\..\SPU2\Windows\CfgHelpers.cpp" />
<ExcludedFromBuild>true</ExcludedFromBuild> <ClCompile Include="..\..\SPU2\Windows\Config.cpp" />
</ClCompile> <ClCompile Include="..\..\SPU2\Windows\ConfigDebug.cpp" />
<ClCompile Include="..\..\SPU2\Windows\SndOut_waveOut.cpp" />
<ClCompile Include="..\..\SPU2\Windows\SndOut_DSound.cpp" />
<ClCompile Include="..\..\SPU2\Windows\SndOut_XAudio2.cpp" />
<ClCompile Include="..\..\SPU2\Windows\UIHelpers.cpp" />
<ClCompile Include="..\..\SPU2\Windows\RealtimeDebugger.cpp" />
<ClCompile Include="..\..\SPU2\Windows\dsp.cpp" />
<ClCompile Include="..\..\SPU2\Windows\ConfigSoundtouch.cpp" /> <ClCompile Include="..\..\SPU2\Windows\ConfigSoundtouch.cpp" />
<ClCompile Include="..\..\SPU2\Windows\RealtimeDebugger.cpp" />
<ClCompile Include="..\..\SPU2\Windows\UIHelpers.cpp" />
<ClCompile Include="..\..\SPU2\spu2.cpp" />
<ClCompile Include="..\..\IPU\IPUdma.cpp" /> <ClCompile Include="..\..\IPU\IPUdma.cpp" />
<ClCompile Include="..\..\IPU\IPUdither.cpp" /> <ClCompile Include="..\..\IPU\IPUdither.cpp" />
<ClCompile Include="..\..\Linux\LnxConsolePipe.cpp"> <ClCompile Include="..\..\Linux\LnxConsolePipe.cpp">
@ -565,22 +556,24 @@
<ClInclude Include="..\..\IopGte.h" /> <ClInclude Include="..\..\IopGte.h" />
<ClInclude Include="..\..\IPC.h" /> <ClInclude Include="..\..\IPC.h" />
<ClInclude Include="..\..\FW.h" /> <ClInclude Include="..\..\FW.h" />
<ClCompile Include="..\..\SPU2\Config.h" /> <ClInclude Include="..\..\SPU2\Config.h" />
<ClCompile Include="..\..\SPU2\Debug.h" /> <ClInclude Include="..\..\SPU2\Global.h" />
<ClCompile Include="..\..\SPU2\defs.h" /> <ClInclude Include="..\..\SPU2\spu2replay.h" />
<ClCompile Include="..\..\SPU2\Dma.h" /> <ClInclude Include="..\..\SPU2\Lowpass.h" />
<ClCompile Include="..\..\SPU2\Global.h" /> <ClInclude Include="..\..\SPU2\SndOut.h" />
<ClCompile Include="..\..\SPU2\Lowpass.h" /> <ClInclude Include="..\..\SPU2\Linux\Alsa.h" />
<ClCompile Include="..\..\SPU2\Mixer.h" /> <ClInclude Include="..\..\SPU2\spdif.h" />
<ClCompile Include="..\..\SPU2\spu2.h" /> <ClInclude Include="..\..\SPU2\defs.h" />
<ClCompile Include="..\..\SPU2\regs.h" /> <ClInclude Include="..\..\SPU2\Dma.h" />
<ClCompile Include="..\..\SPU2\SndOut.h" /> <ClInclude Include="..\..\SPU2\regs.h" />
<ClCompile Include="..\..\SPU2\spdif.h" /> <ClInclude Include="..\..\SPU2\Mixer.h" />
<ClCompile Include="..\..\SPU2\spu2replay.h" /> <ClInclude Include="..\..\SPU2\Windows\dsp.h" />
<ClCompile Include="..\..\SPU2\WavFile.h" /> <ClInclude Include="..\..\SPU2\Linux\Config.h" />
<ClCompile Include="..\..\SPU2\Windows/resource.h" /> <ClInclude Include="..\..\SPU2\Linux\Dialogs.h" />
<ClCompile Include="..\..\SPU2\Windows/WinConfig.h" /> <ClInclude Include="..\..\SPU2\Windows\Dialogs.h" />
<ClCompile Include="..\..\SPU2\Windows/dsp.h" /> <ClInclude Include="..\..\SPU2\Windows\WinConfig.h" />
<ClInclude Include="..\..\SPU2\spu2.h" />
<ClInclude Include="..\..\SPU2\Windows\resource.h" />
<ClInclude Include="..\..\IPU\IPUdma.h" /> <ClInclude Include="..\..\IPU\IPUdma.h" />
<ClInclude Include="..\..\Mdec.h" /> <ClInclude Include="..\..\Mdec.h" />
<ClInclude Include="..\..\Patch.h" /> <ClInclude Include="..\..\Patch.h" />
@ -734,10 +727,16 @@
<ResourceCompile Include="..\wxResources.rc" /> <ResourceCompile Include="..\wxResources.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\3rdparty\portaudio\build\msvc\portaudio.vcxproj">
<Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\3rdparty\pthreads4w\build\pthreads4w.vcxproj"> <ProjectReference Include="..\..\..\3rdparty\pthreads4w\build\pthreads4w.vcxproj">
<Project>{0fae817d-9a32-4830-857e-81da57246e16}</Project> <Project>{0fae817d-9a32-4830-857e-81da57246e16}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\3rdparty\soundtouch\SoundTouch.vcxproj">
<Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\3rdparty\wxwidgets3.0\build\msw\wx30_adv.vcxproj"> <ProjectReference Include="..\..\..\3rdparty\wxwidgets3.0\build\msw\wx30_adv.vcxproj">
<Project>{24c45343-fd20-5c92-81c1-35a2ae841e79}</Project> <Project>{24c45343-fd20-5c92-81c1-35a2ae841e79}</Project>
</ProjectReference> </ProjectReference>

194
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -910,67 +910,55 @@
<ClCompile Include="..\..\SPU2\Dma.cpp"> <ClCompile Include="..\..\SPU2\Dma.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Dma.h"> <ClCompile Include="..\..\SPU2\spu2.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Linux\ConfigDebug.cpp"> <ClCompile Include="..\..\SPU2\spu2freeze.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Linux\Dialogs.cpp"> <ClCompile Include="..\..\SPU2\spu2replay.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Windows/dsp.h"> <ClCompile Include="..\..\SPU2\spu2sys.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\dsp.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Debug.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Debug.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Linux\ConfigSoundTouch.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\ConfigSoundtouch.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Linux\Config.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Linux\CfgHelpers.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Linux\Alsa.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\ADSR.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\defs.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Config.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Global.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\DplIIdecoder.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Lowpass.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Lowpass.h">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Mixer.cpp"> <ClCompile Include="..\..\SPU2\Mixer.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Mixer.h"> <ClCompile Include="..\..\SPU2\Lowpass.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\Config.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Linux\Config.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\CfgHelpers.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\ADSR.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Linux\Alsa.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\ConfigDebug.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\ConfigSoundtouch.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\debug.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Linux\Dialogs.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\DplIIdecoder.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\dsp.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\ReadInput.cpp"> <ClCompile Include="..\..\SPU2\ReadInput.cpp">
@ -982,67 +970,22 @@
<ClCompile Include="..\..\SPU2\RegLog.cpp"> <ClCompile Include="..\..\SPU2\RegLog.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\regs.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\RegTable.cpp"> <ClCompile Include="..\..\SPU2\RegTable.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Reverb.cpp"> <ClCompile Include="..\..\SPU2\Reverb.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Windows/resource.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\SndOut.cpp"> <ClCompile Include="..\..\SPU2\SndOut.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\SndOut.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\SndOut_DSound.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\SndOut_waveOut.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows\SndOut_XAudio2.cpp"> <ClCompile Include="..\..\SPU2\Windows\SndOut_XAudio2.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\spu2.cpp"> <ClCompile Include="..\..\SPU2\Windows\SndOut_waveOut.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\spu2.h"> <ClCompile Include="..\..\SPU2\Windows\SndOut_DSound.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\spu2freeze.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\spu2replay.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\spu2replay.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\spu2sys.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\spdif.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Wavedump_wav.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\WavFile.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\WavFile.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\Windows/WinConfig.h">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
<ClCompile Include="..\..\SPU2\wx\wxConfig.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\Windows\UIHelpers.cpp"> <ClCompile Include="..\..\SPU2\Windows\UIHelpers.cpp">
@ -1051,6 +994,9 @@
<ClCompile Include="..\..\SPU2\Timestretcher.cpp"> <ClCompile Include="..\..\SPU2\Timestretcher.cpp">
<Filter>System\Ps2\SPU2</Filter> <Filter>System\Ps2\SPU2</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\SPU2\wavedump_wav.cpp">
<Filter>System\Ps2\SPU2</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\Patch.h"> <ClInclude Include="..\..\Patch.h">
@ -1515,6 +1461,60 @@
<ClInclude Include="..\..\FW.h"> <ClInclude Include="..\..\FW.h">
<Filter>System\Ps2\Iop\FW</Filter> <Filter>System\Ps2\Iop\FW</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\SPU2\Windows\Dialogs.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\spu2.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\spu2replay.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Mixer.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Lowpass.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Config.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Linux\Config.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Linux\Alsa.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\defs.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Linux\Dialogs.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Dma.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Windows\dsp.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Global.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\regs.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\SndOut.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Windows\resource.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\spdif.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
<ClInclude Include="..\..\SPU2\Windows\WinConfig.h">
<Filter>System\Ps2\SPU2</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\wxResources.rc"> <ResourceCompile Include="..\wxResources.rc">