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

12 files changed, 155 insertions, 38 deletions

diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index f5e3deee..78be8dba 100644
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -90,10 +90,8 @@ typedef uint8_t boolean;
 #endif

 

 //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)

 #define N_(String) String

@@ -102,13 +100,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 _(msgid) msgid

diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index c5b8b4de..affd7768 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -929,6 +929,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					PCSXRCORE,
 					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+					"_MACOSX=1",
 					__MACOSX__,
 				);
 				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "PCSXR_VERSION=\\\"1.5\\\" XA_HACK=1";
@@ -958,6 +959,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					PCSXRCORE,
 					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+					"_MACOSX=1",
 					__MACOSX__,
 				);
 				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "PCSXR_VERSION=\\\"1.5\\\" XA_HACK=1";
diff --git a/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj b/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj
index bddb0aff..a9d7f793 100755
--- a/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj
+++ b/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 42;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -172,8 +172,11 @@
 /* Begin PBXProject section */
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0420;
+			};
 			buildConfigurationList = 7107359E0FDEED75004AD098 /* Build configuration list for PBXProject "DFNet" */;
-			compatibilityVersion = "Xcode 2.4";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -282,7 +285,6 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -294,9 +296,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = DFNet;
-				SECTORDER_FLAGS = "";
 				SYMROOT = ../../build;
 				WRAPPER_EXTENSION = psxplugin;
 			};
@@ -307,7 +307,6 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -319,9 +318,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = DFNet;
-				SECTORDER_FLAGS = "";
 				SYMROOT = ../../build;
 				WRAPPER_EXTENSION = psxplugin;
 			};
@@ -330,7 +327,7 @@
 		7107359F0FDEED75004AD098 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
 				HEADER_SEARCH_PATHS = (
@@ -339,8 +336,8 @@
 					../../../plugins/dfnet,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx10.6;
 				STRIP_INSTALLED_PRODUCT = NO;
 			};
 			name = Debug;
@@ -348,8 +345,7 @@
 		710735A00FDEED75004AD098 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
 				HEADER_SEARCH_PATHS = (
 					../../../libpcsxcore,
@@ -357,7 +353,7 @@
 					../../../plugins/dfnet,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
+				SDKROOT = macosx10.6;
 			};
 			name = Release;
 		};
diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m
index 9c2197cc..07446a20 100644
--- a/macosx/plugins/DFSound/macsrc/PluginController.m
+++ b/macosx/plugins/DFSound/macsrc/PluginController.m
@@ -3,6 +3,37 @@
 #include "externals.h"
 #include "maccfg.h"
 
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#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
+#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)
+#endif
+
 #ifdef USEOPENAL
 #define APP_ID @"net.sf.peops.ALPlugin"
 #else
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
index 86d65015..c765ce5d 100644
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
@@ -4,6 +4,37 @@
 #include "menu.h"
 #include "externals.h"
 
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#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
+#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)
+#endif
+
 #define APP_ID @"net.sf.peops.SoftGpuGLPlugin"
 #define PrefsKey APP_ID @" Settings"
 
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
index 72d81a31..51c4ecfe 100644
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -12,6 +12,37 @@
 #include <OpenGL/gl.h> // bah, "externals.h" thinks include files are for wimps; OpenGL header, in fact, is needed
 #include "externals.h"
 
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#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
+#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)
+#endif
+
 #define APP_ID @"net.sf.peops.GpuOpenGLPlugin"
 #define PrefsKey APP_ID @" Settings"
 
diff --git a/plugins/dfcdrom/cdr.h b/plugins/dfcdrom/cdr.h
index d568972c..66847b36 100644
--- a/plugins/dfcdrom/cdr.h
+++ b/plugins/dfcdrom/cdr.h
@@ -31,7 +31,7 @@
 #include <locale.h>

 #define _(x)  gettext(x)

 #define N_(x) (x)

-#elif defined(__MACOSX__)

+#elif defined(_MACOSX)

 #ifdef __cplusplus

 extern "C" {

 #endif

@@ -44,8 +44,11 @@ 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

@@ -53,6 +56,7 @@ extern char* PLUGLOC(char* toloc);
 #ifdef __cplusplus

 }

 #endif

+#endif

 #else

 #define _(x)  (x)

 #define N_(x) (x)

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)

diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h
index bcf4b56e..ef96ecae 100644
--- a/plugins/dfnet/dfnet.h
+++ b/plugins/dfnet/dfnet.h
@@ -23,7 +23,7 @@
 #include <locale.h>

 #define _(x)  gettext(x)

 #define N_(x) (x)

-#elif defined(__MACOSX__)	

+#elif defined(_MACOSX)

 #ifdef __cplusplus

 extern "C" {

 #endif

@@ -36,8 +36,11 @@ 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

@@ -45,6 +48,7 @@ extern char* PLUGLOC(char* toloc);
 #ifdef __cplusplus

 }

 #endif

+#endif

 #else

 #define _(x)  (x)

 #define N_(x) (x)

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 55a2d38f..8ee6a820 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -36,7 +36,8 @@
 #include <locale.h>

 #define _(x)  gettext(x)

 #define N_(x) (x)

-#elif defined(__MACOSX__)

+//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)

@@ -46,12 +47,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)

diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c
index 6ec1f040..80b87f49 100644
--- a/plugins/dfxvideo/gpu.c
+++ b/plugins/dfxvideo/gpu.c
@@ -40,7 +40,7 @@
 #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)

@@ -50,12 +50,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)

diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index 6e36fe8b..43d26227 100644
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -57,7 +57,7 @@ static int iOldMode=0;
 #include <locale.h>

 #define _(x)  gettext(x)

 #define N_(x) (x)

-#elif defined(__MACOSX__)	

+#elif defined(_MACOSX)

 #ifdef PCSXRCORE

 extern char* Pcsxr_locale_text(char* toloc);

 #define _(String) Pcsxr_locale_text(String)

@@ -67,12 +67,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)