comparison src/main/Makefile.am @ 1133:609c060fd2a2

The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails: To: SDL Developers <sdl@libsdl.org> From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se> Date: Mon, 30 May 2005 23:29:04 +0200 Subject: [SDL] Mac OS X Video Drivers [patch] I've updated/added the Carbon and X11 video drivers to the Mac OS X port of SDL 1.2 (the CVS version), and made the Cocoa driver and runtime *optional*. The default is still Cocoa, and the "Quartz" driver. But you can now also use "toolbox" for Carbon, and "x11" for running with Apple's (or other) X11 server: export SDL_VIDEODRIVER=x11 export SDL_VIDEO_GL_DRIVER=/usr/X11R6/lib/libGL.dylib It also checks if the frameworks are available, by a: #include <Carbon/Carbon.h> or #import <Cocoa/Cocoa.h> (this should make it configure on plain Darwin as well?) Here are the new configure targets: --enable-video-cocoa use Cocoa/Quartz video driver default=yes --enable-video-carbon use Carbon/QuickDraw video driver default=yes --enable-video-x11 use X11 video driver default=no ./configure --enable-video-cocoa --enable-video-carbon --enable-video-x11 \ --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib The Carbon version is just an updated version of the old SDL driver for Mac OS 9, and could probably be improved... (but it does work, including the Carbon version of SDLmain) If you disable cocoa, you can run with -framework Carbon only, and the C version of SDL_main.c. And if you disable carbon too, you can still use the X11 version which doesn't require SDLmain. I updated the DrawSprocket version, but did not include it. (no blitters or VRAM GWorlds etc. available on OS X anyway) Besides for Mac OS 9, I don't think there's any use for it ? And note that any performance on Mac OS X equals OpenGL anyway... You can get "fair" software SDL results on captured CG displays, but for decent frame rates you need to be using GL for rendering. Finally, here is the patch itself: http://www.algonet.se/~afb/SDL-12CVS-macvideo.patch --anders PS. It says "video", but as usual it applies to mouse/keyboard too. ------ To: A list for developers using the SDL library <sdl@libsdl.org> From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se> Date: Sun, 4 Sep 2005 10:02:15 +0200 Subject: [SDL] Updated Mac patch Updated the previous Mac patch to disable Carbon by default. Also "fixed" the SDL.spec again, so that it builds on Darwin. http://www.algonet.se/~afb/SDL-1.2.9-mac.patch Also applied fine to SDL12 CVS, when I tried it.
author Ryan C. Gordon <icculus@icculus.org>
date Thu, 08 Sep 2005 06:16:14 +0000
parents d315a411d5b2
children 19418e4422cb
comparison
equal deleted inserted replaced
1132:a0d3514c04b2 1133:609c060fd2a2
17 17
18 if TARGET_WIN32 18 if TARGET_WIN32
19 MAINLIB_ARCH_SRCS = win32/SDL_win32_main.c 19 MAINLIB_ARCH_SRCS = win32/SDL_win32_main.c
20 else 20 else
21 if TARGET_MACOSX 21 if TARGET_MACOSX
22 if USE_COCOA
22 MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h 23 MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h
24 else
25 if USE_CARBON
26 MAINLIB_ARCH_SRCS = macos/SDL_main.c
27 endif # USE_CARBON
28 endif # USE_COCOA
23 else 29 else
24 if TARGET_QTOPIA 30 if TARGET_QTOPIA
25 MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc 31 MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc
26 else 32 else
27 MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c 33 MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c