From 2da0ffb567a9661c96cfef38a61a17a1b586c73f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 23 Sep 2001 20:42:00 +0000 Subject: [PATCH] Changed SDLMain to SDL_main for MacOS X stuff --- PBProjects.tar.gz | Bin 20136 -> 20103 bytes README.MacOSX | 12 ++++++------ configure.in | 7 +++---- sdl-config.in | 2 +- src/main/macosx/Info.plist.in | 2 +- src/main/macosx/Makefile.am | 16 ++++++++-------- src/main/macosx/SDLMain.nib/classes.nib | 4 ++-- src/main/macosx/{SDLMain.h => SDL_main.h} | 4 ++-- src/main/macosx/{SDLMain.m => SDL_main.m} | 6 +++--- 9 files changed, 26 insertions(+), 27 deletions(-) rename src/main/macosx/{SDLMain.h => SDL_main.h} (75%) rename src/main/macosx/{SDLMain.m => SDL_main.m} (97%) diff --git a/PBProjects.tar.gz b/PBProjects.tar.gz index f95c874bb6a00d47c17bf490587c845cf732b42e..60cb8de789122deafe5df60edc46da544f7c8556 100644 GIT binary patch delta 19494 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 delta 19508 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 bU``s7Z%zx7Z%zyhsPz8 $@/Contents/PkgInfo $(INSTALL_DATA) Info.plist $@/Contents/ - $(INSTALL_DATA) SDLMain.nib/*.nib $@/Contents/Resources/ + $(INSTALL_DATA) SDL_main.nib/*.nib $@/Contents/Resources/ $(INSTALL_PROGRAM) $< $@/Contents/MacOS/ You should replace EXE_NAME with the name of the executable. APP_NAME is what @@ -153,13 +153,13 @@ following locations: - Setting up a new project by hand Some of you won't want to use the Stationary so I'll give some tips: * Create a new "Cocoa Application" - * Add src/main/macosx/SDLMain.m , .h and .nib to your project + * Add src/main/macosx/SDL_main.m , .h and .nib to your project * Remove "main.c" from your project * Remove "MainMenu.nib" from your project * Add "$(HOME)/Library/Frameworks/SDL.framework/Headers" to include path * Add "$(HOME)/Library/Frameworks" to the frameworks search path * Add "-framework SDL" to the "OTHER_LDFLAGS" variable - * Set the "Main Nib File" under "Application Settings" to "SDLMain.nib" + * Set the "Main Nib File" under "Application Settings" to "SDL_main.nib" * Add your files * Clean and build @@ -174,7 +174,7 @@ following locations: - Implementation Notes Some things that may be of interest about how it all works... * Working directory - As defined in the SDLMain.m file, the working directory of your SDL app + As defined in the SDL_main.m file, the working directory of your SDL app is by default set to its parent. You may wish to change this to better suit your needs. * You have a Cocoa App! diff --git a/configure.in b/configure.in index b8ef66b62..f6f7d82dd 100644 --- a/configure.in +++ b/configure.in @@ -1379,13 +1379,12 @@ case "$target" in CDROM_DRIVERS="$CDROM_DRIVERS bsdi/libcdrom_bsdi.la" fi # Set up files for the thread library - SDL_LIBS="$SDL_LIBS -lsem" if test x$enable_threads = xyes; then COPY_ARCH_SRC(src/thread, linux, SDL_systhread.c) COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c) COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h) - COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c) + COPY_ARCH_SRC(src/thread, bsdi, SDL_syssem.c) COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c) COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h) @@ -2074,8 +2073,8 @@ case "$target" in CheckMacGL CheckPTHREAD # Set up files for the main() stub - COPY_ARCH_SRC(src/main, macosx, SDLmain.m) - COPY_ARCH_SRC(src/main, macosx, SDLmain.h) + COPY_ARCH_SRC(src/main, macosx, SDL_main.m) + COPY_ARCH_SRC(src/main, macosx, SDL_main.h) # Set up files for the audio library if test x$enable_audio = xyes; then AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom" diff --git a/sdl-config.in b/sdl-config.in index 4b7b2e752..07af154e7 100644 --- a/sdl-config.in +++ b/sdl-config.in @@ -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/SDLMain.nib +@TARGET_MACOSX_TRUE@ echo @datadir@/sdl/SDL_main.nib @TARGET_MACOSX_TRUE@ ;; @TARGET_MACOSX_TRUE@ --plist) @TARGET_MACOSX_TRUE@ echo @datadir@/sdl/Info.plist diff --git a/src/main/macosx/Info.plist.in b/src/main/macosx/Info.plist.in index b3d69abac..8bbd3e818 100644 --- a/src/main/macosx/Info.plist.in +++ b/src/main/macosx/Info.plist.in @@ -17,7 +17,7 @@ CFBundleSignature ???? NSMainNibFile - SDLMain.nib + SDL_main.nib NSPrincipalClass NSApplication diff --git a/src/main/macosx/Makefile.am b/src/main/macosx/Makefile.am index 9d4b55c5c..0e6cf84f3 100644 --- a/src/main/macosx/Makefile.am +++ b/src/main/macosx/Makefile.am @@ -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`) diff --git a/src/main/macosx/SDLMain.nib/classes.nib b/src/main/macosx/SDLMain.nib/classes.nib index 99f175475..3b416c576 100644 --- a/src/main/macosx/SDLMain.nib/classes.nib +++ b/src/main/macosx/SDLMain.nib/classes.nib @@ -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; -} \ No newline at end of file +} diff --git a/src/main/macosx/SDLMain.h b/src/main/macosx/SDL_main.h similarity index 75% rename from src/main/macosx/SDLMain.h rename to src/main/macosx/SDL_main.h index b2a81abbf..0b734b726 100644 --- a/src/main/macosx/SDLMain.h +++ b/src/main/macosx/SDL_main.h @@ -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 -@interface SDLMain : NSObject +@interface SDL_main : NSObject { } - (IBAction)quit:(id)sender; diff --git a/src/main/macosx/SDLMain.m b/src/main/macosx/SDL_main.m similarity index 97% rename from src/main/macosx/SDLMain.m rename to src/main/macosx/SDL_main.m index 42cc8a4ef..9f2ba1536 100644 --- a/src/main/macosx/SDLMain.m +++ b/src/main/macosx/SDL_main.m @@ -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 /* for MAXPATHLEN */ #import @@ -20,7 +20,7 @@ - (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString; /* 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