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

More fixes for OSX building in Snow Leopard. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1888 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2009-10-20 17:42:45 +00:00
parent 795d2f31f4
commit 665d78455f
3 changed files with 14 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/macosx/Info-StellaOSX.plist
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@ -55,7 +55,7 @@
<key>NSMainNibFile</key>
<string>SDLMain.nib</string>
<key>NSPrincipalClass</key>
<string>SDLApplication</string>
<string>NSApplication</string>
<key>«PROJECTNAMEASXML»</key>
<string>SDL Cocoa App</string>
</dict>

69
src/macosx/SDLMain.m
View File

@ -48,8 +48,6 @@ static int gArgc;
static char **gArgv;
static BOOL gFinderLaunch;
static BOOL gCalledAppMainline = FALSE;
//static BOOL started=NO;
//static char startupFile[FILENAME_MAX];
int fileToLoad = FALSE;
char parentdir[MAXPATHLEN];
@ -72,20 +70,6 @@ static NSString *getApplicationName(void)
}
#if 0
// --------------------------------------------------------------------------------
/* Routine to center the application window */
void centerAppWindow(void)
{
[[[SDLApplication sharedApplication] keyWindow] center];
}
/////// FIXME //////////////////////////////
char *appName = "StellaOSX";
#endif
#if SDL_USE_NIB_FILE
// --------------------------------------------------------------------------------
/* A helper category for NSString */
@ -328,25 +312,7 @@ static void CustomApplicationMain (int argc, char **argv)
gArgv[gArgc] = NULL;
return TRUE;
}
/* OLD VERSION
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
{
if (started)
{
char cFilename[FILENAME_MAX];
strncpy(cFilename, [filename cStringUsingEncoding: NSASCIIStringEncoding], FILENAME_MAX-1);
if (strlen(cFilename) > 0)
macOpenConsole(cFilename);
}
else
{
fileToLoad = TRUE;
strncpy(startupFile, [filename cStringUsingEncoding: NSASCIIStringEncoding], FILENAME_MAX-1);
}
return(FALSE);
}
*/
// --------------------------------------------------------------------------------
/* Called when the internal event loop has just started running */
@ -369,33 +335,7 @@ static void CustomApplicationMain (int argc, char **argv)
/* We're done, thank you for playing */
exit(status);
}
/* OLD VERSION
- (void) applicationDidFinishLaunching: (NSNotification *) note
{
int status;
char *args[2];
started = YES;
// Set the main menu to contain the real app name instead of "SDL App"
[self fixMenu:[NSApp mainMenu] withAppName:[[NSProcessInfo processInfo] processName]];
// Hand off to main application code
args[0] = appName;
if (fileToLoad)
{
args[1] = startupFile;
status = stellaMain(2,args);
}
else
{
status = stellaMain(1,args);
}
// We're done, thank you for playing
exit(status);
}
*/
@end
@ -439,6 +379,13 @@ static void CustomApplicationMain (int argc, char **argv)
@end
// --------------------------------------------------------------------------------
/* Routine to center the application window */
void centerAppWindow(void)
{
[[[NSApplication sharedApplication] keyWindow] center];
}
#ifdef main
# undef main

10
src/macosx/stella.xcodeproj/project.pbxproj
View File

@ -268,7 +268,6 @@
DC173F770E2CAC1E00320F94 /* ContextMenu.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC173F750E2CAC1E00320F94 /* ContextMenu.hxx */; };
DC1FC18A0DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC1FC1880DB3B2C7009B3DF7 /* SerialPortMACOSX.cxx */; };
DC1FC18B0DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC1FC1890DB3B2C7009B3DF7 /* SerialPortMACOSX.hxx */; };
DC419D82108E10A3006E8687 /* Info-StellaOSX.plist in Resources */ = {isa = PBXBuildFile; fileRef = DC419D81108E10A3006E8687 /* Info-StellaOSX.plist */; };
DC4613670D92C03600D8DAB9 /* RomAuditDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC4613650D92C03600D8DAB9 /* RomAuditDialog.cxx */; };
DC4613680D92C03600D8DAB9 /* RomAuditDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC4613660D92C03600D8DAB9 /* RomAuditDialog.hxx */; };
DC47455509C34BFA00EDDA3A /* BankRomCheat.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC47454A09C34BFA00EDDA3A /* BankRomCheat.cxx */; };
@ -776,12 +775,12 @@
29B97314FDCFA39411CA2CEA /* «PROJECTNAMEASXML» */ = {
isa = PBXGroup;
children = (
DC419D81108E10A3006E8687 /* Info-StellaOSX.plist */,
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
DC419D81108E10A3006E8687 /* Info-StellaOSX.plist */,
);
name = "«PROJECTNAMEASXML»";
sourceTree = "<group>";
@ -1435,7 +1434,6 @@
2D91747109BA90380026E9FF /* ../../docs in Resources */,
2D91747209BA90380026E9FF /* AboutBox.nib in Resources */,
2DEFB40C09C3386F00754289 /* Cart.icns in Resources */,
DC419D82108E10A3006E8687 /* Info-StellaOSX.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1677,7 +1675,7 @@
../gui,
.,
);
INFOPLIST_FILE = "Info-StellaOSX__Upgraded_.plist";
INFOPLIST_FILE = "Info-StellaOSX.plist";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "$(LIBRARY_SEARCH_PATHS)";
OTHER_CFLAGS = "";
@ -1734,7 +1732,7 @@
../gui,
.,
);
INFOPLIST_FILE = "Info-StellaOSX__Upgraded_.plist";
INFOPLIST_FILE = "Info-StellaOSX.plist";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "$(LIBRARY_SEARCH_PATHS)";
OTHER_CFLAGS = "";
@ -1790,7 +1788,7 @@
../gui,
.,
);
INFOPLIST_FILE = "Info-StellaOSX__Upgraded_.plist";
INFOPLIST_FILE = "Info-StellaOSX.plist";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = .;
OTHER_CFLAGS = "";