summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authoriCatButler <i.am.catbutler@gmail.com>2016-06-07 15:57:46 +0100
committeriCatButler <i.am.catbutler@gmail.com>2016-06-07 15:57:46 +0100
commitf70082329d751ee8a358437feb34134e283b27d8 (patch)
treec97c99835067e9a20725943b4b4c63d44d4e3bdc /win32
parent7ecfee1f664eeb92b653104f5f3c915cc6fe6bcb (diff)
downloadpcsxr-f70082329d751ee8a358437feb34134e283b27d8.tar.gz
Initial PGXP CPU commit
- Restructured project to base interface on PSX instructions - Support for all relevant CPU arithmetic and logic instructions - Debug output available via deferred PGXP calls - Remove most dependencies on PCSXR - Still very much a work in progress (lots of errors) - Add extra debug information to GPU plugin (w values)
Diffstat (limited to 'win32')
-rwxr-xr-xwin32/gui/plugin.c2
-rwxr-xr-xwin32/pcsxr.sln6
-rwxr-xr-xwin32/pcsxr.vcxproj7
-rwxr-xr-xwin32/pcsxr.vcxproj.filters21
4 files changed, 33 insertions, 3 deletions
diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c
index 35b4e445..5ae00824 100755
--- a/win32/gui/plugin.c
+++ b/win32/gui/plugin.c
@@ -30,7 +30,7 @@
#include "NoPic.h"
#include "misc.h"
#include "sio.h"
-#include "pgxp_gte.h"
+#include "pgxp_mem.h"
extern void LidInterrupt();
diff --git a/win32/pcsxr.sln b/win32/pcsxr.sln
index b8d5e7c4..9a0ae541 100755
--- a/win32/pcsxr.sln
+++ b/win32/pcsxr.sln
@@ -1,6 +1,8 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+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}") = "DFSound", "plugins\dfsound\DFSound.vcxproj", "{DB25BF63-9B9E-4A40-A45E-BBBA49AD6F22}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DFXVideo", "plugins\dfxvideo\DFXVideo.vcxproj", "{30F06328-DD64-4030-AF7A-19FBC74CF298}"
diff --git a/win32/pcsxr.vcxproj b/win32/pcsxr.vcxproj
index d154db67..c5bb138e 100755
--- a/win32/pcsxr.vcxproj
+++ b/win32/pcsxr.vcxproj
@@ -197,7 +197,10 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
+ <ClCompile Include="..\libpcsxcore\pgxp_cpu.c" />
+ <ClCompile Include="..\libpcsxcore\pgxp_debug.c" />
<ClCompile Include="..\libpcsxcore\pgxp_gte.c" />
+ <ClCompile Include="..\libpcsxcore\pgxp_mem.c" />
<ClCompile Include="..\libpcsxcore\plugins.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -417,7 +420,11 @@
<ClInclude Include="..\libpcsxcore\gte_divider.h" />
<ClInclude Include="..\libpcsxcore\mdec.h" />
<ClInclude Include="..\libpcsxcore\misc.h" />
+ <ClInclude Include="..\libpcsxcore\pgxp_cpu.h" />
+ <ClInclude Include="..\libpcsxcore\pgxp_debug.h" />
<ClInclude Include="..\libpcsxcore\pgxp_gte.h" />
+ <ClInclude Include="..\libpcsxcore\pgxp_mem.h" />
+ <ClInclude Include="..\libpcsxcore\pgxp_value.h" />
<ClInclude Include="..\libpcsxcore\plugins.h" />
<ClInclude Include="..\libpcsxcore\ppf.h" />
<ClInclude Include="..\libpcsxcore\psemu_plugin_defs.h" />
diff --git a/win32/pcsxr.vcxproj.filters b/win32/pcsxr.vcxproj.filters
index 5c714f63..6551af95 100755
--- a/win32/pcsxr.vcxproj.filters
+++ b/win32/pcsxr.vcxproj.filters
@@ -195,6 +195,15 @@
<ClCompile Include="..\libpcsxcore\pgxp_gte.c">
<Filter>libpcsxcore</Filter>
</ClCompile>
+ <ClCompile Include="..\libpcsxcore\pgxp_cpu.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\pgxp_mem.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\pgxp_debug.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\libpcsxcore\cdriso.h">
@@ -361,6 +370,18 @@
<ClInclude Include="..\libpcsxcore\pgxp_gte.h">
<Filter>libpcsxcore</Filter>
</ClInclude>
+ <ClInclude Include="..\libpcsxcore\pgxp_cpu.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\pgxp_mem.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\pgxp_value.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\pgxp_debug.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="gui\about.bmp">