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

Lets get the null plugins working in Windows again... 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1112 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-05-02 05:27:35 +00:00
parent 465f35169f
commit df31bfc51a
13 changed files with 307 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2_suite_2008.sln
View File

@ -45,13 +45,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "plugins\xpad\xpad_v
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDolio", "plugins\CDVDolio\cdvd_vs2008.vcproj", "{FCDF5AE2-EA47-4CC6-9F20-23A0517FEBCB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDolio", "plugins\CDVDolio\cdvd_vs2008.vcproj", "{FCDF5AE2-EA47-4CC6-9F20-23A0517FEBCB}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDnull", "plugins\CDVDnull\Src\CDVDnull_vs2008.vcproj", "{F38D9DF0-F68D-49D9-B3A0-932E74FB74A0}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDnull", "plugins\CDVDnull\Windows\CDVDnull_vs2008.vcproj", "{F38D9DF0-F68D-49D9-B3A0-932E74FB74A0}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "USBnull", "plugins\USBnull\Windows\USBnull_vc2008.vcproj", "{BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "USBnull", "plugins\USBnull\Windows\USBnull_vc2008.vcproj", "{BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FWnull", "plugins\FWnull\Windows\FWnull_vc2008.vcproj", "{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FWnull", "plugins\FWnull\Windows\FWnull_vc2008.vcproj", "{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DEV9null", "plugins\dev9null\src\DEV9null_vc2008.vcproj", "{04439C5F-05FB-4A9C-AAD1-5388C25377DB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DEV9null", "plugins\dev9null\Windows\DEV9null_vc2008.vcproj", "{04439C5F-05FB-4A9C-AAD1-5388C25377DB}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nulls", "Nulls", "{E1828E40-2FBB-48FE-AE7F-5587755DCE0E}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nulls", "Nulls", "{E1828E40-2FBB-48FE-AE7F-5587755DCE0E}"
EndProject EndProject

8
plugins/CDVDnull/CDVD.h
View File

@ -36,10 +36,16 @@ extern "C"
#include <windowsx.h> #include <windowsx.h>
#endif #endif
#ifdef _MSC_VER /*#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK #define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else #else
#define EXPORT_C_(type) extern "C" type #define EXPORT_C_(type) extern "C" type
#endif*/
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" type CALLBACK
#else
#define EXPORT_C_(type) extern "C" type
#endif #endif
extern const unsigned char version; extern const unsigned char version;

12
plugins/FWnull/FW.h
View File

@ -21,11 +21,15 @@
#include <stdio.h> #include <stdio.h>
#ifdef __cplusplus
extern "C" extern "C"
{ {
#endif
#define FWdefs #define FWdefs
#include "PS2Edefs.h" #include "PS2Edefs.h"
#ifdef __cplusplus
} }
#endif
#ifdef _WIN32 #ifdef _WIN32
@ -39,10 +43,16 @@ extern "C"
#endif #endif
#ifdef _MSC_VER /*#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK #define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else #else
#define EXPORT_C_(type) extern "C" type #define EXPORT_C_(type) extern "C" type
#endif*/
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" type CALLBACK
#else
#define EXPORT_C_(type) extern "C" type
#endif #endif
#define FW_LOG __Log #define FW_LOG __Log

0
plugins/FWnull/Windows/Config.c → plugins/FWnull/Windows/Config.cpp
View File

4
plugins/FWnull/Windows/FWnull_vc2008.vcproj
View File

@ -157,7 +157,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
> >
<File <File
RelativePath=".\Config.c" RelativePath=".\Config.cpp"
> >
</File> </File>
<File <File
@ -165,7 +165,7 @@
> >
</File> </File>
<File <File
RelativePath=".\Win32.c" RelativePath=".\Win32.cpp"
> >
</File> </File>
</Filter> </Filter>

0
plugins/FWnull/Windows/Win32.c → plugins/FWnull/Windows/Win32.cpp
View File

7
plugins/USBnull/USB.h
View File

@ -54,9 +54,14 @@ extern USBcallback USBirq;
extern Config conf; extern Config conf;
extern FILE *usbLog; extern FILE *usbLog;
/*#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
#define EXPORT_C_(type) extern "C" type
#endif*/
#ifdef _MSC_VER #ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK #define EXPORT_C_(type) extern "C" type CALLBACK
#else #else
#define EXPORT_C_(type) extern "C" type #define EXPORT_C_(type) extern "C" type
#endif #endif

0
plugins/USBnull/Windows/Config.c → plugins/USBnull/Windows/Config.cpp
View File

4
plugins/USBnull/Windows/USBnull_vc2008.vcproj
View File

@ -157,7 +157,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
> >
<File <File
RelativePath="Config.c" RelativePath=".\Config.cpp"
> >
</File> </File>
<File <File
@ -165,7 +165,7 @@
> >
</File> </File>
<File <File
RelativePath="Win32.c" RelativePath=".\Win32.cpp"
> >
</File> </File>
</Filter> </Filter>

0
plugins/USBnull/Windows/Win32.c → plugins/USBnull/Windows/Win32.cpp
View File

2
plugins/dev9null/DEV9.cpp
View File

@ -140,7 +140,7 @@ EXPORT_C_(void) DEV9about()
HINSTANCE hInst; HINSTANCE hInst;
void SysMessage(char *fmt, ...) void SysMessage(const char *fmt, ...)
{ {
va_list list; va_list list;
char tmp[512]; char tmp[512];

8
plugins/dev9null/DEV9.h
View File

@ -17,10 +17,16 @@ extern "C"
#include "PS2Edefs.h" #include "PS2Edefs.h"
} }
#ifdef _MSC_VER /*#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK #define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else #else
#define EXPORT_C_(type) extern "C" type #define EXPORT_C_(type) extern "C" type
#endif*/
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" type CALLBACK
#else
#define EXPORT_C_(type) extern "C" type
#endif #endif
extern const unsigned char version; extern const unsigned char version;

10
plugins/dev9null/Windows/DEV9null_vc2008.vcproj
View File

@ -160,11 +160,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
> >
<File <File
RelativePath=".\DEV9.h" RelativePath="..\DEV9.cpp"
>
</File>
<File
RelativePath=".\dev9null.c"
> >
</File> </File>
<File <File
@ -172,6 +168,10 @@
> >
</File> </File>
</Filter> </Filter>
<File
RelativePath="..\DEV9.h"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>