summaryrefslogtreecommitdiff
path: root/plugins/dfinput
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-11-18 23:58:37 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-11-18 23:58:37 +0000
commit83044f740ab7252cb02b7b5a619688ab4c2248b6 (patch)
tree0db426660e547b4c8886936630e0a406ac5bac74 /plugins/dfinput
parenta4f36118dc3781fcee3e633d2db99127de919c68 (diff)
downloadpcsxr-83044f740ab7252cb02b7b5a619688ab4c2248b6.tar.gz
Adding a kludge around defines to get each plug-in to have a unique localization function on Mac OS X.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72452 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfinput')
-rw-r--r--plugins/dfinput/pad.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h
index 21b42fb8..c624d0b2 100644
--- a/plugins/dfinput/pad.h
+++ b/plugins/dfinput/pad.h
@@ -59,7 +59,7 @@ typedef void *Display;
#define _(x) gettext(x)
#define N_(x) (x)
//If running under Mac OS X, use the Localizable.strings file instead.
-#elif defined(__MACOSX__)
+#elif defined(_MACOSX)
#ifdef PCSXRCORE
extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
@@ -69,12 +69,16 @@ extern char* Pcsxr_locale_text(char* toloc);
#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
+#else
+//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif
+#endif
#else
#define _(x) (x)
#define N_(x) (x)