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

Minor changes on OS X code. 

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86216 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\MaddTheSane_cp 2013-07-24 00:12:44 +00:00
parent 356b1facf0
commit 6a153e5bbd
5 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macosx/LaunchArg.h
View File

@ -11,8 +11,8 @@
typedef enum _LaunchArgOrder {
LaunchArgPreRun = 0,
LaunchArgRun = 2,
LaunchArgPostRun = 4
LaunchArgRun = 200,
LaunchArgPostRun = 400
}LaunchArgOrder;
@interface LaunchArg : NSObject

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

@ -2813,6 +2813,7 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
MACOSX_DEPLOYMENT_TARGET = 10.7;
WRAPPER_EXTENSION = psxplugin;
@ -2829,6 +2830,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
MACOSX_DEPLOYMENT_TARGET = 10.7;
WRAPPER_EXTENSION = psxplugin;
@ -2847,6 +2849,7 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
WRAPPER_EXTENSION = psxplugin;
};
@ -2862,6 +2865,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
WRAPPER_EXTENSION = psxplugin;
};
@ -2879,6 +2883,7 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
HEADER_SEARCH_PATHS = (
plugins/Common/SDL/include,
"$(inherited)",
@ -2899,6 +2904,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
HEADER_SEARCH_PATHS = (
plugins/Common/SDL/include,
"$(inherited)",
@ -2922,6 +2928,7 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
PRODUCT_NAME = PeopsSoftGPU;
@ -2941,6 +2948,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
PRODUCT_NAME = PeopsSoftGPU;
@ -2961,6 +2969,7 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
HEADER_SEARCH_PATHS = (
plugins/Common/SDL/include,
"$(inherited)",
@ -2983,6 +2992,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
HEADER_SEARCH_PATHS = (
plugins/Common/SDL/include,
"$(inherited)",
@ -3042,6 +3052,7 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_FILE = "plugins/DFSound/Info-AL.plist";
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
@ -3060,6 +3071,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_FILE = "plugins/DFSound/Info-AL.plist";
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
@ -3081,6 +3093,7 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
PRODUCT_NAME = PeopsXGL;
@ -3100,6 +3113,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
PRODUCT_NAME = PeopsXGL;
@ -3119,6 +3133,7 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
WRAPPER_EXTENSION = psxplugin;
};
@ -3134,6 +3149,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
WRAPPER_EXTENSION = psxplugin;
};
@ -3267,6 +3283,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
WRAPPER_EXTENSION = psxplugin;
};
@ -3282,6 +3299,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
HEADER_SEARCH_PATHS = (
plugins/Common/SDL/include,
"$(inherited)",
@ -3304,6 +3322,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
PRODUCT_NAME = PeopsSoftGPU;
@ -3323,6 +3342,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
PRODUCT_NAME = PeopsXGL;
@ -3341,6 +3361,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
HEADER_SEARCH_PATHS = (
plugins/Common/SDL/include,
"$(inherited)",
@ -3363,6 +3384,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_FILE = "plugins/DFSound/Info-AL.plist";
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
@ -3380,6 +3402,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
WRAPPER_EXTENSION = psxplugin;
};
@ -3395,6 +3418,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
MACOSX_DEPLOYMENT_TARGET = 10.7;
WRAPPER_EXTENSION = psxplugin;

2
macosx/PcsxrController.m
View File

@ -480,7 +480,7 @@ otherblock();\
dispatch_block_t runtimeBlock = ^{
if (![EmuThread isRunBios]) {
//Make sure the emulator is running
sleep(2);
sleep(5);
[EmuThread defrostAt:path];
}
};

2
macosx/main.m
View File

@ -189,7 +189,7 @@ const char *SysLibError() {
#ifdef DEBUG
const char *theErr = dlerror();
if (theErr) {
NSLog(@"@Error loading binary: %s.", theErr);
NSLog(@"Error loading binary: %s.", theErr);
}
return theErr;
#else

2
macosx/plugins/DFInput/Info.plist
View File

@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>PsxP</string>
<key>CFBundleSignature</key>
<string>DFI</string>
<string>DFI </string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>NSPrincipalClass</key>