Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Oops, back out that SDL_main -> SDLMain conversion
  • Loading branch information
slouken committed Sep 23, 2001
1 parent 3a76e38 commit 67db6af
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
Binary file modified PBProjects.tar.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions configure.in
Expand Up @@ -2073,8 +2073,8 @@ case "$target" in
CheckMacGL
CheckPTHREAD
# Set up files for the main() stub
COPY_ARCH_SRC(src/main, macosx, SDL_main.m)
COPY_ARCH_SRC(src/main, macosx, SDL_main.h)
COPY_ARCH_SRC(src/main, macosx, SDLMain.m)
COPY_ARCH_SRC(src/main, macosx, SDLMain.h)
# Set up files for the audio library
if test x$enable_audio = xyes; then
AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom"
Expand Down
2 changes: 1 addition & 1 deletion sdl-config.in
Expand Up @@ -57,7 +57,7 @@ while test $# -gt 0; do
@ENABLE_STATIC_TRUE@ echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@
@ENABLE_STATIC_TRUE@ ;;
@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@ --plist)
@TARGET_MACOSX_TRUE@ echo @datadir@/sdl/Info.plist
Expand Down
2 changes: 1 addition & 1 deletion src/main/Makefile.am
Expand Up @@ -16,7 +16,7 @@ ARCH_SUBDIRS = $(srcdir)/beos \
lib_LIBRARIES = libSDLmain.a

if TARGET_MACOSX
MAINLIB_ARCH_SRCS = SDL_main.m SDL_main.h
MAINLIB_ARCH_SRCS = SDLMain.m SDLMain.h
else
MAINLIB_ARCH_SRCS = SDL_main.c
endif
Expand Down
2 changes: 1 addition & 1 deletion src/main/macosx/Info.plist.in
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>NSMainNibFile</key>
<string>SDL_main.nib</string>
<string>SDLMain.nib</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
Expand Down
16 changes: 8 additions & 8 deletions src/main/macosx/Makefile.am
@@ -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
# destination dir, maybe somebody with more automake
# experience knows how to do this properly?

if TARGET_MACOSX
masternibdatadir = $(datadir)/sdl/SDL_main.nib
masternibdatadir = $(datadir)/sdl/SDLMain.nib
masternibdata_DATA = \
SDL_main.nib
SDLMain.nib

nibdatadir = $(datadir)/sdl
nibdata_DATA = \
SDL_main.nib/classes.nib \
SDL_main.nib/info.nib \
SDL_main.nib/objects.nib \
SDLMain.nib/classes.nib \
SDLMain.nib/info.nib \
SDLMain.nib/objects.nib \
Info.plist
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
# when building a distribution.
dist-hook:
(cd $(distdir) && rm -f $(BUILT_SOURCES))
cp -rp SDL_main.nib $(distdir)
cp -rp SDLMain.nib $(distdir)
cp -rp exports $(distdir)
(cd $(distdir) && rm -rf `find . -name CVS`)
4 changes: 2 additions & 2 deletions src/main/macosx/SDL_main.h → src/main/macosx/SDLMain.h
@@ -1,12 +1,12 @@
/* 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
Feel free to customize this file to suit your needs
*/

#import <Cocoa/Cocoa.h>

@interface SDL_main : NSObject
@interface SDLMain : NSObject
{
}
- (IBAction)quit:(id)sender;
Expand Down
6 changes: 3 additions & 3 deletions src/main/macosx/SDL_main.m → src/main/macosx/SDLMain.m
@@ -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
Feel free to customize this file to suit your needs
*/

#import "SDL.h"
#import "SDL_main.h"
#import "SDLMain.h"
#import <sys/param.h> /* for MAXPATHLEN */
#import <unistd.h>

Expand All @@ -20,7 +20,7 @@ - (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString;


/* The main class of the application, the application's delegate */
@implementation SDL_main
@implementation SDLMain

/* Invoked from the Quit menu item */
- (void) quit:(id)sender
Expand Down
2 changes: 1 addition & 1 deletion src/main/macosx/SDLMain.nib/classes.nib

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 67db6af

Please sign in to comment.