xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adding a kludge around defines to get each plug-in to have a unique localization function on Mac OS X.

Browse Source 
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72452 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\MaddTheSane_cp 2011-11-18 23:58:37 +00:00
parent a4f36118dc
commit 83044f740a
12 changed files with 155 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libpcsxcore/psxcommon.h
View File

@ -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

2
macosx/Pcsxr.xcodeproj/project.pbxproj
View File

@ -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";

24
macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj
View File

@ -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;
};

31
macosx/plugins/DFSound/macsrc/PluginController.m
View File

@ -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

31
macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
View File

@ -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"

31
macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
View File

@ -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"

10
plugins/dfcdrom/cdr.h
View File

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

10
plugins/dfinput/pad.h
View File

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

10
plugins/dfnet/dfnet.h
View File

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

11
plugins/dfsound/spu.c
View File

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

10
plugins/dfxvideo/gpu.c
View File

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

10
plugins/peopsxgl/gpu.c
View File

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