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

OS X: minor maintenance: 

Remove reference to "SJIS name": It wasn't being used anymore.
Strip headers from SDL2 when copying it over: we don't need those files.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@91642 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\MaddTheSane_cp 2014-09-27 17:28:49 +00:00
parent 71ac2146a8
commit 637f97d9db
8 changed files with 9 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@
5557769A17EBE7D60019D008 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5557769917EBE7D60019D008 /* Media.xcassets */; };
556C37A9197C815C001A4265 /* PSXMemEnumerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 556C37A8197C815C001A4265 /* PSXMemEnumerator.m */; };
556C37AB197C9C59001A4265 /* PcsxrMemoryObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 55A90228147D89380037E18F /* PcsxrMemoryObject.m */; };
556C37AD197D94C8001A4265 /* SDL2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 554FD70817C6A13E0056CF66 /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
556C37AD197D94C8001A4265 /* SDL2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 554FD70817C6A13E0056CF66 /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
556C37AE197D94D6001A4265 /* libSPUSharedCode.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76E71786971B0052D185 /* libSPUSharedCode.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
556C37B2197DBFD1001A4265 /* template.html in Resources */ = {isa = PBXBuildFile; fileRef = 556C37B1197DBFD1001A4265 /* template.html */; };
5581463917AABCD100862DBF /* PcsxrCheatHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5581463817AABCD100862DBF /* PcsxrCheatHandler.m */; };
@ -1804,7 +1804,6 @@
71AD2DF010C3573400365243 /* Copy Plug-Ins */,
55202EBA18E73E3E00C631AA /* Copy QuickLook Plug-In */,
5525BC58194219B80018AF2F /* Copy Spotlight Plug-Ins */,
55F41A3317EF8CFF00605DF8 /* Strip Headers */,
556C37AC197D94AF001A4265 /* Copy Frameworks */,
);
buildRules = (
@ -1838,7 +1837,6 @@
550E343218E6293D00A1AD21 /* Frameworks */,
550E343318E6293D00A1AD21 /* Headers */,
550E343418E6293D00A1AD21 /* Resources */,
550E343518E6293D00A1AD21 /* Rez */,
);
buildRules = (
);
@ -2222,16 +2220,6 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXRezBuildPhase section */
550E343518E6293D00A1AD21 /* Rez */ = {
isa = PBXRezBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXRezBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
55534AFE18183D86006D6BCB /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@ -2249,20 +2237,6 @@
shellPath = /bin/sh;
shellScript = "#Some code taken from the MPlayerX people.\nexport PATH=\"/usr/bin:/bin:/usr/sbin:/sbin\"\ncd $SRCROOT\n$TARGET_BUILD_DIR/$PRODUCT_NAME Info.plist\ntouch -amfc Info.plistvers.plist\n\nexit 0\n";
};
55F41A3317EF8CFF00605DF8 /* Strip Headers */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
files = (
);
inputPaths = (
);
name = "Strip Headers";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
shellScript = "# Remove all headers from copied frameworks\nfind \"${TARGET_BUILD_DIR}\"/\"${PRODUCT_NAME}\".${WRAPPER_EXTENSION} -name Headers -print0 | xargs -0 rm -rf\nfind \"${TARGET_BUILD_DIR}\"/\"${PRODUCT_NAME}\".${WRAPPER_EXTENSION} -name PrivateHeaders -print0 | xargs -0 rm -rf\n";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@ -3492,7 +3466,6 @@
GCC_C_LANGUAGE_STANDARD = gnu89;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = pcsxr.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
@ -3830,7 +3803,6 @@
GCC_C_LANGUAGE_STANDARD = gnu89;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = pcsxr.pch;
GCC_PREPROCESSOR_DEFINITIONS = (

3
macosx/Resources/en.lproj/Configuration.strings
View File

@ -287,9 +287,6 @@
/* Class = "NSTextFieldCell"; title = "English name"; ObjectID = "981"; */
"981.title" = "English name";
/* Class = "NSTextFieldCell"; title = "SJIS name"; ObjectID = "982"; */
"982.title" = "SJIS name";
/* Class = "NSTextFieldCell"; title = "DELETED"; ObjectID = "983"; */
"983.title" = "DELETED";

3
macosx/Resources/fr.lproj/Configuration.strings
View File

@ -287,9 +287,6 @@
/* Class = "NSTextFieldCell"; title = "English name"; ObjectID = "981"; */
"981.title" = "English name";
/* Class = "NSTextFieldCell"; title = "SJIS name"; ObjectID = "982"; */
"982.title" = "SJIS name";
/* Class = "NSTextFieldCell"; title = "DELETED"; ObjectID = "983"; */
"983.title" = "DELETED";

3
macosx/Resources/hu.lproj/Configuration.strings
View File

@ -287,9 +287,6 @@
/* Class = "NSTextFieldCell"; title = "English name"; ObjectID = "981"; */
"981.title" = "English name";
/* Class = "NSTextFieldCell"; title = "SJIS name"; ObjectID = "982"; */
"982.title" = "SJIS name";
/* Class = "NSTextFieldCell"; title = "DELETED"; ObjectID = "983"; */
"983.title" = "DELETED";

3
macosx/Resources/zh-Hans.lproj/Configuration.strings
View File

@ -287,9 +287,6 @@
/* Class = "NSTextFieldCell"; title = "英文名称"; ObjectID = "981"; */
"981.title" = "英文名称";
/* Class = "NSTextFieldCell"; title = "SJIS 名称"; ObjectID = "982"; */
"982.title" = "SJIS 名称";
/* Class = "NSTextFieldCell"; title = "删除"; ObjectID = "983"; */
"983.title" = "删除";

4
macosx/Source/LaunchArg.h
View File

@ -19,7 +19,7 @@ typedef enum _LaunchArgOrder {
@property (readonly, copy, nonatomic) dispatch_block_t theBlock;
@property (readonly, strong) NSString *argument;
- (instancetype)initWithLaunchOrder:(unsigned)order block:(dispatch_block_t)block argument:(NSString*)arg NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithLaunchOrder:(unsigned)order argument:(NSString*)arg block:(dispatch_block_t)block;
- (instancetype)initWithLaunchOrder:(unsigned)order block:(dispatch_block_t)block argument:(NSString*)arg;
- (instancetype)initWithLaunchOrder:(unsigned)order argument:(NSString*)arg block:(dispatch_block_t)block NS_DESIGNATED_INITIALIZER;
- (void)addToDictionary:(NSMutableDictionary*)toAdd;
@end

10
macosx/Source/LaunchArg.m
View File

@ -24,11 +24,6 @@
}
- (instancetype)initWithLaunchOrder:(unsigned)order argument:(NSString*)arg block:(dispatch_block_t)block
{
return [self initWithLaunchOrder:order block:block argument:arg];
}
- (instancetype)initWithLaunchOrder:(unsigned)order block:(dispatch_block_t)block argument:(NSString*)arg
{
if (self = [super init]) {
self.launchOrder = order;
@ -38,6 +33,11 @@
return self;
}
- (instancetype)initWithLaunchOrder:(unsigned)order block:(dispatch_block_t)block argument:(NSString*)arg
{
return [self initWithLaunchOrder:order argument:arg block:block];
}
- (void)addToDictionary:(NSMutableDictionary*)toAdd
{
toAdd[self.argument] = self;

3
macosx/Source/PcsxrPlugin.m
View File

@ -51,7 +51,6 @@
+ (NSString *)defaultKeyForType:(int)aType
{
//return @"Plugin" [PcsxrPlugin prefixForType:aType];
switch (aType) {
case PSE_LT_GPU:
case PSE_LT_CDR:
@ -175,7 +174,7 @@
return nil;
}
// TODO: add support for plugins with multiple functionalities???
// TODO: add support for plugins with multiple functionalities?
PSE_getLibType = (PSEgetLibType) SysLoadSym(pluginRef, kPCSXRGetLibType);
if (SysLibError() != nil) {
if (([path rangeOfString: @"gpu" options:NSCaseInsensitiveSearch]).length != 0)