mirror of https://github.com/PCSX2/pcsx2.git
Merge pull request #507 from PCSX2/stdcall-for-plugin
Stdcall for plugin
This commit is contained in:
commit
6fc9afb175
|
@ -30,7 +30,7 @@
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//#include "PS2Edefs.h"
|
//#include "PS2Edefs.h"
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#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" __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#define EXPORT_C_(type) __declspec(dllexport) type __stdcall
|
#define EXPORT_C_(type) __declspec(dllexport) type __stdcall
|
||||||
#else
|
#else
|
||||||
#define EXPORT_C_(type) __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#define EXPORT_C_(type) extern "C" type CALLBACK
|
#define EXPORT_C_(type) extern "C" type CALLBACK
|
||||||
#else
|
#else
|
||||||
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern const unsigned char version;
|
extern const unsigned char version;
|
||||||
|
|
|
@ -52,8 +52,6 @@ const char* GSUtil::GetLibName()
|
||||||
|
|
||||||
list<string> sl;
|
list<string> sl;
|
||||||
|
|
||||||
// TODO: linux (gcc)
|
|
||||||
|
|
||||||
#ifdef __INTEL_COMPILER
|
#ifdef __INTEL_COMPILER
|
||||||
sl.push_back(format("Intel C++ %d.%02d", __INTEL_COMPILER / 100, __INTEL_COMPILER % 100));
|
sl.push_back(format("Intel C++ %d.%02d", __INTEL_COMPILER / 100, __INTEL_COMPILER % 100));
|
||||||
#elif _MSC_VER
|
#elif _MSC_VER
|
||||||
|
|
|
@ -40,7 +40,7 @@ typedef struct _keyEvent keyEvent;
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#define EXPORT_C_(type) extern "C" type CALLBACK
|
#define EXPORT_C_(type) extern "C" type CALLBACK
|
||||||
#else
|
#else
|
||||||
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//#define GS_LOG GSLog::Log
|
//#define GS_LOG GSLog::Log
|
||||||
|
|
|
@ -110,7 +110,7 @@ inline void * realloc(void *mem, size_t size);
|
||||||
#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" __attribute__((externally_visible,visibility("default"))) type CALLBACK
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type CALLBACK
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#define EXPORT_C_(type) extern "C" type CALLBACK
|
#define EXPORT_C_(type) extern "C" type CALLBACK
|
||||||
#else
|
#else
|
||||||
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PAD_LOG __Log
|
#define PAD_LOG __Log
|
||||||
|
|
|
@ -39,7 +39,7 @@ extern "C"
|
||||||
#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" __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern FILE *spu2Log;
|
extern FILE *spu2Log;
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
PADconf* conf;
|
PADconf* conf;
|
||||||
char libraryName[256];
|
static char libraryName[256];
|
||||||
|
|
||||||
keyEvent event;
|
keyEvent event;
|
||||||
|
|
||||||
|
|
|
@ -57,11 +57,9 @@ using namespace std;
|
||||||
#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" __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern char libraryName[256];
|
|
||||||
|
|
||||||
enum PadOptions
|
enum PadOptions
|
||||||
{
|
{
|
||||||
PADOPTION_FORCEFEEDBACK = 0x1,
|
PADOPTION_FORCEFEEDBACK = 0x1,
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#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" __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// We have our own versions that have the DLLExport attribute configured:
|
// We have our own versions that have the DLLExport attribute configured:
|
||||||
|
|
|
@ -35,7 +35,7 @@ extern float fFPS;
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#define EXPORT_C_(type) extern "C" type CALLBACK
|
#define EXPORT_C_(type) extern "C" type CALLBACK
|
||||||
#else
|
#else
|
||||||
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
|
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern int g_LastCRC;
|
extern int g_LastCRC;
|
||||||
|
|
Loading…
Reference in New Issue