mirror of
https://github.com/yawut/SDL.git
synced 2026-09-09 09:36:14 -05:00
Changed SDLMain to SDL_main for MacOS X stuff
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>NSMainNibFile</key>
|
||||
<string>SDLMain.nib</string>
|
||||
<string>SDL_main.nib</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>NSApplication</string>
|
||||
</dict>
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
# On OS X, install the SDLMain.nib.
|
||||
# On OS X, install the SDL_main.nib.
|
||||
# We use an ugly hack to force the creation of the
|
||||
# destination dir, maybe somebody with more automake
|
||||
# experience knows how to do this properly?
|
||||
|
||||
if TARGET_MACOSX
|
||||
masternibdatadir = $(datadir)/sdl/SDLMain.nib
|
||||
masternibdatadir = $(datadir)/sdl/SDL_main.nib
|
||||
masternibdata_DATA = \
|
||||
SDLMain.nib
|
||||
SDL_main.nib
|
||||
|
||||
nibdatadir = $(datadir)/sdl
|
||||
nibdata_DATA = \
|
||||
SDLMain.nib/classes.nib \
|
||||
SDLMain.nib/info.nib \
|
||||
SDLMain.nib/objects.nib \
|
||||
SDL_main.nib/classes.nib \
|
||||
SDL_main.nib/info.nib \
|
||||
SDL_main.nib/objects.nib \
|
||||
Info.plist
|
||||
endif
|
||||
|
||||
EXTRA_DIST = SDLMain.h SDLMain.m
|
||||
EXTRA_DIST = SDL_main.h SDL_main.m
|
||||
|
||||
# The nib and exports directories need to be copied into place
|
||||
# when building a distribution.
|
||||
dist-hook:
|
||||
(cd $(distdir) && rm -f $(BUILT_SOURCES))
|
||||
cp -rp SDLMain.nib $(distdir)
|
||||
cp -rp SDL_main.nib $(distdir)
|
||||
cp -rp exports $(distdir)
|
||||
(cd $(distdir) && rm -rf `find . -name CVS`)
|
||||
|
||||
4
src/main/macosx/SDLMain.nib/classes.nib
generated
4
src/main/macosx/SDLMain.nib/classes.nib
generated
@@ -3,10 +3,10 @@
|
||||
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
|
||||
{
|
||||
ACTIONS = {makeFullscreen = id; quit = id; };
|
||||
CLASS = SDLMain;
|
||||
CLASS = SDL_main;
|
||||
LANGUAGE = ObjC;
|
||||
SUPERCLASS = NSObject;
|
||||
}
|
||||
);
|
||||
IBVersion = 1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* SDLMain.h - main entry point for our Cocoa-ized SDL app
|
||||
/* SDL_main.h - main entry point for our Cocoa-ized SDL app
|
||||
Darrell Walisser - dwaliss1@purdue.edu
|
||||
|
||||
Feel free to customize this file to suit your needs
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
@interface SDLMain : NSObject
|
||||
@interface SDL_main : NSObject
|
||||
{
|
||||
}
|
||||
- (IBAction)quit:(id)sender;
|
||||
@@ -1,11 +1,11 @@
|
||||
/* SDLMain.m - main entry point for our Cocoa-ized SDL app
|
||||
/* SDL_main.m - main entry point for our Cocoa-ized SDL app
|
||||
Darrell Walisser - dwaliss1@purdue.edu
|
||||
|
||||
Feel free to customize this file to suit your needs
|
||||
*/
|
||||
|
||||
#import "SDL.h"
|
||||
#import "SDLMain.h"
|
||||
#import "SDL_main.h"
|
||||
#import <sys/param.h> /* for MAXPATHLEN */
|
||||
#import <unistd.h>
|
||||
|
||||
@@ -20,7 +20,7 @@ static BOOL gFinderLaunch;
|
||||
|
||||
|
||||
/* The main class of the application, the application's delegate */
|
||||
@implementation SDLMain
|
||||
@implementation SDL_main
|
||||
|
||||
/* Invoked from the Quit menu item */
|
||||
- (void) quit:(id)sender
|
||||
Reference in New Issue
Block a user