pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oops, back out that SDL_main -> SDLMain conversion

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40195
This commit is contained in:
Sam Lantinga 2001-09-23 21:09:08 +00:00
parent 6abb357c70
commit 1e5a9f6ffa
9 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
PBProjects.tar.gz
View file

Binary file not shown.

4
configure.in
View file

@ -2073,8 +2073,8 @@ case "$target" in
CheckMacGL CheckMacGL
CheckPTHREAD CheckPTHREAD
# Set up files for the main() stub # Set up files for the main() stub
COPY_ARCH_SRC(src/main, macosx, SDL_main.m) COPY_ARCH_SRC(src/main, macosx, SDLMain.m)
COPY_ARCH_SRC(src/main, macosx, SDL_main.h) COPY_ARCH_SRC(src/main, macosx, SDLMain.h)
# Set up files for the audio library # Set up files for the audio library
if test x$enable_audio = xyes; then if test x$enable_audio = xyes; then
AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom" AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom"

2
sdl-config.in
View file

@ -57,7 +57,7 @@ while test $# -gt 0; do
@ENABLE_STATIC_TRUE@ echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@ @ENABLE_STATIC_TRUE@ echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@
@ENABLE_STATIC_TRUE@ ;; @ENABLE_STATIC_TRUE@ ;;
@TARGET_MACOSX_TRUE@ --nib) @TARGET_MACOSX_TRUE@ --nib)
@TARGET_MACOSX_TRUE@ echo @datadir@/sdl/SDL_main.nib @TARGET_MACOSX_TRUE@ echo @datadir@/sdl/SDLMain.nib
@TARGET_MACOSX_TRUE@ ;; @TARGET_MACOSX_TRUE@ ;;
@TARGET_MACOSX_TRUE@ --plist) @TARGET_MACOSX_TRUE@ --plist)
@TARGET_MACOSX_TRUE@ echo @datadir@/sdl/Info.plist @TARGET_MACOSX_TRUE@ echo @datadir@/sdl/Info.plist

2
src/main/Makefile.am
View file

@ -16,7 +16,7 @@ ARCH_SUBDIRS = $(srcdir)/beos \
lib_LIBRARIES = libSDLmain.a lib_LIBRARIES = libSDLmain.a
if TARGET_MACOSX if TARGET_MACOSX
MAINLIB_ARCH_SRCS = SDL_main.m SDL_main.h MAINLIB_ARCH_SRCS = SDLMain.m SDLMain.h
else else
MAINLIB_ARCH_SRCS = SDL_main.c MAINLIB_ARCH_SRCS = SDL_main.c
endif endif

2
src/main/macosx/Info.plist.in
View file

@ -17,7 +17,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
<string>SDL_main.nib</string> <string>SDLMain.nib</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
<string>NSApplication</string> <string>NSApplication</string>
</dict> </dict>

16
src/main/macosx/Makefile.am
View file

@ -1,27 +1,27 @@
# On OS X, install the SDL_main.nib. # On OS X, install the SDLMain.nib.
# We use an ugly hack to force the creation of the # We use an ugly hack to force the creation of the
# destination dir, maybe somebody with more automake # destination dir, maybe somebody with more automake
# experience knows how to do this properly? # experience knows how to do this properly?
if TARGET_MACOSX if TARGET_MACOSX
masternibdatadir = $(datadir)/sdl/SDL_main.nib masternibdatadir = $(datadir)/sdl/SDLMain.nib
masternibdata_DATA = \ masternibdata_DATA = \
SDL_main.nib SDLMain.nib
nibdatadir = $(datadir)/sdl nibdatadir = $(datadir)/sdl
nibdata_DATA = \ nibdata_DATA = \
SDL_main.nib/classes.nib \ SDLMain.nib/classes.nib \
SDL_main.nib/info.nib \ SDLMain.nib/info.nib \
SDL_main.nib/objects.nib \ SDLMain.nib/objects.nib \
Info.plist Info.plist
endif endif
EXTRA_DIST = SDL_main.h SDL_main.m EXTRA_DIST = SDLMain.h SDLMain.m
# The nib and exports directories need to be copied into place # The nib and exports directories need to be copied into place
# when building a distribution. # when building a distribution.
dist-hook: dist-hook:
(cd $(distdir) && rm -f $(BUILT_SOURCES)) (cd $(distdir) && rm -f $(BUILT_SOURCES))
cp -rp SDL_main.nib $(distdir) cp -rp SDLMain.nib $(distdir)
cp -rp exports $(distdir) cp -rp exports $(distdir)
(cd $(distdir) && rm -rf `find . -name CVS`) (cd $(distdir) && rm -rf `find . -name CVS`)

4
src/main/macosx/SDL_main.h → src/main/macosx/SDLMain.h
View file

@ -1,4 +1,4 @@
/* SDL_main.h - main entry point for our Cocoa-ized SDL app /* SDLMain.h - main entry point for our Cocoa-ized SDL app
Darrell Walisser - dwaliss1@purdue.edu Darrell Walisser - dwaliss1@purdue.edu
Feel free to customize this file to suit your needs Feel free to customize this file to suit your needs
@ -6,7 +6,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface SDL_main : NSObject @interface SDLMain : NSObject
{ {
} }
- (IBAction)quit:(id)sender; - (IBAction)quit:(id)sender;

6
src/main/macosx/SDL_main.m → src/main/macosx/SDLMain.m
View file

@ -1,11 +1,11 @@
/* SDL_main.m - main entry point for our Cocoa-ized SDL app /* SDLMain.m - main entry point for our Cocoa-ized SDL app
Darrell Walisser - dwaliss1@purdue.edu Darrell Walisser - dwaliss1@purdue.edu
Feel free to customize this file to suit your needs Feel free to customize this file to suit your needs
*/ */
#import "SDL.h" #import "SDL.h"
#import "SDL_main.h" #import "SDLMain.h"
#import <sys/param.h> /* for MAXPATHLEN */ #import <sys/param.h> /* for MAXPATHLEN */
#import <unistd.h> #import <unistd.h>
@ -20,7 +20,7 @@ static BOOL gFinderLaunch;
/* The main class of the application, the application's delegate */ /* The main class of the application, the application's delegate */
@implementation SDL_main @implementation SDLMain
/* Invoked from the Quit menu item */ /* Invoked from the Quit menu item */
- (void) quit:(id)sender - (void) quit:(id)sender

2
src/main/macosx/SDLMain.nib/classes.nib generated
View file

@ -3,7 +3,7 @@
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{ {
ACTIONS = {makeFullscreen = id; quit = id; }; ACTIONS = {makeFullscreen = id; quit = id; };
CLASS = SDL_main; CLASS = SDLMain;
LANGUAGE = ObjC; LANGUAGE = ObjC;
SUPERCLASS = NSObject; SUPERCLASS = NSObject;
} }