summaryrefslogtreecommitdiff
path: root/plugins/dfinput
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/dfinput')
-rw-r--r--plugins/dfinput/pad.c4
-rw-r--r--plugins/dfinput/pad.h20
2 files changed, 23 insertions, 1 deletions
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index 3900f0c4..ce5d7651 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -23,6 +23,10 @@
#include <time.h>
#endif
+#if SDL_VERSION_ATLEAST(1,3,0)
+int has_haptic;
+#endif
+
static void (*gpuVisualVibration)(uint32_t, uint32_t) = NULL;
char *PSEgetLibName(void) {
diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h
index f39e231e..21b42fb8 100644
--- a/plugins/dfinput/pad.h
+++ b/plugins/dfinput/pad.h
@@ -58,14 +58,32 @@ typedef void *Display;
#include <locale.h>
#define _(x) gettext(x)
#define N_(x) (x)
+//If running under Mac OS X, use the Localizable.strings file instead.
+#elif defined(__MACOSX__)
+#ifdef PCSXRCORE
+extern char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#endif
+#define PLUGLOC PCSXRPLUG##_locale_text
+extern char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
#else
#define _(x) (x)
#define N_(x) (x)
#endif
#if SDL_VERSION_ATLEAST(1,3,0)
-int has_haptic;
+extern int has_haptic;
#endif
+
int JoyHapticRumble(int pad, uint32_t low, uint32_t high);
enum {