From 3043ded6406ce8bb06392b2c6351eb7596658d11 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 17 Nov 2011 01:58:25 +0000
Subject: First steps for localization support for Mac OS X/Cocoa, including:
 Localizable.strings files for each plug-in. Try to get localizable string
 from a c string (see Pcsxr_locale_text in main.m). Each Mac plug-in now has a
 Principal class declaration in their Info.plist

Also updated the memory card extensions

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72361 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 plugins/dfinput/pad.c |  4 ++++
 plugins/dfinput/pad.h | 20 +++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'plugins/dfinput')

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 {
-- 
cgit v1.2.3