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

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@23678 e17a0e51-4ae3-4d35-97c3-1a29b211df97

This commit is contained in:
SND\weimingzhi_cp 2009-06-10 12:53:43 +00:00
parent 10eac4b492
commit 1ca5686e15
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
June 10, 2009 Wei Mingzhi <weimingzhi@gmail.com>
* libpcsxcore/plugins.c: Don't add "_" to function name for Mac OS X.
* macosx/Info.plist: Modified software information.
* macosx/English.lproj/InfoPlist.strings: Likewise.
* macosx/Pcsx.xcodeproj/project.pbxproj: Tweaked parameter.
* macosx/English.lproj/PCSX.nib/objects.nib: Removed Edit menu.
* macosx/English.lproj/PCSX.nib/info.nib: Likewise.
June 9, 2009 Wei Mingzhi <weimingzhi@gmail.com>
* macosx/*: Added preliminary Mac OS X port. Code copied from PCSX Mac

2
libpcsxcore/plugins.c
View File

@ -34,7 +34,7 @@ int cdOpenCase = 0;
#if defined (__MACOSX__)
#define LoadSym(dest, src, name, checkerr) \
dest = (src) SysLoadSym(drv, "_" name); \
dest = (src) SysLoadSym(drv, name); \
if (checkerr == 0) { SysLibError(); /*clean error*/ } \
if (checkerr == 1) CheckErr(name); \
if (checkerr == 2) { err = SysLibError(); if (err != NULL) errval = 1; }

8
macosx/EmuThread.m
View File

@ -60,15 +60,11 @@ static pthread_mutex_t eventMutex;
int res = CheckCdrom();
if (res == -1) {
ClosePlugins();
SysMessage(_("Could not load Cdrom\n"));
SysMessage(_("Could not check CD-ROM!\n"));
goto done;
}
if (LoadCdrom() == -1) {
ClosePlugins();
SysMessage(_("Could not load Cdrom\n"));
goto done;
}
LoadCdrom();
if (defrostPath) {
LoadState([defrostPath fileSystemRepresentation]);

6
macosx/English.lproj/InfoPlist.strings
View File

@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "PCSX";
CFBundleShortVersionString = "PCSX version 1.5 test 3";
CFBundleGetInfoString = "PCSX Playstation Emulator version 1.5 test 3, Copyright © 2005 Gil Pedersen.";
NSHumanReadableCopyright = "Copyright © 2005 Gil Pedersen.\nhttp://home.macvaerk.dtu.dk/~gil/pcsx/";
CFBundleShortVersionString = "PCSX-Reloaded";
CFBundleGetInfoString = "Playstation Emulator based on PCSX-df Project.";
NSHumanReadableCopyright = "Copyright (c) 2005 Gil Pedersen.\nCopyright (c) 2009 Wei Mingzhi.";

12
macosx/English.lproj/PCSX.nib/info.nib generated
View File

@ -3,19 +3,15 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>46 15 492 320 0 0 1024 746 </string>
<string>82 159 492 320 0 0 1024 746 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>79 658 251 44 0 0 1024 746 </string>
<string>136 288 261 44 0 0 1024 746 </string>
</dict>
<key>IBFramework Version</key>
<string>364.0</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<string>446.1</string>
<key>IBSystem Version</key>
<string>7R28</string>
<string>8P2137</string>
</dict>
</plist>

BIN
macosx/English.lproj/PCSX.nib/objects.nib generated
View File

Binary file not shown.

6
macosx/Info.plist
View File

@ -86,7 +86,7 @@
<key>CFBundleIconFile</key>
<string>PCSX.icns</string>
<key>CFBundleIdentifier</key>
<string>net.pcsx.Pcsx</string>
<string>com.codeplex.pcsxr</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@ -94,11 +94,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>PCSX 1.5 test 3</string>
<string>PCSX-Reloaded 1.9.0.91</string>
<key>CFBundleSignature</key>
<string>Pcsx</string>
<key>CFBundleVersion</key>
<string>1.5.0 test 3</string>
<string>1.9.0.91</string>
<key>NSMainNibFile</key>
<string>PCSX.nib</string>
<key>NSPrincipalClass</key>

5
macosx/Pcsx.xcodeproj/project.pbxproj
View File

@ -136,7 +136,7 @@
2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPlugin.h; sourceTree = "<group>"; };
2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
2BBB1126051DC00500B84448 /* PluginList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginList.h; sourceTree = "<group>"; };
2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginList.m; sourceTree = "<group>"; };
2BBB1787051E0D9700B84448 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Credits.rtf; sourceTree = "<group>"; };
@ -576,7 +576,6 @@
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_CPU = G3;
GCC_MODEL_TUNING = G3;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
@ -611,7 +610,7 @@
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_CPU = G3;
GCC_MODEL_CPU = "";
GCC_MODEL_TUNING = G3;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PREPROCESSOR_DEFINITIONS = (