ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in OSX port, where the name of the application wasn't shown 

in Activity Monitor.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2154 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2010-10-12 15:29:22 +00:00
parent 2f11619e78
commit bd06b3db1e
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debugger/DiStella.cxx
View File

@ -726,7 +726,7 @@ void DiStella::disasm(uInt32 distart, int pass)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int DiStella::mark(uInt16 address, uInt8 mask) int DiStella::mark(uInt32 address, uInt8 mask)
{ {
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
For any given offset and code range... For any given offset and code range...

2
src/debugger/DiStella.hxx
View File

@ -84,7 +84,7 @@ class DiStella
// These functions are part of the original Distella code // These functions are part of the original Distella code
void disasm(uInt32 distart, int pass); void disasm(uInt32 distart, int pass);
bool check_range(uInt16 start, uInt16 end) const; bool check_range(uInt16 start, uInt16 end) const;
int mark(uInt16 address, uInt8 mask); int mark(uInt32 address, uInt8 mask);
bool check_bit(uInt16 address, uInt8 mask) const; bool check_bit(uInt16 address, uInt8 mask) const;
private: private:

2
src/macosx/Info-Stella.plist
View File

@ -33,7 +33,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Stella</string> <string>Stella</string>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string></string> <string>Stella</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>Stella</string> <string>Stella</string>
<key>CFBundleHelpBookFolder</key> <key>CFBundleHelpBookFolder</key>

15
src/macosx/stella_intel.xcodeproj/project.pbxproj
View File

@ -119,7 +119,6 @@
2D91746809BA90380026E9FF /* MediaFactory.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D05FF5B096E261E00A518FE /* MediaFactory.hxx */; }; 2D91746809BA90380026E9FF /* MediaFactory.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D05FF5B096E261E00A518FE /* MediaFactory.hxx */; };
2D91746909BA90380026E9FF /* EventMappingWidget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D05FF5F096E269100A518FE /* EventMappingWidget.hxx */; }; 2D91746909BA90380026E9FF /* EventMappingWidget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D05FF5F096E269100A518FE /* EventMappingWidget.hxx */; };
2D91746A09BA90380026E9FF /* InputDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D05FF61096E269100A518FE /* InputDialog.hxx */; }; 2D91746A09BA90380026E9FF /* InputDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 2D05FF61096E269100A518FE /* InputDialog.hxx */; };
2D91746D09BA90380026E9FF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
2D91746E09BA90380026E9FF /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = B2F367C504C7ADC700A80002 /* SDLMain.nib */; }; 2D91746E09BA90380026E9FF /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = B2F367C504C7ADC700A80002 /* SDLMain.nib */; };
2D91746F09BA90380026E9FF /* Stella.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2D16A8E106324136005DF364 /* Stella.icns */; }; 2D91746F09BA90380026E9FF /* Stella.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2D16A8E106324136005DF364 /* Stella.icns */; };
2D91747009BA90380026E9FF /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 2D7B4F6C063B513200579B93 /* Credits.html */; }; 2D91747009BA90380026E9FF /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 2D7B4F6C063B513200579B93 /* Credits.html */; };
@ -411,7 +410,6 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
@ -862,7 +860,6 @@
2D16A8E106324136005DF364 /* Stella.icns */, 2D16A8E106324136005DF364 /* Stella.icns */,
2DEFB40B09C3386F00754289 /* Cart.icns */, 2DEFB40B09C3386F00754289 /* Cart.icns */,
2D7B4F6C063B513200579B93 /* Credits.html */, 2D7B4F6C063B513200579B93 /* Credits.html */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
B2F367C504C7ADC700A80002 /* SDLMain.nib */, B2F367C504C7ADC700A80002 /* SDLMain.nib */,
2D1A6CD808513610007CDBA8 /* AboutBox.nib */, 2D1A6CD808513610007CDBA8 /* AboutBox.nib */,
); );
@ -1525,7 +1522,6 @@
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
2D91746D09BA90380026E9FF /* InfoPlist.strings in Resources */,
2D91746E09BA90380026E9FF /* SDLMain.nib in Resources */, 2D91746E09BA90380026E9FF /* SDLMain.nib in Resources */,
2D91746F09BA90380026E9FF /* Stella.icns in Resources */, 2D91746F09BA90380026E9FF /* Stella.icns in Resources */,
2D91747009BA90380026E9FF /* Credits.html in Resources */, 2D91747009BA90380026E9FF /* Credits.html in Resources */,
@ -1729,17 +1725,6 @@
}; };
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
089C165DFE840E0CC02AAC07 /* English */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
2D91751709BA90380026E9FF /* Development */ = { 2D91751709BA90380026E9FF /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;