From 5fb411a3418351f8e1fd6f98850affe3c6ef5828 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 --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40192 --- 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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 SP7DmF^#1{xil=e__yPcrUruQN diff --git a/README.MacOSX b/README.MacOSX index 235cc080c..fbc0d9a28 100644 --- a/README.MacOSX +++ b/README.MacOSX @@ -51,7 +51,7 @@ will want to do the other steps, too. tasks when used on MacOS X Rationale: AM_PATH_SDL copies /usr/local/share/sdl/Info.plist and the folder - /usr/local/share/sdl/SDLMain.nib/ into the directory where configure is invoked. + /usr/local/share/sdl/SDL_main.nib/ into the directory where configure is invoked. This is essential for the configure script to be able to run the test code that detects SDL. @@ -68,10 +68,10 @@ will want to do the other steps, too. APP_NAME.app: EXE_NAME mkdir -p $@/Contents/MacOS mkdir -p $@/Contents/Resources - mkdir -p $@/Contents/Resources/SDLMain.nib + mkdir -p $@/Contents/Resources/SDL_main.nib echo "APPL????" > $@/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 @@ 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