Synced with trunk. gsoc2008_force_feedback
authorEdgar Simo <bobbens@gmail.com>
Sun, 20 Jul 2008 21:34:04 +0000
branchgsoc2008_force_feedback
changeset 2540 56cf872c723a
parent 2539 b4c41a7eea04
child 2541 f2649eaa552e
Synced with trunk.
README.SVN
Xcode/SDL/SDL.xcodeproj/project.pbxproj
Xcode/SDLTest/Info-testwm2.plist
Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
include/SDL_config_macosx.h
src/video/SDL_sysvideo.h
src/video/SDL_video.c
src/video/cocoa/SDL_cocoaopengl.m
--- a/README.SVN	Sun Jul 20 16:21:15 2008 +0000
+++ b/README.SVN	Sun Jul 20 21:34:04 2008 +0000
@@ -18,3 +18,6 @@
 There is a web interface to the subversion repository at:
 	http://www.libsdl.org/cgi/viewvc.cgi
 
+There is an RSS feed available at that URL, for those that want to
+track commits in real time.
+
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Sun Jul 20 16:21:15 2008 +0000
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Sun Jul 20 21:34:04 2008 +0000
@@ -7,53 +7,21 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0014B7EF09C0D8D2003A99D5 /* SDL_dgaevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B7E909C0D8D2003A99D5 /* SDL_dgaevents.c */; };
-		0014B7F109C0D8D2003A99D5 /* SDL_dgamouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B7EB09C0D8D2003A99D5 /* SDL_dgamouse.c */; };
-		0014B7F209C0D8D2003A99D5 /* SDL_dgavideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B7EC09C0D8D2003A99D5 /* SDL_dgavideo.c */; };
-		0014B7F409C0D8D2003A99D5 /* SDL_dgaevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B7E809C0D8D2003A99D5 /* SDL_dgaevents_c.h */; };
-		0014B7F509C0D8D2003A99D5 /* SDL_dgaevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B7E909C0D8D2003A99D5 /* SDL_dgaevents.c */; };
-		0014B7F609C0D8D2003A99D5 /* SDL_dgamouse_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B7EA09C0D8D2003A99D5 /* SDL_dgamouse_c.h */; };
-		0014B7F709C0D8D2003A99D5 /* SDL_dgamouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B7EB09C0D8D2003A99D5 /* SDL_dgamouse.c */; };
-		0014B7F809C0D8D2003A99D5 /* SDL_dgavideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B7EC09C0D8D2003A99D5 /* SDL_dgavideo.c */; };
-		0014B7F909C0D8D2003A99D5 /* SDL_dgavideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B7ED09C0D8D2003A99D5 /* SDL_dgavideo.h */; };
-		0014B84F09C0D977003A99D5 /* SDL_x11dga.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B83809C0D977003A99D5 /* SDL_x11dga.c */; };
 		0014B85009C0D977003A99D5 /* SDL_x11dyn.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B83909C0D977003A99D5 /* SDL_x11dyn.c */; };
 		0014B85309C0D977003A99D5 /* SDL_x11events.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B83C09C0D977003A99D5 /* SDL_x11events.c */; };
 		0014B85509C0D977003A99D5 /* SDL_x11gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B83E09C0D977003A99D5 /* SDL_x11gamma.c */; };
-		0014B85709C0D977003A99D5 /* SDL_x11gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84009C0D977003A99D5 /* SDL_x11gl.c */; };
-		0014B85909C0D977003A99D5 /* SDL_x11image.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84209C0D977003A99D5 /* SDL_x11image.c */; };
 		0014B85B09C0D977003A99D5 /* SDL_x11modes.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84409C0D977003A99D5 /* SDL_x11modes.c */; };
 		0014B85D09C0D977003A99D5 /* SDL_x11mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84609C0D977003A99D5 /* SDL_x11mouse.c */; };
 		0014B85F09C0D977003A99D5 /* SDL_x11video.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84809C0D977003A99D5 /* SDL_x11video.c */; };
-		0014B86209C0D977003A99D5 /* SDL_x11wm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84B09C0D977003A99D5 /* SDL_x11wm.c */; };
-		0014B86409C0D977003A99D5 /* SDL_x11yuv.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84D09C0D977003A99D5 /* SDL_x11yuv.c */; };
-		0014B86509C0D977003A99D5 /* SDL_x11dga_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B83709C0D977003A99D5 /* SDL_x11dga_c.h */; };
-		0014B86609C0D977003A99D5 /* SDL_x11dga.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B83809C0D977003A99D5 /* SDL_x11dga.c */; };
 		0014B86709C0D977003A99D5 /* SDL_x11dyn.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B83909C0D977003A99D5 /* SDL_x11dyn.c */; };
 		0014B86809C0D977003A99D5 /* SDL_x11dyn.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B83A09C0D977003A99D5 /* SDL_x11dyn.h */; };
-		0014B86909C0D977003A99D5 /* SDL_x11events_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B83B09C0D977003A99D5 /* SDL_x11events_c.h */; };
 		0014B86A09C0D977003A99D5 /* SDL_x11events.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B83C09C0D977003A99D5 /* SDL_x11events.c */; };
-		0014B86B09C0D977003A99D5 /* SDL_x11gamma_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B83D09C0D977003A99D5 /* SDL_x11gamma_c.h */; };
 		0014B86C09C0D977003A99D5 /* SDL_x11gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B83E09C0D977003A99D5 /* SDL_x11gamma.c */; };
-		0014B86D09C0D977003A99D5 /* SDL_x11gl_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B83F09C0D977003A99D5 /* SDL_x11gl_c.h */; };
-		0014B86E09C0D977003A99D5 /* SDL_x11gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84009C0D977003A99D5 /* SDL_x11gl.c */; };
-		0014B86F09C0D977003A99D5 /* SDL_x11image_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B84109C0D977003A99D5 /* SDL_x11image_c.h */; };
-		0014B87009C0D977003A99D5 /* SDL_x11image.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84209C0D977003A99D5 /* SDL_x11image.c */; };
-		0014B87109C0D977003A99D5 /* SDL_x11modes_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B84309C0D977003A99D5 /* SDL_x11modes_c.h */; };
 		0014B87209C0D977003A99D5 /* SDL_x11modes.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84409C0D977003A99D5 /* SDL_x11modes.c */; };
-		0014B87309C0D977003A99D5 /* SDL_x11mouse_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B84509C0D977003A99D5 /* SDL_x11mouse_c.h */; };
 		0014B87409C0D977003A99D5 /* SDL_x11mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84609C0D977003A99D5 /* SDL_x11mouse.c */; };
 		0014B87509C0D977003A99D5 /* SDL_x11sym.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B84709C0D977003A99D5 /* SDL_x11sym.h */; };
 		0014B87609C0D977003A99D5 /* SDL_x11video.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84809C0D977003A99D5 /* SDL_x11video.c */; };
 		0014B87709C0D977003A99D5 /* SDL_x11video.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B84909C0D977003A99D5 /* SDL_x11video.h */; };
-		0014B87809C0D977003A99D5 /* SDL_x11wm_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B84A09C0D977003A99D5 /* SDL_x11wm_c.h */; };
-		0014B87909C0D977003A99D5 /* SDL_x11wm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84B09C0D977003A99D5 /* SDL_x11wm.c */; };
-		0014B87A09C0D977003A99D5 /* SDL_x11yuv_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B84C09C0D977003A99D5 /* SDL_x11yuv_c.h */; };
-		0014B87B09C0D977003A99D5 /* SDL_x11yuv.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B84D09C0D977003A99D5 /* SDL_x11yuv.c */; };
-		0014B89209C0DA94003A99D5 /* XF86DGA.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B89009C0DA94003A99D5 /* XF86DGA.c */; };
-		0014B89309C0DA94003A99D5 /* XF86DGA2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B89109C0DA94003A99D5 /* XF86DGA2.c */; };
-		0014B89409C0DA94003A99D5 /* XF86DGA.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B89009C0DA94003A99D5 /* XF86DGA.c */; };
-		0014B89509C0DA94003A99D5 /* XF86DGA2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B89109C0DA94003A99D5 /* XF86DGA2.c */; };
 		0014B89709C0DAA1003A99D5 /* XF86VMode.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B89609C0DAA1003A99D5 /* XF86VMode.c */; };
 		0014B89809C0DAA1003A99D5 /* XF86VMode.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B89609C0DAA1003A99D5 /* XF86VMode.c */; };
 		0014B89B09C0DAAE003A99D5 /* Xv.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B89909C0DAAE003A99D5 /* Xv.c */; };
@@ -63,27 +31,19 @@
 		0014B8A109C0DAB9003A99D5 /* Xinerama.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B89F09C0DAB9003A99D5 /* Xinerama.c */; };
 		0014B8A309C0DAC4003A99D5 /* xme.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B8A209C0DAC4003A99D5 /* xme.c */; };
 		0014B8A409C0DAC4003A99D5 /* xme.c in Sources */ = {isa = PBXBuildFile; fileRef = 0014B8A209C0DAC4003A99D5 /* xme.c */; };
-		0014B91B09C0E585003A99D5 /* SDL_config_amiga.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3109BD1FA80037C8D0 /* SDL_config_amiga.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0014B91C09C0E585003A99D5 /* SDL_config_dreamcast.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3209BD1FA90037C8D0 /* SDL_config_dreamcast.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0014B91D09C0E585003A99D5 /* SDL_config_macos.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3309BD1FA90037C8D0 /* SDL_config_macos.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B91E09C0E585003A99D5 /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3409BD1FA90037C8D0 /* SDL_config_macosx.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0014B91F09C0E585003A99D5 /* SDL_config_os2.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3509BD1FA90037C8D0 /* SDL_config_os2.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0014B92009C0E585003A99D5 /* SDL_config_win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3609BD1FA90037C8D0 /* SDL_config_win32.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92109C0E585003A99D5 /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3709BD1FA90037C8D0 /* SDL_config.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92209C0E585003A99D5 /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3809BD1FA90037C8D0 /* SDL_platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92309C0E585003A99D5 /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3909BD1FA90037C8D0 /* SDL_stdinc.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92409C0E585003A99D5 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E501191D2B7F000001 /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92509C0E585003A99D5 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E601191D2B7F000001 /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0014B92609C0E585003A99D5 /* SDL_active.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E701191D2B7F000001 /* SDL_active.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92709C0E585003A99D5 /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E801191D2B7F000001 /* SDL_audio.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0014B92809C0E585003A99D5 /* SDL_byteorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E901191D2B7F000001 /* SDL_byteorder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92909C0E585003A99D5 /* SDL_cdrom.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EA01191D2B7F000001 /* SDL_cdrom.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92A09C0E585003A99D5 /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EB01191D2B7F000001 /* SDL_copying.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92B09C0E585003A99D5 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92C09C0E585003A99D5 /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EC01191D2B7F000001 /* SDL_endian.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92D09C0E585003A99D5 /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5ED01191D2B7F000001 /* SDL_error.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B92E09C0E585003A99D5 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EE01191D2B7F000001 /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0014B92F09C0E585003A99D5 /* SDL_getenv.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EF01191D2B7F000001 /* SDL_getenv.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B93009C0E585003A99D5 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F001191D2B7F000001 /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B93109C0E585003A99D5 /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B93209C0E585003A99D5 /* SDL_keysym.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F201191D2B7F000001 /* SDL_keysym.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -102,20 +62,16 @@
 		0014B93F09C0E585003A99D5 /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5FD01191D2B7F000001 /* SDL_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B94009C0E585003A99D5 /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5FE01191D2B7F000001 /* SDL_video.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0014B94109C0E585003A99D5 /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5FF01191D2B7F000001 /* SDL.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0014B94309C0E585003A99D5 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF2F0086C3A07F000001 /* SDLMain.nib */; };
 		0014B94509C0E585003A99D5 /* SDL_romaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153832E006D78D67F000001 /* SDL_romaudio.c */; };
 		0014B94609C0E585003A99D5 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538330006D78D67F000001 /* SDL_audio.c */; };
 		0014B94709C0E585003A99D5 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538331006D78D67F000001 /* SDL_audiocvt.c */; };
 		0014B94809C0E585003A99D5 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538332006D78D67F000001 /* SDL_audiodev.c */; };
 		0014B94909C0E585003A99D5 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538334006D78D67F000001 /* SDL_mixer.c */; };
 		0014B94A09C0E585003A99D5 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538335006D78D67F000001 /* SDL_wave.c */; };
-		0014B94B09C0E585003A99D5 /* SDL_active.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538368006D79147F000001 /* SDL_active.c */; };
 		0014B94C09C0E585003A99D5 /* SDL_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538369006D79147F000001 /* SDL_events.c */; };
-		0014B94D09C0E585003A99D5 /* SDL_expose.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836A006D79147F000001 /* SDL_expose.c */; };
 		0014B94E09C0E585003A99D5 /* SDL_keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836B006D79147F000001 /* SDL_keyboard.c */; };
 		0014B94F09C0E585003A99D5 /* SDL_mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836C006D79147F000001 /* SDL_mouse.c */; };
 		0014B95009C0E585003A99D5 /* SDL_quit.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836D006D79147F000001 /* SDL_quit.c */; };
-		0014B95109C0E585003A99D5 /* SDL_resize.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836E006D79147F000001 /* SDL_resize.c */; };
 		0014B95209C0E585003A99D5 /* SDL_rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538377006D79307F000001 /* SDL_rwops.c */; };
 		0014B95309C0E585003A99D5 /* SDL_timer.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383A0006D79BC7F000001 /* SDL_timer.c */; };
 		0014B95409C0E585003A99D5 /* SDL_blit.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383D8006D7A567F000001 /* SDL_blit.c */; };
@@ -124,13 +80,11 @@
 		0014B95709C0E585003A99D5 /* SDL_blit_A.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DC006D7A567F000001 /* SDL_blit_A.c */; };
 		0014B95809C0E585003A99D5 /* SDL_blit_N.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DE006D7A567F000001 /* SDL_blit_N.c */; };
 		0014B95909C0E585003A99D5 /* SDL_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DF006D7A567F000001 /* SDL_bmp.c */; };
-		0014B95A09C0E585003A99D5 /* SDL_cursor.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E0006D7A567F000001 /* SDL_cursor.c */; };
 		0014B95B09C0E585003A99D5 /* SDL_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E2006D7A567F000001 /* SDL_gamma.c */; };
 		0014B95C09C0E585003A99D5 /* SDL_pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E6006D7A567F000001 /* SDL_pixels.c */; };
 		0014B95D09C0E585003A99D5 /* SDL_RLEaccel.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E8006D7A567F000001 /* SDL_RLEaccel.c */; };
 		0014B95E09C0E585003A99D5 /* SDL_surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EC006D7A567F000001 /* SDL_surface.c */; };
 		0014B95F09C0E585003A99D5 /* SDL_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EE006D7A567F000001 /* SDL_video.c */; };
-		0014B96009C0E585003A99D5 /* SDL_yuv.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EF006D7A567F000001 /* SDL_yuv.c */; };
 		0014B96109C0E585003A99D5 /* SDL_yuv_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383F1006D7A567F000001 /* SDL_yuv_sw.c */; };
 		0014B96209C0E585003A99D5 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538438006D7D947F000001 /* SDL_error.c */; };
 		0014B96309C0E585003A99D5 /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538439006D7D947F000001 /* SDL_fatal.c */; };
@@ -140,12 +94,6 @@
 		0014B96709C0E585003A99D5 /* SDL_joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E489D006D88D97F000001 /* SDL_joystick.c */; };
 		0014B96809C0E585003A99D5 /* SDL_stretch.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EA006D7A567F000001 /* SDL_stretch.c */; };
 		0014B96909C0E585003A99D5 /* SDL_sysjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = F51789D101769A2401D3D55B /* SDL_sysjoystick.c */; };
-		0014B96A09C0E585003A99D5 /* SDL_QuartzEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4D705A88AD0006B9F1C /* SDL_QuartzEvents.m */; };
-		0014B96B09C0E585003A99D5 /* SDL_QuartzGL.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4D805A88AD0006B9F1C /* SDL_QuartzGL.m */; };
-		0014B96C09C0E585003A99D5 /* SDL_QuartzVideo.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DB05A88AD0006B9F1C /* SDL_QuartzVideo.m */; };
-		0014B96D09C0E585003A99D5 /* SDL_QuartzWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DD05A88AD0006B9F1C /* SDL_QuartzWindow.m */; };
-		0014B96E09C0E585003A99D5 /* SDL_QuartzWM.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DE05A88AD0006B9F1C /* SDL_QuartzWM.m */; };
-		0014B96F09C0E585003A99D5 /* SDL_QuartzYUV.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DF05A88AD0006B9F1C /* SDL_QuartzYUV.m */; };
 		0014B97009C0E585003A99D5 /* SDL_cpuinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = B24DA50405A88D52006B9F1C /* SDL_cpuinfo.c */; };
 		0014B97109C0E585003A99D5 /* SDL_syscdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = B2A23A7B04157C5700A80002 /* SDL_syscdrom.c */; };
 		0014B97209C0E585003A99D5 /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = BECDF5D50761B759005FE872 /* SDL_coreaudio.c */; };
@@ -165,7 +113,6 @@
 		0014B98009C0E585003A99D5 /* SDL_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162D6909BD214F0037C8D0 /* SDL_string.c */; };
 		0014B98109C0E585003A99D5 /* SDL_mixer_MMX.c in Sources */ = {isa = PBXBuildFile; fileRef = 00B7E61F097F2D9E00826121 /* SDL_mixer_MMX.c */; };
 		0014B98309C0E585003A99D5 /* SDL_nullevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3409BE27FB0037C8D0 /* SDL_nullevents.c */; };
-		0014B98409C0E585003A99D5 /* SDL_nullmouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3609BE27FB0037C8D0 /* SDL_nullmouse.c */; };
 		0014B98509C0E585003A99D5 /* SDL_nullvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3809BE27FB0037C8D0 /* SDL_nullvideo.c */; };
 		0014B99B09C0E585003A99D5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; };
 		0014B99C09C0E585003A99D5 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; };
@@ -175,12 +122,7 @@
 		0014B9A009C0E585003A99D5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A00858DECD00B2BC32 /* OpenGL.framework */; };
 		0014B9A109C0E585003A99D5 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A10858DECD00B2BC32 /* QuickTime.framework */; };
 		0014B9A209C0E585003A99D5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; };
-		00162D4309BD1FA90037C8D0 /* SDL_config_amiga.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3109BD1FA80037C8D0 /* SDL_config_amiga.h */; };
-		00162D4409BD1FA90037C8D0 /* SDL_config_dreamcast.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3209BD1FA90037C8D0 /* SDL_config_dreamcast.h */; };
-		00162D4509BD1FA90037C8D0 /* SDL_config_macos.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3309BD1FA90037C8D0 /* SDL_config_macos.h */; };
 		00162D4609BD1FA90037C8D0 /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3409BD1FA90037C8D0 /* SDL_config_macosx.h */; };
-		00162D4709BD1FA90037C8D0 /* SDL_config_os2.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3509BD1FA90037C8D0 /* SDL_config_os2.h */; };
-		00162D4809BD1FA90037C8D0 /* SDL_config_win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3609BD1FA90037C8D0 /* SDL_config_win32.h */; };
 		00162D4909BD1FA90037C8D0 /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3709BD1FA90037C8D0 /* SDL_config.h */; };
 		00162D4A09BD1FA90037C8D0 /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3809BD1FA90037C8D0 /* SDL_platform.h */; };
 		00162D4B09BD1FA90037C8D0 /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3909BD1FA90037C8D0 /* SDL_stdinc.h */; };
@@ -206,27 +148,19 @@
 		00162D7209BD214F0037C8D0 /* SDL_qsort.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162D6709BD214F0037C8D0 /* SDL_qsort.c */; };
 		00162D7309BD214F0037C8D0 /* SDL_stdlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162D6809BD214F0037C8D0 /* SDL_stdlib.c */; };
 		00162D7409BD214F0037C8D0 /* SDL_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162D6909BD214F0037C8D0 /* SDL_string.c */; };
-		00162DA309BD222F0037C8D0 /* SDL_config_amiga.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3109BD1FA80037C8D0 /* SDL_config_amiga.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		00162DA409BD222F0037C8D0 /* SDL_config_dreamcast.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3209BD1FA90037C8D0 /* SDL_config_dreamcast.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		00162DA509BD222F0037C8D0 /* SDL_config_macos.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3309BD1FA90037C8D0 /* SDL_config_macos.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DA609BD222F0037C8D0 /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3409BD1FA90037C8D0 /* SDL_config_macosx.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		00162DA709BD222F0037C8D0 /* SDL_config_os2.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3509BD1FA90037C8D0 /* SDL_config_os2.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		00162DA809BD222F0037C8D0 /* SDL_config_win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3609BD1FA90037C8D0 /* SDL_config_win32.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DA909BD222F0037C8D0 /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3709BD1FA90037C8D0 /* SDL_config.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DAA09BD222F0037C8D0 /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3809BD1FA90037C8D0 /* SDL_platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DAB09BD222F0037C8D0 /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3909BD1FA90037C8D0 /* SDL_stdinc.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DAC09BD222F0037C8D0 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E501191D2B7F000001 /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DAD09BD222F0037C8D0 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E601191D2B7F000001 /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		00162DAE09BD222F0037C8D0 /* SDL_active.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E701191D2B7F000001 /* SDL_active.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DAF09BD222F0037C8D0 /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E801191D2B7F000001 /* SDL_audio.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		00162DB009BD222F0037C8D0 /* SDL_byteorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5E901191D2B7F000001 /* SDL_byteorder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB109BD222F0037C8D0 /* SDL_cdrom.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EA01191D2B7F000001 /* SDL_cdrom.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB209BD222F0037C8D0 /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EB01191D2B7F000001 /* SDL_copying.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB309BD222F0037C8D0 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB409BD222F0037C8D0 /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EC01191D2B7F000001 /* SDL_endian.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB509BD222F0037C8D0 /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5ED01191D2B7F000001 /* SDL_error.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB609BD222F0037C8D0 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EE01191D2B7F000001 /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		00162DB709BD222F0037C8D0 /* SDL_getenv.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5EF01191D2B7F000001 /* SDL_getenv.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB809BD222F0037C8D0 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F001191D2B7F000001 /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DB909BD222F0037C8D0 /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		00162DBA09BD222F0037C8D0 /* SDL_keysym.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF5F201191D2B7F000001 /* SDL_keysym.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -249,28 +183,16 @@
 		00162E6A09BD27360037C8D0 /* SDL_mixer_MMX.c in Sources */ = {isa = PBXBuildFile; fileRef = 00B7E61F097F2D9E00826121 /* SDL_mixer_MMX.c */; };
 		00162E6B09BD27370037C8D0 /* SDL_mixer_MMX.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B7E620097F2D9E00826121 /* SDL_mixer_MMX.h */; };
 		00162F3B09BE27FB0037C8D0 /* SDL_nullevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3409BE27FB0037C8D0 /* SDL_nullevents.c */; };
-		00162F3D09BE27FB0037C8D0 /* SDL_nullmouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3609BE27FB0037C8D0 /* SDL_nullmouse.c */; };
 		00162F3F09BE27FB0037C8D0 /* SDL_nullvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3809BE27FB0037C8D0 /* SDL_nullvideo.c */; };
 		00162F4109BE27FB0037C8D0 /* SDL_nullevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3409BE27FB0037C8D0 /* SDL_nullevents.c */; };
 		00162F4209BE27FB0037C8D0 /* SDL_nullevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3509BE27FB0037C8D0 /* SDL_nullevents_c.h */; };
-		00162F4309BE27FB0037C8D0 /* SDL_nullmouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3609BE27FB0037C8D0 /* SDL_nullmouse.c */; };
-		00162F4409BE27FB0037C8D0 /* SDL_nullmouse_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3709BE27FB0037C8D0 /* SDL_nullmouse_c.h */; };
 		00162F4509BE27FB0037C8D0 /* SDL_nullvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3809BE27FB0037C8D0 /* SDL_nullvideo.c */; };
 		00162F4609BE27FB0037C8D0 /* SDL_nullvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3909BE27FB0037C8D0 /* SDL_nullvideo.h */; };
-		002F31EB09CA02D800EBEB88 /* CGS.h in Headers */ = {isa = PBXBuildFile; fileRef = B24DA4D605A88AD0006B9F1C /* CGS.h */; };
-		002F31EC09CA02D800EBEB88 /* SDL_QuartzKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = B24DA4D905A88AD0006B9F1C /* SDL_QuartzKeys.h */; };
-		002F31ED09CA02D800EBEB88 /* SDL_QuartzVideo.h in Headers */ = {isa = PBXBuildFile; fileRef = B24DA4DA05A88AD0006B9F1C /* SDL_QuartzVideo.h */; };
-		002F31EE09CA02D800EBEB88 /* SDL_QuartzWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = B24DA4DC05A88AD0006B9F1C /* SDL_QuartzWindow.h */; };
 		002F31EF09CA02D800EBEB88 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */; };
 		002F31F009CA02D800EBEB88 /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC705C4450500E5DC7F /* SDL_name.h */; };
 		002F31F109CA02D800EBEB88 /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = BECDF5D60761B759005FE872 /* SDL_coreaudio.h */; };
 		002F31F209CA02D800EBEB88 /* SDLOSXCAGuard.h in Headers */ = {isa = PBXBuildFile; fileRef = 004C2C8A0975E13300E9D430 /* SDLOSXCAGuard.h */; };
-		002F31F309CA02D800EBEB88 /* SDL_config_amiga.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3109BD1FA80037C8D0 /* SDL_config_amiga.h */; };
-		002F31F409CA02D800EBEB88 /* SDL_config_dreamcast.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3209BD1FA90037C8D0 /* SDL_config_dreamcast.h */; };
-		002F31F509CA02D800EBEB88 /* SDL_config_macos.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3309BD1FA90037C8D0 /* SDL_config_macos.h */; };
 		002F31F609CA02D800EBEB88 /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3409BD1FA90037C8D0 /* SDL_config_macosx.h */; };
-		002F31F709CA02D800EBEB88 /* SDL_config_os2.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3509BD1FA90037C8D0 /* SDL_config_os2.h */; };
-		002F31F809CA02D800EBEB88 /* SDL_config_win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3609BD1FA90037C8D0 /* SDL_config_win32.h */; };
 		002F31F909CA02D800EBEB88 /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3709BD1FA90037C8D0 /* SDL_config.h */; };
 		002F31FA09CA02D800EBEB88 /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3809BD1FA90037C8D0 /* SDL_platform.h */; };
 		002F31FB09CA02D800EBEB88 /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D3909BD1FA90037C8D0 /* SDL_stdinc.h */; };
@@ -278,7 +200,6 @@
 		002F31FD09CA02D800EBEB88 /* SDL_systhread_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162D5209BD20DA0037C8D0 /* SDL_systhread_c.h */; };
 		002F31FE09CA02D800EBEB88 /* SDL_mixer_MMX.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B7E620097F2D9E00826121 /* SDL_mixer_MMX.h */; };
 		002F31FF09CA02D800EBEB88 /* SDL_nullevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3509BE27FB0037C8D0 /* SDL_nullevents_c.h */; };
-		002F320009CA02D800EBEB88 /* SDL_nullmouse_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3709BE27FB0037C8D0 /* SDL_nullmouse_c.h */; };
 		002F320109CA02D800EBEB88 /* SDL_nullvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3909BE27FB0037C8D0 /* SDL_nullvideo.h */; };
 		002F321309CA02D800EBEB88 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538330006D78D67F000001 /* SDL_audio.c */; };
 		002F321409CA02D800EBEB88 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538331006D78D67F000001 /* SDL_audiocvt.c */; };
@@ -287,13 +208,10 @@
 		002F321709CA02D800EBEB88 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538335006D78D67F000001 /* SDL_wave.c */; };
 		002F321809CA02D800EBEB88 /* SDL_romaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153832E006D78D67F000001 /* SDL_romaudio.c */; };
 		002F321909CA02D800EBEB88 /* SDL_cdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4895006D86FF7F000001 /* SDL_cdrom.c */; };
-		002F321A09CA02D800EBEB88 /* SDL_active.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538368006D79147F000001 /* SDL_active.c */; };
 		002F321B09CA02D800EBEB88 /* SDL_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538369006D79147F000001 /* SDL_events.c */; };
-		002F321C09CA02D800EBEB88 /* SDL_expose.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836A006D79147F000001 /* SDL_expose.c */; };
 		002F321D09CA02D800EBEB88 /* SDL_keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836B006D79147F000001 /* SDL_keyboard.c */; };
 		002F321E09CA02D800EBEB88 /* SDL_mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836C006D79147F000001 /* SDL_mouse.c */; };
 		002F321F09CA02D800EBEB88 /* SDL_quit.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836D006D79147F000001 /* SDL_quit.c */; };
-		002F322009CA02D800EBEB88 /* SDL_resize.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836E006D79147F000001 /* SDL_resize.c */; };
 		002F322109CA02D800EBEB88 /* SDL_rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538377006D79307F000001 /* SDL_rwops.c */; };
 		002F322209CA02D800EBEB88 /* SDL_joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E489D006D88D97F000001 /* SDL_joystick.c */; };
 		002F322309CA02D800EBEB88 /* SDL_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538445006D7EC67F000001 /* SDL_thread.c */; };
@@ -304,26 +222,18 @@
 		002F322809CA02D800EBEB88 /* SDL_blit_A.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DC006D7A567F000001 /* SDL_blit_A.c */; };
 		002F322909CA02D800EBEB88 /* SDL_blit_N.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DE006D7A567F000001 /* SDL_blit_N.c */; };
 		002F322A09CA02D800EBEB88 /* SDL_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DF006D7A567F000001 /* SDL_bmp.c */; };
-		002F322B09CA02D800EBEB88 /* SDL_cursor.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E0006D7A567F000001 /* SDL_cursor.c */; };
 		002F322C09CA02D800EBEB88 /* SDL_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E2006D7A567F000001 /* SDL_gamma.c */; };
 		002F322D09CA02D800EBEB88 /* SDL_pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E6006D7A567F000001 /* SDL_pixels.c */; };
 		002F322E09CA02D800EBEB88 /* SDL_RLEaccel.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E8006D7A567F000001 /* SDL_RLEaccel.c */; };
 		002F322F09CA02D800EBEB88 /* SDL_stretch.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EA006D7A567F000001 /* SDL_stretch.c */; };
 		002F323009CA02D800EBEB88 /* SDL_surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EC006D7A567F000001 /* SDL_surface.c */; };
 		002F323109CA02D800EBEB88 /* SDL_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EE006D7A567F000001 /* SDL_video.c */; };
-		002F323209CA02D800EBEB88 /* SDL_yuv.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EF006D7A567F000001 /* SDL_yuv.c */; };
 		002F323309CA02D800EBEB88 /* SDL_yuv_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383F1006D7A567F000001 /* SDL_yuv_sw.c */; };
 		002F323409CA02D800EBEB88 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538438006D7D947F000001 /* SDL_error.c */; };
 		002F323509CA02D800EBEB88 /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538439006D7D947F000001 /* SDL_fatal.c */; };
 		002F323609CA02D800EBEB88 /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153843C006D7D947F000001 /* SDL.c */; };
 		002F323709CA02D800EBEB88 /* SDL_sysjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = F51789D101769A2401D3D55B /* SDL_sysjoystick.c */; };
 		002F323809CA02D800EBEB88 /* SDL_syscdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4894006D86FF7F000001 /* SDL_syscdrom.c */; };
-		002F323909CA02D800EBEB88 /* SDL_QuartzEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4D705A88AD0006B9F1C /* SDL_QuartzEvents.m */; };
-		002F323A09CA02D800EBEB88 /* SDL_QuartzGL.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4D805A88AD0006B9F1C /* SDL_QuartzGL.m */; };
-		002F323B09CA02D800EBEB88 /* SDL_QuartzVideo.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DB05A88AD0006B9F1C /* SDL_QuartzVideo.m */; };
-		002F323C09CA02D800EBEB88 /* SDL_QuartzWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DD05A88AD0006B9F1C /* SDL_QuartzWindow.m */; };
-		002F323D09CA02D800EBEB88 /* SDL_QuartzWM.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DE05A88AD0006B9F1C /* SDL_QuartzWM.m */; };
-		002F323E09CA02D800EBEB88 /* SDL_QuartzYUV.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DF05A88AD0006B9F1C /* SDL_QuartzYUV.m */; };
 		002F323F09CA02D800EBEB88 /* SDL_cpuinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = B24DA50405A88D52006B9F1C /* SDL_cpuinfo.c */; };
 		002F324009CA02D800EBEB88 /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = BECDF5D50761B759005FE872 /* SDL_coreaudio.c */; };
 		002F324109CA02D800EBEB88 /* AudioFilePlayer.c in Sources */ = {isa = PBXBuildFile; fileRef = 004C2C860975E13300E9D430 /* AudioFilePlayer.c */; };
@@ -342,7 +252,6 @@
 		002F324E09CA02D800EBEB88 /* SDL_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162D6909BD214F0037C8D0 /* SDL_string.c */; };
 		002F324F09CA02D800EBEB88 /* SDL_mixer_MMX.c in Sources */ = {isa = PBXBuildFile; fileRef = 00B7E61F097F2D9E00826121 /* SDL_mixer_MMX.c */; };
 		002F325109CA02D800EBEB88 /* SDL_nullevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3409BE27FB0037C8D0 /* SDL_nullevents.c */; };
-		002F325209CA02D800EBEB88 /* SDL_nullmouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3609BE27FB0037C8D0 /* SDL_nullmouse.c */; };
 		002F325309CA02D800EBEB88 /* SDL_nullvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 00162F3809BE27FB0037C8D0 /* SDL_nullvideo.c */; };
 		002F326909CA02D800EBEB88 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; };
 		002F326A09CA02D800EBEB88 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; };
@@ -391,16 +300,8 @@
 		007317AD0858DECD00B2BC32 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; };
 		007317AE0858DECD00B2BC32 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A00858DECD00B2BC32 /* OpenGL.framework */; };
 		007317AF0858DECD00B2BC32 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A10858DECD00B2BC32 /* QuickTime.framework */; };
-		007317B00858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; };
-		007317B10858DECD00B2BC32 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; };
-		007317B20858DECD00B2BC32 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; };
-		007317B30858DECD00B2BC32 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179E0858DECD00B2BC32 /* CoreAudio.framework */; };
-		007317B40858DECD00B2BC32 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; };
-		007317B50858DECD00B2BC32 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A00858DECD00B2BC32 /* OpenGL.framework */; };
-		007317B60858DECD00B2BC32 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317A10858DECD00B2BC32 /* QuickTime.framework */; };
 		007317C20858E15000B2BC32 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; };
 		007317C30858E15000B2BC32 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; };
-		007317C40858E15000B2BC32 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; };
 		046B91EA0A11B53500FB151C /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B91E90A11B53500FB151C /* SDL_sysloadso.c */; };
 		046B91EB0A11B53500FB151C /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B91E90A11B53500FB151C /* SDL_sysloadso.c */; };
 		046B91EC0A11B53500FB151C /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B91E90A11B53500FB151C /* SDL_sysloadso.c */; };
@@ -409,20 +310,16 @@
 		046B92120A11B8AD00FB151C /* SDL_dlcompat.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B92100A11B8AD00FB151C /* SDL_dlcompat.c */; };
 		046B92130A11B8AD00FB151C /* SDL_dlcompat.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B92100A11B8AD00FB151C /* SDL_dlcompat.c */; };
 		046B92140A11B8AD00FB151C /* SDL_dlcompat.c in Sources */ = {isa = PBXBuildFile; fileRef = 046B92100A11B8AD00FB151C /* SDL_dlcompat.c */; };
-		BECDF62B0761BA81005FE872 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF2F0086C3A07F000001 /* SDLMain.nib */; };
 		BECDF62D0761BA81005FE872 /* SDL_romaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153832E006D78D67F000001 /* SDL_romaudio.c */; };
 		BECDF62E0761BA81005FE872 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538330006D78D67F000001 /* SDL_audio.c */; };
 		BECDF62F0761BA81005FE872 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538331006D78D67F000001 /* SDL_audiocvt.c */; };
 		BECDF6300761BA81005FE872 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538332006D78D67F000001 /* SDL_audiodev.c */; };
 		BECDF6320761BA81005FE872 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538334006D78D67F000001 /* SDL_mixer.c */; };
 		BECDF6330761BA81005FE872 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538335006D78D67F000001 /* SDL_wave.c */; };
-		BECDF6350761BA81005FE872 /* SDL_active.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538368006D79147F000001 /* SDL_active.c */; };
 		BECDF6360761BA81005FE872 /* SDL_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538369006D79147F000001 /* SDL_events.c */; };
-		BECDF6370761BA81005FE872 /* SDL_expose.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836A006D79147F000001 /* SDL_expose.c */; };
 		BECDF6380761BA81005FE872 /* SDL_keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836B006D79147F000001 /* SDL_keyboard.c */; };
 		BECDF6390761BA81005FE872 /* SDL_mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836C006D79147F000001 /* SDL_mouse.c */; };
 		BECDF63A0761BA81005FE872 /* SDL_quit.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836D006D79147F000001 /* SDL_quit.c */; };
-		BECDF63B0761BA81005FE872 /* SDL_resize.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836E006D79147F000001 /* SDL_resize.c */; };
 		BECDF63C0761BA81005FE872 /* SDL_rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538377006D79307F000001 /* SDL_rwops.c */; };
 		BECDF63E0761BA81005FE872 /* SDL_timer.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383A0006D79BC7F000001 /* SDL_timer.c */; };
 		BECDF63F0761BA81005FE872 /* SDL_blit.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383D8006D7A567F000001 /* SDL_blit.c */; };
@@ -431,13 +328,11 @@
 		BECDF6420761BA81005FE872 /* SDL_blit_A.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DC006D7A567F000001 /* SDL_blit_A.c */; };
 		BECDF6430761BA81005FE872 /* SDL_blit_N.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DE006D7A567F000001 /* SDL_blit_N.c */; };
 		BECDF6440761BA81005FE872 /* SDL_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DF006D7A567F000001 /* SDL_bmp.c */; };
-		BECDF6450761BA81005FE872 /* SDL_cursor.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E0006D7A567F000001 /* SDL_cursor.c */; };
 		BECDF6460761BA81005FE872 /* SDL_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E2006D7A567F000001 /* SDL_gamma.c */; };
 		BECDF6470761BA81005FE872 /* SDL_pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E6006D7A567F000001 /* SDL_pixels.c */; };
 		BECDF6480761BA81005FE872 /* SDL_RLEaccel.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E8006D7A567F000001 /* SDL_RLEaccel.c */; };
 		BECDF6490761BA81005FE872 /* SDL_surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EC006D7A567F000001 /* SDL_surface.c */; };
 		BECDF64A0761BA81005FE872 /* SDL_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EE006D7A567F000001 /* SDL_video.c */; };
-		BECDF64B0761BA81005FE872 /* SDL_yuv.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EF006D7A567F000001 /* SDL_yuv.c */; };
 		BECDF64C0761BA81005FE872 /* SDL_yuv_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383F1006D7A567F000001 /* SDL_yuv_sw.c */; };
 		BECDF64D0761BA81005FE872 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538438006D7D947F000001 /* SDL_error.c */; };
 		BECDF64E0761BA81005FE872 /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538439006D7D947F000001 /* SDL_fatal.c */; };
@@ -447,19 +342,9 @@
 		BECDF6530761BA81005FE872 /* SDL_joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E489D006D88D97F000001 /* SDL_joystick.c */; };
 		BECDF6580761BA81005FE872 /* SDL_stretch.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EA006D7A567F000001 /* SDL_stretch.c */; };
 		BECDF6590761BA81005FE872 /* SDL_sysjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = F51789D101769A2401D3D55B /* SDL_sysjoystick.c */; };
-		BECDF65B0761BA81005FE872 /* SDL_QuartzEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4D705A88AD0006B9F1C /* SDL_QuartzEvents.m */; };
-		BECDF65C0761BA81005FE872 /* SDL_QuartzGL.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4D805A88AD0006B9F1C /* SDL_QuartzGL.m */; };
-		BECDF65D0761BA81005FE872 /* SDL_QuartzVideo.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DB05A88AD0006B9F1C /* SDL_QuartzVideo.m */; };
-		BECDF65E0761BA81005FE872 /* SDL_QuartzWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DD05A88AD0006B9F1C /* SDL_QuartzWindow.m */; };
-		BECDF65F0761BA81005FE872 /* SDL_QuartzWM.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DE05A88AD0006B9F1C /* SDL_QuartzWM.m */; };
-		BECDF6600761BA81005FE872 /* SDL_QuartzYUV.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DF05A88AD0006B9F1C /* SDL_QuartzYUV.m */; };
 		BECDF6610761BA81005FE872 /* SDL_cpuinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = B24DA50405A88D52006B9F1C /* SDL_cpuinfo.c */; };
 		BECDF6620761BA81005FE872 /* SDL_syscdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = B2A23A7B04157C5700A80002 /* SDL_syscdrom.c */; };
 		BECDF6670761BA81005FE872 /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = BECDF5D50761B759005FE872 /* SDL_coreaudio.c */; };
-		BECDF6720761BA81005FE872 /* CGS.h in Headers */ = {isa = PBXBuildFile; fileRef = B24DA4D605A88AD0006B9F1C /* CGS.h */; };
-		BECDF6730761BA81005FE872 /* SDL_QuartzKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = B24DA4D905A88AD0006B9F1C /* SDL_QuartzKeys.h */; };
-		BECDF6740761BA81005FE872 /* SDL_QuartzVideo.h in Headers */ = {isa = PBXBuildFile; fileRef = B24DA4DA05A88AD0006B9F1C /* SDL_QuartzVideo.h */; };
-		BECDF6750761BA81005FE872 /* SDL_QuartzWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = B24DA4DC05A88AD0006B9F1C /* SDL_QuartzWindow.h */; };
 		BECDF6760761BA81005FE872 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */; };
 		BECDF6770761BA81005FE872 /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC705C4450500E5DC7F /* SDL_name.h */; };
 		BECDF6780761BA81005FE872 /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = BECDF5D60761B759005FE872 /* SDL_coreaudio.h */; };
@@ -470,13 +355,10 @@
 		BECDF67F0761BA81005FE872 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538335006D78D67F000001 /* SDL_wave.c */; };
 		BECDF6800761BA81005FE872 /* SDL_romaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153832E006D78D67F000001 /* SDL_romaudio.c */; };
 		BECDF6810761BA81005FE872 /* SDL_cdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4895006D86FF7F000001 /* SDL_cdrom.c */; };
-		BECDF6830761BA81005FE872 /* SDL_active.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538368006D79147F000001 /* SDL_active.c */; };
 		BECDF6840761BA81005FE872 /* SDL_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538369006D79147F000001 /* SDL_events.c */; };
-		BECDF6850761BA81005FE872 /* SDL_expose.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836A006D79147F000001 /* SDL_expose.c */; };
 		BECDF6860761BA81005FE872 /* SDL_keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836B006D79147F000001 /* SDL_keyboard.c */; };
 		BECDF6870761BA81005FE872 /* SDL_mouse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836C006D79147F000001 /* SDL_mouse.c */; };
 		BECDF6880761BA81005FE872 /* SDL_quit.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836D006D79147F000001 /* SDL_quit.c */; };
-		BECDF6890761BA81005FE872 /* SDL_resize.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153836E006D79147F000001 /* SDL_resize.c */; };
 		BECDF68A0761BA81005FE872 /* SDL_rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538377006D79307F000001 /* SDL_rwops.c */; };
 		BECDF68B0761BA81005FE872 /* SDL_joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E489D006D88D97F000001 /* SDL_joystick.c */; };
 		BECDF68C0761BA81005FE872 /* SDL_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538445006D7EC67F000001 /* SDL_thread.c */; };
@@ -487,60 +369,269 @@
 		BECDF6960761BA81005FE872 /* SDL_blit_A.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DC006D7A567F000001 /* SDL_blit_A.c */; };
 		BECDF6970761BA81005FE872 /* SDL_blit_N.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DE006D7A567F000001 /* SDL_blit_N.c */; };
 		BECDF6980761BA81005FE872 /* SDL_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383DF006D7A567F000001 /* SDL_bmp.c */; };
-		BECDF6990761BA81005FE872 /* SDL_cursor.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E0006D7A567F000001 /* SDL_cursor.c */; };
 		BECDF69A0761BA81005FE872 /* SDL_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E2006D7A567F000001 /* SDL_gamma.c */; };
 		BECDF69B0761BA81005FE872 /* SDL_pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E6006D7A567F000001 /* SDL_pixels.c */; };
 		BECDF69C0761BA81005FE872 /* SDL_RLEaccel.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383E8006D7A567F000001 /* SDL_RLEaccel.c */; };
 		BECDF69D0761BA81005FE872 /* SDL_stretch.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EA006D7A567F000001 /* SDL_stretch.c */; };
 		BECDF69E0761BA81005FE872 /* SDL_surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EC006D7A567F000001 /* SDL_surface.c */; };
 		BECDF69F0761BA81005FE872 /* SDL_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EE006D7A567F000001 /* SDL_video.c */; };
-		BECDF6A00761BA81005FE872 /* SDL_yuv.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383EF006D7A567F000001 /* SDL_yuv.c */; };
 		BECDF6A10761BA81005FE872 /* SDL_yuv_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = 015383F1006D7A567F000001 /* SDL_yuv_sw.c */; };
 		BECDF6A20761BA81005FE872 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538438006D7D947F000001 /* SDL_error.c */; };
 		BECDF6A30761BA81005FE872 /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538439006D7D947F000001 /* SDL_fatal.c */; };
 		BECDF6A50761BA81005FE872 /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = 0153843C006D7D947F000001 /* SDL.c */; };
 		BECDF6A60761BA81005FE872 /* SDL_sysjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = F51789D101769A2401D3D55B /* SDL_sysjoystick.c */; };
 		BECDF6A80761BA81005FE872 /* SDL_syscdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4894006D86FF7F000001 /* SDL_syscdrom.c */; };
-		BECDF6A90761BA81005FE872 /* SDL_QuartzEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4D705A88AD0006B9F1C /* SDL_QuartzEvents.m */; };
-		BECDF6AA0761BA81005FE872 /* SDL_QuartzGL.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4D805A88AD0006B9F1C /* SDL_QuartzGL.m */; };
-		BECDF6AB0761BA81005FE872 /* SDL_QuartzVideo.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DB05A88AD0006B9F1C /* SDL_QuartzVideo.m */; };
-		BECDF6AC0761BA81005FE872 /* SDL_QuartzWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DD05A88AD0006B9F1C /* SDL_QuartzWindow.m */; };
-		BECDF6AD0761BA81005FE872 /* SDL_QuartzWM.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DE05A88AD0006B9F1C /* SDL_QuartzWM.m */; };
-		BECDF6AE0761BA81005FE872 /* SDL_QuartzYUV.m in Sources */ = {isa = PBXBuildFile; fileRef = B24DA4DF05A88AD0006B9F1C /* SDL_QuartzYUV.m */; };
 		BECDF6AF0761BA81005FE872 /* SDL_cpuinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = B24DA50405A88D52006B9F1C /* SDL_cpuinfo.c */; };
 		BECDF6B00761BA81005FE872 /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = BECDF5D50761B759005FE872 /* SDL_coreaudio.c */; };
-		BECDF6B70761BA81005FE872 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EECDF2E0086C3A07F000001 /* SDLMain.m */; };
+		F306D6A00CB645A900B70512 /* SDL_yuv_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 00B7E625097F2DD100826121 /* SDL_yuv_mmx.c */; };
+		F306D6A10CB645AF00B70512 /* SDL_yuv_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 00B7E625097F2DD100826121 /* SDL_yuv_mmx.c */; };
+		F306D6A20CB645B100B70512 /* SDL_yuv_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 00B7E625097F2DD100826121 /* SDL_yuv_mmx.c */; };
+		F306D6A30CB645B100B70512 /* SDL_yuv_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 00B7E625097F2DD100826121 /* SDL_yuv_mmx.c */; };
+		F317F3C80C789CCF00411C95 /* SDL_blit_auto.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3B80C789CCE00411C95 /* SDL_blit_auto.c */; };
+		F317F3CA0C789CCF00411C95 /* SDL_blit_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BA0C789CCE00411C95 /* SDL_blit_copy.c */; };
+		F317F3CC0C789CCF00411C95 /* SDL_blit_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BC0C789CCE00411C95 /* SDL_blit_slow.c */; };
+		F317F3CE0C789CCF00411C95 /* SDL_fill.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BE0C789CCF00411C95 /* SDL_fill.c */; };
+		F317F3D80C789CCF00411C95 /* SDL_blit_auto.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3B80C789CCE00411C95 /* SDL_blit_auto.c */; };
+		F317F3DA0C789CCF00411C95 /* SDL_blit_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BA0C789CCE00411C95 /* SDL_blit_copy.c */; };
+		F317F3DC0C789CCF00411C95 /* SDL_blit_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BC0C789CCE00411C95 /* SDL_blit_slow.c */; };
+		F317F3DE0C789CCF00411C95 /* SDL_fill.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BE0C789CCF00411C95 /* SDL_fill.c */; };
+		F317F3E80C789CCF00411C95 /* SDL_blit_auto.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3B80C789CCE00411C95 /* SDL_blit_auto.c */; };
+		F317F3EA0C789CCF00411C95 /* SDL_blit_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BA0C789CCE00411C95 /* SDL_blit_copy.c */; };
+		F317F3EC0C789CCF00411C95 /* SDL_blit_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BC0C789CCE00411C95 /* SDL_blit_slow.c */; };
+		F317F3EE0C789CCF00411C95 /* SDL_fill.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BE0C789CCF00411C95 /* SDL_fill.c */; };
+		F317F3F80C789CCF00411C95 /* SDL_blit_auto.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3B80C789CCE00411C95 /* SDL_blit_auto.c */; };
+		F317F3FA0C789CCF00411C95 /* SDL_blit_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BA0C789CCE00411C95 /* SDL_blit_copy.c */; };
+		F317F3FC0C789CCF00411C95 /* SDL_blit_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BC0C789CCE00411C95 /* SDL_blit_slow.c */; };
+		F317F3FE0C789CCF00411C95 /* SDL_fill.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F3BE0C789CCF00411C95 /* SDL_fill.c */; };
+		F317F44D0C789F2600411C95 /* SDL_compat.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F44C0C789F2600411C95 /* SDL_compat.c */; };
+		F317F44E0C789F2600411C95 /* SDL_compat.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F44C0C789F2600411C95 /* SDL_compat.c */; };
+		F317F44F0C789F2600411C95 /* SDL_compat.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F44C0C789F2600411C95 /* SDL_compat.c */; };
+		F317F4500C789F2600411C95 /* SDL_compat.c in Sources */ = {isa = PBXBuildFile; fileRef = F317F44C0C789F2600411C95 /* SDL_compat.c */; };
+		F38109E30D27B07E002DA2C1 /* imKStoUCS.c in Sources */ = {isa = PBXBuildFile; fileRef = F38109E20D27B07E002DA2C1 /* imKStoUCS.c */; };
+		F38109E40D27B07E002DA2C1 /* imKStoUCS.c in Sources */ = {isa = PBXBuildFile; fileRef = F38109E20D27B07E002DA2C1 /* imKStoUCS.c */; };
+		F3C832DF0DCDAE7200B01593 /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C832DE0DCDAE7200B01593 /* SDL_scancode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3C832E00DCDAE7200B01593 /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C832DE0DCDAE7200B01593 /* SDL_scancode.h */; };
+		F3C832E10DCDAE7200B01593 /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C832DE0DCDAE7200B01593 /* SDL_scancode.h */; };
+		F3C832E20DCDAE7200B01593 /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C832DE0DCDAE7200B01593 /* SDL_scancode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3C833490DCDBDF900B01593 /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C833480DCDBDF900B01593 /* SDL_pixels.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3C8334A0DCDBDF900B01593 /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C833480DCDBDF900B01593 /* SDL_pixels.h */; };
+		F3C8334B0DCDBDF900B01593 /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C833480DCDBDF900B01593 /* SDL_pixels.h */; };
+		F3C8334C0DCDBDF900B01593 /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C833480DCDBDF900B01593 /* SDL_pixels.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3C833500DCDBE3B00B01593 /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C8334F0DCDBE3B00B01593 /* SDL_rect.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3C833510DCDBE3B00B01593 /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C8334F0DCDBE3B00B01593 /* SDL_rect.h */; };
+		F3C833520DCDBE3B00B01593 /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C8334F0DCDBE3B00B01593 /* SDL_rect.h */; };
+		F3C833530DCDBE3B00B01593 /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C8334F0DCDBE3B00B01593 /* SDL_rect.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3C833550DCDBE8400B01593 /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C833540DCDBE8400B01593 /* SDL_surface.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3C833560DCDBE8400B01593 /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C833540DCDBE8400B01593 /* SDL_surface.h */; };
+		F3C833570DCDBE8400B01593 /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C833540DCDBE8400B01593 /* SDL_surface.h */; };
+		F3C833580DCDBE8400B01593 /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C833540DCDBE8400B01593 /* SDL_surface.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3C834970DD22A4D00B01593 /* imKStoUCS.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C8348F0DD22A4D00B01593 /* imKStoUCS.h */; };
+		F3C834980DD22A4D00B01593 /* SDL_x11events.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834900DD22A4D00B01593 /* SDL_x11events.h */; };
+		F3C834990DD22A4D00B01593 /* SDL_x11gamma.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834910DD22A4D00B01593 /* SDL_x11gamma.h */; };
+		F3C8349A0DD22A4D00B01593 /* SDL_x11keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834920DD22A4D00B01593 /* SDL_x11keyboard.h */; };
+		F3C8349B0DD22A4D00B01593 /* SDL_x11modes.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834930DD22A4D00B01593 /* SDL_x11modes.h */; };
+		F3C8349C0DD22A4D00B01593 /* SDL_x11mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834940DD22A4D00B01593 /* SDL_x11mouse.h */; };
+		F3C8349D0DD22A4D00B01593 /* SDL_x11opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834950DD22A4D00B01593 /* SDL_x11opengl.h */; };
+		F3C8349E0DD22A4D00B01593 /* SDL_x11window.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834960DD22A4D00B01593 /* SDL_x11window.h */; };
+		F3C8349F0DD22A4D00B01593 /* imKStoUCS.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C8348F0DD22A4D00B01593 /* imKStoUCS.h */; };
+		F3C834A00DD22A4D00B01593 /* SDL_x11events.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834900DD22A4D00B01593 /* SDL_x11events.h */; };
+		F3C834A10DD22A4D00B01593 /* SDL_x11gamma.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834910DD22A4D00B01593 /* SDL_x11gamma.h */; };
+		F3C834A20DD22A4D00B01593 /* SDL_x11keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834920DD22A4D00B01593 /* SDL_x11keyboard.h */; };
+		F3C834A30DD22A4D00B01593 /* SDL_x11modes.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834930DD22A4D00B01593 /* SDL_x11modes.h */; };
+		F3C834A40DD22A4D00B01593 /* SDL_x11mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834940DD22A4D00B01593 /* SDL_x11mouse.h */; };
+		F3C834A50DD22A4D00B01593 /* SDL_x11opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834950DD22A4D00B01593 /* SDL_x11opengl.h */; };
+		F3C834A60DD22A4D00B01593 /* SDL_x11window.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834960DD22A4D00B01593 /* SDL_x11window.h */; };
+		F3C834CE0DD22C4300B01593 /* e_log.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BC0DD22C4300B01593 /* e_log.h */; };
+		F3C834CF0DD22C4300B01593 /* e_pow.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BD0DD22C4300B01593 /* e_pow.h */; };
+		F3C834D00DD22C4300B01593 /* e_sqrt.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BE0DD22C4300B01593 /* e_sqrt.h */; };
+		F3C834D10DD22C4300B01593 /* math_private.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BF0DD22C4300B01593 /* math_private.h */; };
+		F3C834D20DD22C4300B01593 /* mmx.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C00DD22C4300B01593 /* mmx.h */; };
+		F3C834D30DD22C4300B01593 /* SDL_blit.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C10DD22C4300B01593 /* SDL_blit.h */; };
+		F3C834D40DD22C4300B01593 /* SDL_blit_auto.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C20DD22C4300B01593 /* SDL_blit_auto.h */; };
+		F3C834D50DD22C4300B01593 /* SDL_blit_copy.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C30DD22C4300B01593 /* SDL_blit_copy.h */; };
+		F3C834D60DD22C4300B01593 /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C40DD22C4300B01593 /* SDL_glfuncs.h */; };
+		F3C834D70DD22C4300B01593 /* SDL_leaks.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C50DD22C4300B01593 /* SDL_leaks.h */; };
+		F3C834D80DD22C4300B01593 /* SDL_pixels_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C60DD22C4300B01593 /* SDL_pixels_c.h */; };
+		F3C834D90DD22C4300B01593 /* SDL_rect_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C70DD22C4300B01593 /* SDL_rect_c.h */; };
+		F3C834DA0DD22C4300B01593 /* SDL_renderer_gl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C80DD22C4300B01593 /* SDL_renderer_gl.h */; };
+		F3C834DB0DD22C4300B01593 /* SDL_renderer_sw.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C90DD22C4300B01593 /* SDL_renderer_sw.h */; };
+		F3C834DC0DD22C4300B01593 /* SDL_RLEaccel_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CA0DD22C4300B01593 /* SDL_RLEaccel_c.h */; };
+		F3C834DD0DD22C4300B01593 /* SDL_stretch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CB0DD22C4300B01593 /* SDL_stretch_c.h */; };
+		F3C834DE0DD22C4300B01593 /* SDL_sysvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CC0DD22C4300B01593 /* SDL_sysvideo.h */; };
+		F3C834DF0DD22C4300B01593 /* SDL_yuv_sw_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CD0DD22C4300B01593 /* SDL_yuv_sw_c.h */; };
+		F3C834E00DD22C4300B01593 /* e_log.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BC0DD22C4300B01593 /* e_log.h */; };
+		F3C834E10DD22C4300B01593 /* e_pow.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BD0DD22C4300B01593 /* e_pow.h */; };
+		F3C834E20DD22C4300B01593 /* e_sqrt.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BE0DD22C4300B01593 /* e_sqrt.h */; };
+		F3C834E30DD22C4300B01593 /* math_private.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BF0DD22C4300B01593 /* math_private.h */; };
+		F3C834E40DD22C4300B01593 /* mmx.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C00DD22C4300B01593 /* mmx.h */; };
+		F3C834E50DD22C4300B01593 /* SDL_blit.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C10DD22C4300B01593 /* SDL_blit.h */; };
+		F3C834E60DD22C4300B01593 /* SDL_blit_auto.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C20DD22C4300B01593 /* SDL_blit_auto.h */; };
+		F3C834E70DD22C4300B01593 /* SDL_blit_copy.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C30DD22C4300B01593 /* SDL_blit_copy.h */; };
+		F3C834E80DD22C4300B01593 /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C40DD22C4300B01593 /* SDL_glfuncs.h */; };
+		F3C834E90DD22C4300B01593 /* SDL_leaks.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C50DD22C4300B01593 /* SDL_leaks.h */; };
+		F3C834EA0DD22C4300B01593 /* SDL_pixels_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C60DD22C4300B01593 /* SDL_pixels_c.h */; };
+		F3C834EB0DD22C4300B01593 /* SDL_rect_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C70DD22C4300B01593 /* SDL_rect_c.h */; };
+		F3C834EC0DD22C4300B01593 /* SDL_renderer_gl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C80DD22C4300B01593 /* SDL_renderer_gl.h */; };
+		F3C834ED0DD22C4300B01593 /* SDL_renderer_sw.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C90DD22C4300B01593 /* SDL_renderer_sw.h */; };
+		F3C834EE0DD22C4300B01593 /* SDL_RLEaccel_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CA0DD22C4300B01593 /* SDL_RLEaccel_c.h */; };
+		F3C834EF0DD22C4300B01593 /* SDL_stretch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CB0DD22C4300B01593 /* SDL_stretch_c.h */; };
+		F3C834F00DD22C4300B01593 /* SDL_sysvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CC0DD22C4300B01593 /* SDL_sysvideo.h */; };
+		F3C834F10DD22C4300B01593 /* SDL_yuv_sw_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CD0DD22C4300B01593 /* SDL_yuv_sw_c.h */; };
+		F3C834F20DD22C4300B01593 /* e_log.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BC0DD22C4300B01593 /* e_log.h */; };
+		F3C834F30DD22C4300B01593 /* e_pow.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BD0DD22C4300B01593 /* e_pow.h */; };
+		F3C834F40DD22C4300B01593 /* e_sqrt.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BE0DD22C4300B01593 /* e_sqrt.h */; };
+		F3C834F50DD22C4300B01593 /* math_private.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BF0DD22C4300B01593 /* math_private.h */; };
+		F3C834F60DD22C4300B01593 /* mmx.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C00DD22C4300B01593 /* mmx.h */; };
+		F3C834F70DD22C4300B01593 /* SDL_blit.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C10DD22C4300B01593 /* SDL_blit.h */; };
+		F3C834F80DD22C4300B01593 /* SDL_blit_auto.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C20DD22C4300B01593 /* SDL_blit_auto.h */; };
+		F3C834F90DD22C4300B01593 /* SDL_blit_copy.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C30DD22C4300B01593 /* SDL_blit_copy.h */; };
+		F3C834FA0DD22C4300B01593 /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C40DD22C4300B01593 /* SDL_glfuncs.h */; };
+		F3C834FB0DD22C4300B01593 /* SDL_leaks.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C50DD22C4300B01593 /* SDL_leaks.h */; };
+		F3C834FC0DD22C4300B01593 /* SDL_pixels_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C60DD22C4300B01593 /* SDL_pixels_c.h */; };
+		F3C834FD0DD22C4300B01593 /* SDL_rect_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C70DD22C4300B01593 /* SDL_rect_c.h */; };
+		F3C834FE0DD22C4300B01593 /* SDL_renderer_gl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C80DD22C4300B01593 /* SDL_renderer_gl.h */; };
+		F3C834FF0DD22C4300B01593 /* SDL_renderer_sw.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C90DD22C4300B01593 /* SDL_renderer_sw.h */; };
+		F3C835000DD22C4300B01593 /* SDL_RLEaccel_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CA0DD22C4300B01593 /* SDL_RLEaccel_c.h */; };
+		F3C835010DD22C4300B01593 /* SDL_stretch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CB0DD22C4300B01593 /* SDL_stretch_c.h */; };
+		F3C835020DD22C4300B01593 /* SDL_sysvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CC0DD22C4300B01593 /* SDL_sysvideo.h */; };
+		F3C835030DD22C4300B01593 /* SDL_yuv_sw_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CD0DD22C4300B01593 /* SDL_yuv_sw_c.h */; };
+		F3C835040DD22C4300B01593 /* e_log.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BC0DD22C4300B01593 /* e_log.h */; };
+		F3C835050DD22C4300B01593 /* e_pow.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BD0DD22C4300B01593 /* e_pow.h */; };
+		F3C835060DD22C4300B01593 /* e_sqrt.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BE0DD22C4300B01593 /* e_sqrt.h */; };
+		F3C835070DD22C4300B01593 /* math_private.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834BF0DD22C4300B01593 /* math_private.h */; };
+		F3C835080DD22C4300B01593 /* mmx.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C00DD22C4300B01593 /* mmx.h */; };
+		F3C835090DD22C4300B01593 /* SDL_blit.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C10DD22C4300B01593 /* SDL_blit.h */; };
+		F3C8350A0DD22C4300B01593 /* SDL_blit_auto.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C20DD22C4300B01593 /* SDL_blit_auto.h */; };
+		F3C8350B0DD22C4300B01593 /* SDL_blit_copy.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C30DD22C4300B01593 /* SDL_blit_copy.h */; };
+		F3C8350C0DD22C4300B01593 /* SDL_glfuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C40DD22C4300B01593 /* SDL_glfuncs.h */; };
+		F3C8350D0DD22C4300B01593 /* SDL_leaks.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C50DD22C4300B01593 /* SDL_leaks.h */; };
+		F3C8350E0DD22C4300B01593 /* SDL_pixels_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C60DD22C4300B01593 /* SDL_pixels_c.h */; };
+		F3C8350F0DD22C4300B01593 /* SDL_rect_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C70DD22C4300B01593 /* SDL_rect_c.h */; };
+		F3C835100DD22C4300B01593 /* SDL_renderer_gl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C80DD22C4300B01593 /* SDL_renderer_gl.h */; };
+		F3C835110DD22C4300B01593 /* SDL_renderer_sw.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834C90DD22C4300B01593 /* SDL_renderer_sw.h */; };
+		F3C835120DD22C4300B01593 /* SDL_RLEaccel_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CA0DD22C4300B01593 /* SDL_RLEaccel_c.h */; };
+		F3C835130DD22C4300B01593 /* SDL_stretch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CB0DD22C4300B01593 /* SDL_stretch_c.h */; };
+		F3C835140DD22C4300B01593 /* SDL_sysvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CC0DD22C4300B01593 /* SDL_sysvideo.h */; };
+		F3C835150DD22C4300B01593 /* SDL_yuv_sw_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C834CD0DD22C4300B01593 /* SDL_yuv_sw_c.h */; };
+		F3C8353D0DD22EE800B01593 /* SDL_cocoaevents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6230C57E360003E2527 /* SDL_cocoaevents.h */; };
+		F3C8353E0DD22EE800B01593 /* SDL_cocoakeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6240C57E360003E2527 /* SDL_cocoakeyboard.h */; };
+		F3C8353F0DD22EE800B01593 /* SDL_cocoamodes.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6260C57E360003E2527 /* SDL_cocoamodes.h */; };
+		F3C835400DD22EE800B01593 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6270C57E360003E2527 /* SDL_cocoamouse.h */; };
+		F3C835410DD22EE800B01593 /* SDL_cocoaopengl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6280C57E360003E2527 /* SDL_cocoaopengl.h */; };
+		F3C835420DD22EE800B01593 /* SDL_cocoavideo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6290C57E360003E2527 /* SDL_cocoavideo.h */; };
+		F3C835430DD22EE800B01593 /* SDL_cocoawindow.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB62A0C57E360003E2527 /* SDL_cocoawindow.h */; };
+		F3C835440DD22EE900B01593 /* SDL_cocoaevents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6230C57E360003E2527 /* SDL_cocoaevents.h */; };
+		F3C835450DD22EE900B01593 /* SDL_cocoakeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6240C57E360003E2527 /* SDL_cocoakeyboard.h */; };
+		F3C835460DD22EE900B01593 /* SDL_cocoamodes.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6260C57E360003E2527 /* SDL_cocoamodes.h */; };
+		F3C835470DD22EE900B01593 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6270C57E360003E2527 /* SDL_cocoamouse.h */; };
+		F3C835480DD22EE900B01593 /* SDL_cocoaopengl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6280C57E360003E2527 /* SDL_cocoaopengl.h */; };
+		F3C835490DD22EE900B01593 /* SDL_cocoavideo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6290C57E360003E2527 /* SDL_cocoavideo.h */; };
+		F3C8354A0DD22EE900B01593 /* SDL_cocoawindow.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB62A0C57E360003E2527 /* SDL_cocoawindow.h */; };
+		F3C8354B0DD22EEA00B01593 /* SDL_cocoaevents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6230C57E360003E2527 /* SDL_cocoaevents.h */; };
+		F3C8354C0DD22EEA00B01593 /* SDL_cocoakeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6240C57E360003E2527 /* SDL_cocoakeyboard.h */; };
+		F3C8354D0DD22EEA00B01593 /* SDL_cocoamodes.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6260C57E360003E2527 /* SDL_cocoamodes.h */; };
+		F3C8354E0DD22EEA00B01593 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6270C57E360003E2527 /* SDL_cocoamouse.h */; };
+		F3C8354F0DD22EEA00B01593 /* SDL_cocoaopengl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6280C57E360003E2527 /* SDL_cocoaopengl.h */; };
+		F3C835500DD22EEA00B01593 /* SDL_cocoavideo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6290C57E360003E2527 /* SDL_cocoavideo.h */; };
+		F3C835510DD22EEA00B01593 /* SDL_cocoawindow.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB62A0C57E360003E2527 /* SDL_cocoawindow.h */; };
+		F3C835520DD22EEB00B01593 /* SDL_cocoaevents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6230C57E360003E2527 /* SDL_cocoaevents.h */; };
+		F3C835530DD22EEB00B01593 /* SDL_cocoakeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6240C57E360003E2527 /* SDL_cocoakeyboard.h */; };
+		F3C835540DD22EEB00B01593 /* SDL_cocoamodes.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6260C57E360003E2527 /* SDL_cocoamodes.h */; };
+		F3C835550DD22EEB00B01593 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6270C57E360003E2527 /* SDL_cocoamouse.h */; };
+		F3C835560DD22EEB00B01593 /* SDL_cocoaopengl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6280C57E360003E2527 /* SDL_cocoaopengl.h */; };
+		F3C835570DD22EEB00B01593 /* SDL_cocoavideo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6290C57E360003E2527 /* SDL_cocoavideo.h */; };
+		F3C835580DD22EEB00B01593 /* SDL_cocoawindow.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB62A0C57E360003E2527 /* SDL_cocoawindow.h */; };
+		F3C835590DD22F3F00B01593 /* SDL_nullevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3509BE27FB0037C8D0 /* SDL_nullevents_c.h */; };
+		F3C8355A0DD22F3F00B01593 /* SDL_nullrender_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6190C57E321003E2527 /* SDL_nullrender_c.h */; };
+		F3C8355B0DD22F3F00B01593 /* SDL_nullvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3909BE27FB0037C8D0 /* SDL_nullvideo.h */; };
+		F3C8355C0DD22F4000B01593 /* SDL_nullevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3509BE27FB0037C8D0 /* SDL_nullevents_c.h */; };
+		F3C8355D0DD22F4000B01593 /* SDL_nullrender_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6190C57E321003E2527 /* SDL_nullrender_c.h */; };
+		F3C8355E0DD22F4000B01593 /* SDL_nullvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 00162F3909BE27FB0037C8D0 /* SDL_nullvideo.h */; };
+		F3C835600DD22F7A00B01593 /* SDL_x11dyn.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B83A09C0D977003A99D5 /* SDL_x11dyn.h */; };
+		F3C835610DD22F7A00B01593 /* SDL_x11sym.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B84709C0D977003A99D5 /* SDL_x11sym.h */; };
+		F3C835620DD22F7A00B01593 /* SDL_x11video.h in Headers */ = {isa = PBXBuildFile; fileRef = 0014B84909C0D977003A99D5 /* SDL_x11video.h */; };
+		F3DEB5830C57E0D4003E2527 /* SDL_compat.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB5820C57E0D4003E2527 /* SDL_compat.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3DEB5840C57E0D4003E2527 /* SDL_compat.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB5820C57E0D4003E2527 /* SDL_compat.h */; };
+		F3DEB5850C57E0D4003E2527 /* SDL_compat.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB5820C57E0D4003E2527 /* SDL_compat.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3DEB5860C57E0D4003E2527 /* SDL_compat.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB5820C57E0D4003E2527 /* SDL_compat.h */; };
+		F3DEB5890C57E182003E2527 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5880C57E182003E2527 /* SDL_audiotypecvt.c */; };
+		F3DEB58A0C57E182003E2527 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5880C57E182003E2527 /* SDL_audiotypecvt.c */; };
+		F3DEB58B0C57E182003E2527 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5880C57E182003E2527 /* SDL_audiotypecvt.c */; };
+		F3DEB58C0C57E182003E2527 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5880C57E182003E2527 /* SDL_audiotypecvt.c */; };
+		F3DEB58E0C57E1EA003E2527 /* SDL_windowevents.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB58D0C57E1EA003E2527 /* SDL_windowevents.c */; };
+		F3DEB58F0C57E1EA003E2527 /* SDL_windowevents.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB58D0C57E1EA003E2527 /* SDL_windowevents.c */; };
+		F3DEB5900C57E1EA003E2527 /* SDL_windowevents.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB58D0C57E1EA003E2527 /* SDL_windowevents.c */; };
+		F3DEB5910C57E1EA003E2527 /* SDL_windowevents.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB58D0C57E1EA003E2527 /* SDL_windowevents.c */; };
+		F3DEB5A00C57E282003E2527 /* SDL_rect.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59C0C57E282003E2527 /* SDL_rect.c */; };
+		F3DEB5A20C57E282003E2527 /* SDL_renderer_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59E0C57E282003E2527 /* SDL_renderer_gl.c */; };
+		F3DEB5A30C57E282003E2527 /* SDL_renderer_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59F0C57E282003E2527 /* SDL_renderer_sw.c */; };
+		F3DEB5A40C57E282003E2527 /* SDL_rect.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59C0C57E282003E2527 /* SDL_rect.c */; };
+		F3DEB5A60C57E282003E2527 /* SDL_renderer_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59E0C57E282003E2527 /* SDL_renderer_gl.c */; };
+		F3DEB5A70C57E282003E2527 /* SDL_renderer_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59F0C57E282003E2527 /* SDL_renderer_sw.c */; };
+		F3DEB5A80C57E282003E2527 /* SDL_rect.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59C0C57E282003E2527 /* SDL_rect.c */; };
+		F3DEB5AA0C57E282003E2527 /* SDL_renderer_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59E0C57E282003E2527 /* SDL_renderer_gl.c */; };
+		F3DEB5AB0C57E282003E2527 /* SDL_renderer_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59F0C57E282003E2527 /* SDL_renderer_sw.c */; };
+		F3DEB5AC0C57E282003E2527 /* SDL_rect.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59C0C57E282003E2527 /* SDL_rect.c */; };
+		F3DEB5AE0C57E282003E2527 /* SDL_renderer_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59E0C57E282003E2527 /* SDL_renderer_gl.c */; };
+		F3DEB5AF0C57E282003E2527 /* SDL_renderer_sw.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB59F0C57E282003E2527 /* SDL_renderer_sw.c */; };
+		F3DEB5C10C57E2BF003E2527 /* SDL_cocoaevents.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B20C57E2BF003E2527 /* SDL_cocoaevents.m */; };
+		F3DEB5C30C57E2BF003E2527 /* SDL_cocoakeyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B40C57E2BF003E2527 /* SDL_cocoakeyboard.m */; };
+		F3DEB5C60C57E2BF003E2527 /* SDL_cocoamodes.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B70C57E2BF003E2527 /* SDL_cocoamodes.m */; };
+		F3DEB5C80C57E2BF003E2527 /* SDL_cocoamouse.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B90C57E2BF003E2527 /* SDL_cocoamouse.m */; };
+		F3DEB5CA0C57E2BF003E2527 /* SDL_cocoaopengl.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BB0C57E2BF003E2527 /* SDL_cocoaopengl.m */; };
+		F3DEB5CC0C57E2BF003E2527 /* SDL_cocoavideo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BD0C57E2BF003E2527 /* SDL_cocoavideo.m */; };
+		F3DEB5CE0C57E2BF003E2527 /* SDL_cocoawindow.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BF0C57E2BF003E2527 /* SDL_cocoawindow.m */; };
+		F3DEB5D00C57E2BF003E2527 /* SDL_cocoaevents.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B20C57E2BF003E2527 /* SDL_cocoaevents.m */; };
+		F3DEB5D20C57E2BF003E2527 /* SDL_cocoakeyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B40C57E2BF003E2527 /* SDL_cocoakeyboard.m */; };
+		F3DEB5D50C57E2BF003E2527 /* SDL_cocoamodes.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B70C57E2BF003E2527 /* SDL_cocoamodes.m */; };
+		F3DEB5D70C57E2BF003E2527 /* SDL_cocoamouse.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B90C57E2BF003E2527 /* SDL_cocoamouse.m */; };
+		F3DEB5D90C57E2BF003E2527 /* SDL_cocoaopengl.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BB0C57E2BF003E2527 /* SDL_cocoaopengl.m */; };
+		F3DEB5DB0C57E2BF003E2527 /* SDL_cocoavideo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BD0C57E2BF003E2527 /* SDL_cocoavideo.m */; };
+		F3DEB5DD0C57E2BF003E2527 /* SDL_cocoawindow.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BF0C57E2BF003E2527 /* SDL_cocoawindow.m */; };
+		F3DEB5DF0C57E2BF003E2527 /* SDL_cocoaevents.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B20C57E2BF003E2527 /* SDL_cocoaevents.m */; };
+		F3DEB5E10C57E2BF003E2527 /* SDL_cocoakeyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B40C57E2BF003E2527 /* SDL_cocoakeyboard.m */; };
+		F3DEB5E40C57E2BF003E2527 /* SDL_cocoamodes.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B70C57E2BF003E2527 /* SDL_cocoamodes.m */; };
+		F3DEB5E60C57E2BF003E2527 /* SDL_cocoamouse.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B90C57E2BF003E2527 /* SDL_cocoamouse.m */; };
+		F3DEB5E80C57E2BF003E2527 /* SDL_cocoaopengl.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BB0C57E2BF003E2527 /* SDL_cocoaopengl.m */; };
+		F3DEB5EA0C57E2BF003E2527 /* SDL_cocoavideo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BD0C57E2BF003E2527 /* SDL_cocoavideo.m */; };
+		F3DEB5EC0C57E2BF003E2527 /* SDL_cocoawindow.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BF0C57E2BF003E2527 /* SDL_cocoawindow.m */; };
+		F3DEB5EE0C57E2BF003E2527 /* SDL_cocoaevents.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B20C57E2BF003E2527 /* SDL_cocoaevents.m */; };
+		F3DEB5F00C57E2BF003E2527 /* SDL_cocoakeyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B40C57E2BF003E2527 /* SDL_cocoakeyboard.m */; };
+		F3DEB5F30C57E2BF003E2527 /* SDL_cocoamodes.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B70C57E2BF003E2527 /* SDL_cocoamodes.m */; };
+		F3DEB5F50C57E2BF003E2527 /* SDL_cocoamouse.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5B90C57E2BF003E2527 /* SDL_cocoamouse.m */; };
+		F3DEB5F70C57E2BF003E2527 /* SDL_cocoaopengl.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BB0C57E2BF003E2527 /* SDL_cocoaopengl.m */; };
+		F3DEB5F90C57E2BF003E2527 /* SDL_cocoavideo.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BD0C57E2BF003E2527 /* SDL_cocoavideo.m */; };
+		F3DEB5FB0C57E2BF003E2527 /* SDL_cocoawindow.m in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB5BF0C57E2BF003E2527 /* SDL_cocoawindow.m */; };
+		F3DEB61C0C57E321003E2527 /* SDL_nullrender.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB61A0C57E321003E2527 /* SDL_nullrender.c */; };
+		F3DEB61D0C57E321003E2527 /* SDL_nullrender_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6190C57E321003E2527 /* SDL_nullrender_c.h */; };
+		F3DEB61E0C57E321003E2527 /* SDL_nullrender.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB61A0C57E321003E2527 /* SDL_nullrender.c */; };
+		F3DEB6200C57E321003E2527 /* SDL_nullrender.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB61A0C57E321003E2527 /* SDL_nullrender.c */; };
+		F3DEB6210C57E321003E2527 /* SDL_nullrender_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DEB6190C57E321003E2527 /* SDL_nullrender_c.h */; };
+		F3DEB6220C57E321003E2527 /* SDL_nullrender.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB61A0C57E321003E2527 /* SDL_nullrender.c */; };
+		F3DEB6330C57E3C4003E2527 /* SDL_x11keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6300C57E3C4003E2527 /* SDL_x11keyboard.c */; };
+		F3DEB6340C57E3C4003E2527 /* SDL_x11opengl.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6310C57E3C4003E2527 /* SDL_x11opengl.c */; };
+		F3DEB6350C57E3C4003E2527 /* SDL_x11window.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6320C57E3C4003E2527 /* SDL_x11window.c */; };
+		F3DEB6360C57E3C4003E2527 /* SDL_x11keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6300C57E3C4003E2527 /* SDL_x11keyboard.c */; };
+		F3DEB6370C57E3C4003E2527 /* SDL_x11opengl.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6310C57E3C4003E2527 /* SDL_x11opengl.c */; };
+		F3DEB6380C57E3C4003E2527 /* SDL_x11window.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6320C57E3C4003E2527 /* SDL_x11window.c */; };
+		F3DEB6490C57E483003E2527 /* AllCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6410C57E483003E2527 /* AllCmap.c */; };
+		F3DEB64A0C57E483003E2527 /* CmapAlloc.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6420C57E483003E2527 /* CmapAlloc.c */; };
+		F3DEB64B0C57E483003E2527 /* CrCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6430C57E483003E2527 /* CrCmap.c */; };
+		F3DEB64C0C57E483003E2527 /* DelCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6440C57E483003E2527 /* DelCmap.c */; };
+		F3DEB64D0C57E483003E2527 /* Distinct.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6450C57E483003E2527 /* Distinct.c */; };
+		F3DEB64E0C57E483003E2527 /* LookupCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6460C57E483003E2527 /* LookupCmap.c */; };
+		F3DEB64F0C57E483003E2527 /* StdCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6470C57E483003E2527 /* StdCmap.c */; };
+		F3DEB6500C57E483003E2527 /* VisCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6480C57E483003E2527 /* VisCmap.c */; };
+		F3DEB6510C57E483003E2527 /* AllCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6410C57E483003E2527 /* AllCmap.c */; };
+		F3DEB6520C57E483003E2527 /* CmapAlloc.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6420C57E483003E2527 /* CmapAlloc.c */; };
+		F3DEB6530C57E483003E2527 /* CrCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6430C57E483003E2527 /* CrCmap.c */; };
+		F3DEB6540C57E483003E2527 /* DelCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6440C57E483003E2527 /* DelCmap.c */; };
+		F3DEB6550C57E483003E2527 /* Distinct.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6450C57E483003E2527 /* Distinct.c */; };
+		F3DEB6560C57E483003E2527 /* LookupCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6460C57E483003E2527 /* LookupCmap.c */; };
+		F3DEB6570C57E483003E2527 /* StdCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6470C57E483003E2527 /* StdCmap.c */; };
+		F3DEB6580C57E483003E2527 /* VisCmap.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6480C57E483003E2527 /* VisCmap.c */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildStyle section */
-		F512D95E02A6E0AB01D28762 /* Development */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				DEBUGGING_SYMBOLS = YES;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				ZERO_LINK = YES;
-			};
-			name = Development;
-		};
-		F512D95F02A6E0AB01D28762 /* Deployment */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUGGING_SYMBOLS = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
 		BECDF6C50761BA81005FE872 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -552,50 +643,22 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		0014B7E809C0D8D2003A99D5 /* SDL_dgaevents_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_dgaevents_c.h; sourceTree = "<group>"; };
-		0014B7E909C0D8D2003A99D5 /* SDL_dgaevents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_dgaevents.c; sourceTree = "<group>"; };
-		0014B7EA09C0D8D2003A99D5 /* SDL_dgamouse_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_dgamouse_c.h; sourceTree = "<group>"; };
-		0014B7EB09C0D8D2003A99D5 /* SDL_dgamouse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_dgamouse.c; sourceTree = "<group>"; };
-		0014B7EC09C0D8D2003A99D5 /* SDL_dgavideo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_dgavideo.c; sourceTree = "<group>"; };
-		0014B7ED09C0D8D2003A99D5 /* SDL_dgavideo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_dgavideo.h; sourceTree = "<group>"; };
-		0014B83709C0D977003A99D5 /* SDL_x11dga_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11dga_c.h; sourceTree = "<group>"; };
-		0014B83809C0D977003A99D5 /* SDL_x11dga.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11dga.c; sourceTree = "<group>"; };
 		0014B83909C0D977003A99D5 /* SDL_x11dyn.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11dyn.c; sourceTree = "<group>"; };
 		0014B83A09C0D977003A99D5 /* SDL_x11dyn.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11dyn.h; sourceTree = "<group>"; };
-		0014B83B09C0D977003A99D5 /* SDL_x11events_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11events_c.h; sourceTree = "<group>"; };
 		0014B83C09C0D977003A99D5 /* SDL_x11events.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11events.c; sourceTree = "<group>"; };
-		0014B83D09C0D977003A99D5 /* SDL_x11gamma_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11gamma_c.h; sourceTree = "<group>"; };
 		0014B83E09C0D977003A99D5 /* SDL_x11gamma.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11gamma.c; sourceTree = "<group>"; };
-		0014B83F09C0D977003A99D5 /* SDL_x11gl_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11gl_c.h; sourceTree = "<group>"; };
-		0014B84009C0D977003A99D5 /* SDL_x11gl.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11gl.c; sourceTree = "<group>"; };
-		0014B84109C0D977003A99D5 /* SDL_x11image_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11image_c.h; sourceTree = "<group>"; };
-		0014B84209C0D977003A99D5 /* SDL_x11image.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11image.c; sourceTree = "<group>"; };
-		0014B84309C0D977003A99D5 /* SDL_x11modes_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11modes_c.h; sourceTree = "<group>"; };
 		0014B84409C0D977003A99D5 /* SDL_x11modes.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11modes.c; sourceTree = "<group>"; };
-		0014B84509C0D977003A99D5 /* SDL_x11mouse_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11mouse_c.h; sourceTree = "<group>"; };
 		0014B84609C0D977003A99D5 /* SDL_x11mouse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11mouse.c; sourceTree = "<group>"; };
 		0014B84709C0D977003A99D5 /* SDL_x11sym.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11sym.h; sourceTree = "<group>"; };
 		0014B84809C0D977003A99D5 /* SDL_x11video.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11video.c; sourceTree = "<group>"; };
 		0014B84909C0D977003A99D5 /* SDL_x11video.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11video.h; sourceTree = "<group>"; };
-		0014B84A09C0D977003A99D5 /* SDL_x11wm_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11wm_c.h; sourceTree = "<group>"; };
-		0014B84B09C0D977003A99D5 /* SDL_x11wm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11wm.c; sourceTree = "<group>"; };
-		0014B84C09C0D977003A99D5 /* SDL_x11yuv_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_x11yuv_c.h; sourceTree = "<group>"; };
-		0014B84D09C0D977003A99D5 /* SDL_x11yuv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_x11yuv.c; sourceTree = "<group>"; };
-		0014B89009C0DA94003A99D5 /* XF86DGA.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = XF86DGA.c; sourceTree = "<group>"; };
-		0014B89109C0DA94003A99D5 /* XF86DGA2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = XF86DGA2.c; sourceTree = "<group>"; };
 		0014B89609C0DAA1003A99D5 /* XF86VMode.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = XF86VMode.c; sourceTree = "<group>"; };
 		0014B89909C0DAAE003A99D5 /* Xv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Xv.c; sourceTree = "<group>"; };
 		0014B89A09C0DAAE003A99D5 /* Xvlibint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Xvlibint.h; sourceTree = "<group>"; };
 		0014B89F09C0DAB9003A99D5 /* Xinerama.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Xinerama.c; sourceTree = "<group>"; };
 		0014B8A209C0DAC4003A99D5 /* xme.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xme.c; sourceTree = "<group>"; };
-		0014B9A809C0E585003A99D5 /* SDL.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0014B9A909C0E585003A99D5 /* Info-FrameworkNoX11.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-FrameworkNoX11.plist"; sourceTree = "<group>"; };
-		00162D3109BD1FA80037C8D0 /* SDL_config_amiga.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_config_amiga.h; path = ../../include/SDL_config_amiga.h; sourceTree = SOURCE_ROOT; };
-		00162D3209BD1FA90037C8D0 /* SDL_config_dreamcast.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_config_dreamcast.h; path = ../../include/SDL_config_dreamcast.h; sourceTree = SOURCE_ROOT; };
-		00162D3309BD1FA90037C8D0 /* SDL_config_macos.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_config_macos.h; path = ../../include/SDL_config_macos.h; sourceTree = SOURCE_ROOT; };
 		00162D3409BD1FA90037C8D0 /* SDL_config_macosx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_config_macosx.h; path = ../../include/SDL_config_macosx.h; sourceTree = SOURCE_ROOT; };
-		00162D3509BD1FA90037C8D0 /* SDL_config_os2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_config_os2.h; path = ../../include/SDL_config_os2.h; sourceTree = SOURCE_ROOT; };
-		00162D3609BD1FA90037C8D0 /* SDL_config_win32.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_config_win32.h; path = ../../include/SDL_config_win32.h; sourceTree = SOURCE_ROOT; };
 		00162D3709BD1FA90037C8D0 /* SDL_config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_config.h; path = ../../include/SDL_config.h; sourceTree = SOURCE_ROOT; };
 		00162D3809BD1FA90037C8D0 /* SDL_platform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_platform.h; path = ../../include/SDL_platform.h; sourceTree = SOURCE_ROOT; };
 		00162D3909BD1FA90037C8D0 /* SDL_stdinc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_stdinc.h; path = ../../include/SDL_stdinc.h; sourceTree = SOURCE_ROOT; };
@@ -613,8 +676,6 @@
 		00162D6909BD214F0037C8D0 /* SDL_string.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_string.c; sourceTree = "<group>"; };
 		00162F3409BE27FB0037C8D0 /* SDL_nullevents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_nullevents.c; sourceTree = "<group>"; };
 		00162F3509BE27FB0037C8D0 /* SDL_nullevents_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_nullevents_c.h; sourceTree = "<group>"; };
-		00162F3609BE27FB0037C8D0 /* SDL_nullmouse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_nullmouse.c; sourceTree = "<group>"; };
-		00162F3709BE27FB0037C8D0 /* SDL_nullmouse_c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_nullmouse_c.h; sourceTree = "<group>"; };
 		00162F3809BE27FB0037C8D0 /* SDL_nullvideo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_nullvideo.c; sourceTree = "<group>"; };
 		00162F3909BE27FB0037C8D0 /* SDL_nullvideo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_nullvideo.h; sourceTree = "<group>"; };
 		002F327609CA02D800EBEB88 /* libSDL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -648,36 +709,24 @@
 		01538332006D78D67F000001 /* SDL_audiodev.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_audiodev.c; sourceTree = "<group>"; };
 		01538334006D78D67F000001 /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = "<group>"; };
 		01538335006D78D67F000001 /* SDL_wave.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_wave.c; sourceTree = "<group>"; };
-		01538368006D79147F000001 /* SDL_active.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_active.c; sourceTree = "<group>"; };
 		01538369006D79147F000001 /* SDL_events.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_events.c; sourceTree = "<group>"; };
-		0153836A006D79147F000001 /* SDL_expose.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_expose.c; sourceTree = "<group>"; };
 		0153836B006D79147F000001 /* SDL_keyboard.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_keyboard.c; sourceTree = "<group>"; };
 		0153836C006D79147F000001 /* SDL_mouse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_mouse.c; sourceTree = "<group>"; };
 		0153836D006D79147F000001 /* SDL_quit.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_quit.c; sourceTree = "<group>"; };
-		0153836E006D79147F000001 /* SDL_resize.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_resize.c; sourceTree = "<group>"; };
 		01538377006D79307F000001 /* SDL_rwops.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_rwops.c; sourceTree = "<group>"; };
 		015383A0006D79BC7F000001 /* SDL_timer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_timer.c; sourceTree = "<group>"; };
-		015383C5006D7A567F000001 /* SDL_macevents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_macevents.c; sourceTree = "<group>"; };
-		015383C7006D7A567F000001 /* SDL_macgl.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_macgl.c; sourceTree = "<group>"; };
-		015383CA006D7A567F000001 /* SDL_macmouse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_macmouse.c; sourceTree = "<group>"; };
-		015383CC006D7A567F000001 /* SDL_macwm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_macwm.c; sourceTree = "<group>"; };
-		015383D1006D7A567F000001 /* SDL_dspvideo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_dspvideo.c; sourceTree = "<group>"; };
-		015383D2006D7A567F000001 /* SDL_dspvideo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_dspvideo.h; sourceTree = "<group>"; };
-		015383D6006D7A567F000001 /* SDL_romvideo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_romvideo.c; sourceTree = "<group>"; };
 		015383D8006D7A567F000001 /* SDL_blit.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_blit.c; sourceTree = "<group>"; };
 		015383DA006D7A567F000001 /* SDL_blit_0.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_blit_0.c; sourceTree = "<group>"; };
 		015383DB006D7A567F000001 /* SDL_blit_1.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_blit_1.c; sourceTree = "<group>"; };
 		015383DC006D7A567F000001 /* SDL_blit_A.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_blit_A.c; sourceTree = "<group>"; };
 		015383DE006D7A567F000001 /* SDL_blit_N.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_blit_N.c; sourceTree = "<group>"; };
 		015383DF006D7A567F000001 /* SDL_bmp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_bmp.c; sourceTree = "<group>"; };
-		015383E0006D7A567F000001 /* SDL_cursor.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_cursor.c; sourceTree = "<group>"; };
 		015383E2006D7A567F000001 /* SDL_gamma.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_gamma.c; sourceTree = "<group>"; };
 		015383E6006D7A567F000001 /* SDL_pixels.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_pixels.c; sourceTree = "<group>"; };
 		015383E8006D7A567F000001 /* SDL_RLEaccel.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_RLEaccel.c; sourceTree = "<group>"; };
 		015383EA006D7A567F000001 /* SDL_stretch.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_stretch.c; sourceTree = "<group>"; };
 		015383EC006D7A567F000001 /* SDL_surface.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_surface.c; sourceTree = "<group>"; };
 		015383EE006D7A567F000001 /* SDL_video.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_video.c; sourceTree = "<group>"; };
-		015383EF006D7A567F000001 /* SDL_yuv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_yuv.c; sourceTree = "<group>"; };
 		015383F1006D7A567F000001 /* SDL_yuv_sw.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_yuv_sw.c; sourceTree = "<group>"; };
 		01538438006D7D947F000001 /* SDL_error.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = SDL_error.c; path = ../../src/SDL_error.c; sourceTree = SOURCE_ROOT; };
 		01538439006D7D947F000001 /* SDL_fatal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = SDL_fatal.c; path = ../../src/SDL_fatal.c; sourceTree = SOURCE_ROOT; };
@@ -690,15 +739,12 @@
 		083E489D006D88D97F000001 /* SDL_joystick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_joystick.c; sourceTree = "<group>"; };
 		0C5AF5E501191D2B7F000001 /* begin_code.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = begin_code.h; path = ../../include/begin_code.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5E601191D2B7F000001 /* close_code.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = close_code.h; path = ../../include/close_code.h; sourceTree = SOURCE_ROOT; };
-		0C5AF5E701191D2B7F000001 /* SDL_active.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_active.h; path = ../../include/SDL_active.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5E801191D2B7F000001 /* SDL_audio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_audio.h; path = ../../include/SDL_audio.h; sourceTree = SOURCE_ROOT; };
-		0C5AF5E901191D2B7F000001 /* SDL_byteorder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_byteorder.h; path = ../../include/SDL_byteorder.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5EA01191D2B7F000001 /* SDL_cdrom.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_cdrom.h; path = ../../include/SDL_cdrom.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5EB01191D2B7F000001 /* SDL_copying.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_copying.h; path = ../../include/SDL_copying.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5EC01191D2B7F000001 /* SDL_endian.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_endian.h; path = ../../include/SDL_endian.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5ED01191D2B7F000001 /* SDL_error.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_error.h; path = ../../include/SDL_error.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5EE01191D2B7F000001 /* SDL_events.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_events.h; path = ../../include/SDL_events.h; sourceTree = SOURCE_ROOT; };
-		0C5AF5EF01191D2B7F000001 /* SDL_getenv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_getenv.h; path = ../../include/SDL_getenv.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5F001191D2B7F000001 /* SDL_joystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_joystick.h; path = ../../include/SDL_joystick.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_keyboard.h; path = ../../include/SDL_keyboard.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5F201191D2B7F000001 /* SDL_keysym.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_keysym.h; path = ../../include/SDL_keysym.h; sourceTree = SOURCE_ROOT; };
@@ -715,19 +761,6 @@
 		0C5AF5FD01191D2B7F000001 /* SDL_version.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_version.h; path = ../../include/SDL_version.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5FE01191D2B7F000001 /* SDL_video.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_video.h; path = ../../include/SDL_video.h; sourceTree = SOURCE_ROOT; };
 		0C5AF5FF01191D2B7F000001 /* SDL.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL.h; path = ../../include/SDL.h; sourceTree = SOURCE_ROOT; };
-		2EECDF2D0086C3A07F000001 /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDLMain.h; path = ../../src/main/macosx/SDLMain.h; sourceTree = SOURCE_ROOT; };
-		2EECDF2E0086C3A07F000001 /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SDLMain.m; path = ../../src/main/macosx/SDLMain.m; sourceTree = SOURCE_ROOT; };
-		2EECDF2F0086C3A07F000001 /* SDLMain.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SDLMain.nib; path = ../../src/main/macosx/SDLMain.nib; sourceTree = SOURCE_ROOT; };
-		B24DA4D605A88AD0006B9F1C /* CGS.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CGS.h; sourceTree = "<group>"; };
-		B24DA4D705A88AD0006B9F1C /* SDL_QuartzEvents.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDL_QuartzEvents.m; sourceTree = "<group>"; };
-		B24DA4D805A88AD0006B9F1C /* SDL_QuartzGL.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDL_QuartzGL.m; sourceTree = "<group>"; };
-		B24DA4D905A88AD0006B9F1C /* SDL_QuartzKeys.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_QuartzKeys.h; sourceTree = "<group>"; };
-		B24DA4DA05A88AD0006B9F1C /* SDL_QuartzVideo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_QuartzVideo.h; sourceTree = "<group>"; };
-		B24DA4DB05A88AD0006B9F1C /* SDL_QuartzVideo.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDL_QuartzVideo.m; sourceTree = "<group>"; };
-		B24DA4DC05A88AD0006B9F1C /* SDL_QuartzWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDL_QuartzWindow.h; sourceTree = "<group>"; };
-		B24DA4DD05A88AD0006B9F1C /* SDL_QuartzWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDL_QuartzWindow.m; sourceTree = "<group>"; };
-		B24DA4DE05A88AD0006B9F1C /* SDL_QuartzWM.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDL_QuartzWM.m; sourceTree = "<group>"; };
-		B24DA4DF05A88AD0006B9F1C /* SDL_QuartzYUV.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDL_QuartzYUV.m; sourceTree = "<group>"; };
 		B24DA50405A88D52006B9F1C /* SDL_cpuinfo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_cpuinfo.c; sourceTree = "<group>"; };
 		B29A290D04E5B28700A80002 /* SDL_loadso.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_loadso.h; path = ../../include/SDL_loadso.h; sourceTree = "<group>"; };
 		B2A23A450415799100A80002 /* AudioFilePlayer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AudioFilePlayer.h; sourceTree = "<group>"; };
@@ -741,9 +774,78 @@
 		BECDF66B0761BA81005FE872 /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-Framework.plist"; sourceTree = "<group>"; };
 		BECDF66C0761BA81005FE872 /* SDL.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		BECDF6B30761BA81005FE872 /* libSDL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		BECDF6BA0761BA81005FE872 /* libSDLmain.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDLmain.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		BECDF6BE0761BA81005FE872 /* Standard DMG */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = "Standard DMG"; sourceTree = BUILT_PRODUCTS_DIR; };
-		BECDF6C30761BA81005FE872 /* Developer Extras Package */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = "Developer Extras Package"; sourceTree = BUILT_PRODUCTS_DIR; };
+		BECDF6BE0761BA81005FE872 /* Standard DMG */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Standard DMG"; sourceTree = BUILT_PRODUCTS_DIR; };
+		BECDF6C30761BA81005FE872 /* Developer Extras Package */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Developer Extras Package"; sourceTree = BUILT_PRODUCTS_DIR; };
+		F317F3B80C789CCE00411C95 /* SDL_blit_auto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blit_auto.c; sourceTree = "<group>"; };
+		F317F3BA0C789CCE00411C95 /* SDL_blit_copy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blit_copy.c; sourceTree = "<group>"; };
+		F317F3BC0C789CCE00411C95 /* SDL_blit_slow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blit_slow.c; sourceTree = "<group>"; };
+		F317F3BE0C789CCF00411C95 /* SDL_fill.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_fill.c; sourceTree = "<group>"; };
+		F317F44C0C789F2600411C95 /* SDL_compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_compat.c; path = ../../src/SDL_compat.c; sourceTree = SOURCE_ROOT; };
+		F38109E20D27B07E002DA2C1 /* imKStoUCS.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = imKStoUCS.c; sourceTree = "<group>"; };
+		F3A40F4F0C5CE1B200BB2308 /* SDL.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		F3C832DE0DCDAE7200B01593 /* SDL_scancode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_scancode.h; path = ../../include/SDL_scancode.h; sourceTree = SOURCE_ROOT; };
+		F3C833480DCDBDF900B01593 /* SDL_pixels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_pixels.h; path = ../../include/SDL_pixels.h; sourceTree = SOURCE_ROOT; };
+		F3C8334F0DCDBE3B00B01593 /* SDL_rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_rect.h; path = ../../include/SDL_rect.h; sourceTree = SOURCE_ROOT; };
+		F3C833540DCDBE8400B01593 /* SDL_surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_surface.h; path = ../../include/SDL_surface.h; sourceTree = SOURCE_ROOT; };
+		F3C8348F0DD22A4D00B01593 /* imKStoUCS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imKStoUCS.h; sourceTree = "<group>"; };
+		F3C834900DD22A4D00B01593 /* SDL_x11events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11events.h; sourceTree = "<group>"; };
+		F3C834910DD22A4D00B01593 /* SDL_x11gamma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11gamma.h; sourceTree = "<group>"; };
+		F3C834920DD22A4D00B01593 /* SDL_x11keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11keyboard.h; sourceTree = "<group>"; };
+		F3C834930DD22A4D00B01593 /* SDL_x11modes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11modes.h; sourceTree = "<group>"; };
+		F3C834940DD22A4D00B01593 /* SDL_x11mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11mouse.h; sourceTree = "<group>"; };
+		F3C834950DD22A4D00B01593 /* SDL_x11opengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11opengl.h; sourceTree = "<group>"; };
+		F3C834960DD22A4D00B01593 /* SDL_x11window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_x11window.h; sourceTree = "<group>"; };
+		F3C834BC0DD22C4300B01593 /* e_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = e_log.h; sourceTree = "<group>"; };
+		F3C834BD0DD22C4300B01593 /* e_pow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = e_pow.h; sourceTree = "<group>"; };
+		F3C834BE0DD22C4300B01593 /* e_sqrt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = e_sqrt.h; sourceTree = "<group>"; };
+		F3C834BF0DD22C4300B01593 /* math_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math_private.h; sourceTree = "<group>"; };
+		F3C834C00DD22C4300B01593 /* mmx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mmx.h; sourceTree = "<group>"; };
+		F3C834C10DD22C4300B01593 /* SDL_blit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_blit.h; sourceTree = "<group>"; };
+		F3C834C20DD22C4300B01593 /* SDL_blit_auto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_blit_auto.h; sourceTree = "<group>"; };
+		F3C834C30DD22C4300B01593 /* SDL_blit_copy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_blit_copy.h; sourceTree = "<group>"; };
+		F3C834C40DD22C4300B01593 /* SDL_glfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_glfuncs.h; sourceTree = "<group>"; };
+		F3C834C50DD22C4300B01593 /* SDL_leaks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_leaks.h; sourceTree = "<group>"; };
+		F3C834C60DD22C4300B01593 /* SDL_pixels_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_pixels_c.h; sourceTree = "<group>"; };
+		F3C834C70DD22C4300B01593 /* SDL_rect_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rect_c.h; sourceTree = "<group>"; };
+		F3C834C80DD22C4300B01593 /* SDL_renderer_gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_renderer_gl.h; sourceTree = "<group>"; };
+		F3C834C90DD22C4300B01593 /* SDL_renderer_sw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_renderer_sw.h; sourceTree = "<group>"; };
+		F3C834CA0DD22C4300B01593 /* SDL_RLEaccel_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_RLEaccel_c.h; sourceTree = "<group>"; };
+		F3C834CB0DD22C4300B01593 /* SDL_stretch_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_stretch_c.h; sourceTree = "<group>"; };
+		F3C834CC0DD22C4300B01593 /* SDL_sysvideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysvideo.h; sourceTree = "<group>"; };
+		F3C834CD0DD22C4300B01593 /* SDL_yuv_sw_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_yuv_sw_c.h; sourceTree = "<group>"; };
+		F3DEB5820C57E0D4003E2527 /* SDL_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_compat.h; path = ../../include/SDL_compat.h; sourceTree = SOURCE_ROOT; };
+		F3DEB5880C57E182003E2527 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = "<group>"; };
+		F3DEB58D0C57E1EA003E2527 /* SDL_windowevents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_windowevents.c; sourceTree = "<group>"; };
+		F3DEB59C0C57E282003E2527 /* SDL_rect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rect.c; sourceTree = "<group>"; };
+		F3DEB59E0C57E282003E2527 /* SDL_renderer_gl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_renderer_gl.c; sourceTree = "<group>"; };
+		F3DEB59F0C57E282003E2527 /* SDL_renderer_sw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_renderer_sw.c; sourceTree = "<group>"; };
+		F3DEB5B20C57E2BF003E2527 /* SDL_cocoaevents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoaevents.m; sourceTree = "<group>"; };
+		F3DEB5B40C57E2BF003E2527 /* SDL_cocoakeyboard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoakeyboard.m; sourceTree = "<group>"; };
+		F3DEB5B70C57E2BF003E2527 /* SDL_cocoamodes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoamodes.m; sourceTree = "<group>"; };
+		F3DEB5B90C57E2BF003E2527 /* SDL_cocoamouse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoamouse.m; sourceTree = "<group>"; };
+		F3DEB5BB0C57E2BF003E2527 /* SDL_cocoaopengl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoaopengl.m; sourceTree = "<group>"; };
+		F3DEB5BD0C57E2BF003E2527 /* SDL_cocoavideo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoavideo.m; sourceTree = "<group>"; };
+		F3DEB5BF0C57E2BF003E2527 /* SDL_cocoawindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_cocoawindow.m; sourceTree = "<group>"; };
+		F3DEB6190C57E321003E2527 /* SDL_nullrender_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_nullrender_c.h; sourceTree = "<group>"; };
+		F3DEB61A0C57E321003E2527 /* SDL_nullrender.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_nullrender.c; sourceTree = "<group>"; };
+		F3DEB6230C57E360003E2527 /* SDL_cocoaevents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cocoaevents.h; sourceTree = "<group>"; };
+		F3DEB6240C57E360003E2527 /* SDL_cocoakeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cocoakeyboard.h; sourceTree = "<group>"; };
+		F3DEB6260C57E360003E2527 /* SDL_cocoamodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cocoamodes.h; sourceTree = "<group>"; };
+		F3DEB6270C57E360003E2527 /* SDL_cocoamouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cocoamouse.h; sourceTree = "<group>"; };
+		F3DEB6280C57E360003E2527 /* SDL_cocoaopengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cocoaopengl.h; sourceTree = "<group>"; };
+		F3DEB6290C57E360003E2527 /* SDL_cocoavideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cocoavideo.h; sourceTree = "<group>"; };
+		F3DEB62A0C57E360003E2527 /* SDL_cocoawindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_cocoawindow.h; sourceTree = "<group>"; };
+		F3DEB6300C57E3C4003E2527 /* SDL_x11keyboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_x11keyboard.c; sourceTree = "<group>"; };
+		F3DEB6310C57E3C4003E2527 /* SDL_x11opengl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_x11opengl.c; sourceTree = "<group>"; };
+		F3DEB6320C57E3C4003E2527 /* SDL_x11window.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_x11window.c; sourceTree = "<group>"; };
+		F3DEB6410C57E483003E2527 /* AllCmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = AllCmap.c; sourceTree = "<group>"; };
+		F3DEB6420C57E483003E2527 /* CmapAlloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CmapAlloc.c; sourceTree = "<group>"; };
+		F3DEB6430C57E483003E2527 /* CrCmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CrCmap.c; sourceTree = "<group>"; };
+		F3DEB6440C57E483003E2527 /* DelCmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DelCmap.c; sourceTree = "<group>"; };
+		F3DEB6450C57E483003E2527 /* Distinct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Distinct.c; sourceTree = "<group>"; };
+		F3DEB6460C57E483003E2527 /* LookupCmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = LookupCmap.c; sourceTree = "<group>"; };
+		F3DEB6470C57E483003E2527 /* StdCmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = StdCmap.c; sourceTree = "<group>"; };
+		F3DEB6480C57E483003E2527 /* VisCmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = VisCmap.c; sourceTree = "<group>"; };
 		F51789D101769A2401D3D55B /* SDL_sysjoystick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_sysjoystick.c; sourceTree = "<group>"; };
 		F59C70FF00D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
 		F59C710000D5CB5801000001 /* Welcome.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Welcome.txt; sourceTree = "<group>"; };
@@ -817,63 +919,33 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BECDF6B80761BA81005FE872 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				007317B00858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */,
-				007317B10858DECD00B2BC32 /* AudioUnit.framework in Frameworks */,
-				007317B20858DECD00B2BC32 /* Cocoa.framework in Frameworks */,
-				007317B30858DECD00B2BC32 /* CoreAudio.framework in Frameworks */,
-				007317B40858DECD00B2BC32 /* IOKit.framework in Frameworks */,
-				007317B50858DECD00B2BC32 /* OpenGL.framework in Frameworks */,
-				007317B60858DECD00B2BC32 /* QuickTime.framework in Frameworks */,
-				007317C40858E15000B2BC32 /* Carbon.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		0014B7D809C0D808003A99D5 /* dga */ = {
-			isa = PBXGroup;
-			children = (
-				0014B7E809C0D8D2003A99D5 /* SDL_dgaevents_c.h */,
-				0014B7E909C0D8D2003A99D5 /* SDL_dgaevents.c */,
-				0014B7EA09C0D8D2003A99D5 /* SDL_dgamouse_c.h */,
-				0014B7EB09C0D8D2003A99D5 /* SDL_dgamouse.c */,
-				0014B7EC09C0D8D2003A99D5 /* SDL_dgavideo.c */,
-				0014B7ED09C0D8D2003A99D5 /* SDL_dgavideo.h */,
-			);
-			path = dga;
-			sourceTree = "<group>";
-		};
 		0014B83109C0D91E003A99D5 /* x11 */ = {
 			isa = PBXGroup;
 			children = (
-				0014B83709C0D977003A99D5 /* SDL_x11dga_c.h */,
-				0014B83809C0D977003A99D5 /* SDL_x11dga.c */,
+				F38109E20D27B07E002DA2C1 /* imKStoUCS.c */,
+				F3C8348F0DD22A4D00B01593 /* imKStoUCS.h */,
 				0014B83909C0D977003A99D5 /* SDL_x11dyn.c */,
 				0014B83A09C0D977003A99D5 /* SDL_x11dyn.h */,
-				0014B83B09C0D977003A99D5 /* SDL_x11events_c.h */,
 				0014B83C09C0D977003A99D5 /* SDL_x11events.c */,
-				0014B83D09C0D977003A99D5 /* SDL_x11gamma_c.h */,
+				F3C834900DD22A4D00B01593 /* SDL_x11events.h */,
 				0014B83E09C0D977003A99D5 /* SDL_x11gamma.c */,
-				0014B83F09C0D977003A99D5 /* SDL_x11gl_c.h */,
-				0014B84009C0D977003A99D5 /* SDL_x11gl.c */,
-				0014B84109C0D977003A99D5 /* SDL_x11image_c.h */,
-				0014B84209C0D977003A99D5 /* SDL_x11image.c */,
-				0014B84309C0D977003A99D5 /* SDL_x11modes_c.h */,
+				F3C834910DD22A4D00B01593 /* SDL_x11gamma.h */,
+				F3DEB6300C57E3C4003E2527 /* SDL_x11keyboard.c */,
+				F3C834920DD22A4D00B01593 /* SDL_x11keyboard.h */,
 				0014B84409C0D977003A99D5 /* SDL_x11modes.c */,
-				0014B84509C0D977003A99D5 /* SDL_x11mouse_c.h */,
+				F3C834930DD22A4D00B01593 /* SDL_x11modes.h */,
 				0014B84609C0D977003A99D5 /* SDL_x11mouse.c */,
+				F3C834940DD22A4D00B01593 /* SDL_x11mouse.h */,
+				F3DEB6310C57E3C4003E2527 /* SDL_x11opengl.c */,
+				F3C834950DD22A4D00B01593 /* SDL_x11opengl.h */,
 				0014B84709C0D977003A99D5 /* SDL_x11sym.h */,
 				0014B84809C0D977003A99D5 /* SDL_x11video.c */,
 				0014B84909C0D977003A99D5 /* SDL_x11video.h */,
-				0014B84A09C0D977003A99D5 /* SDL_x11wm_c.h */,
-				0014B84B09C0D977003A99D5 /* SDL_x11wm.c */,
-				0014B84C09C0D977003A99D5 /* SDL_x11yuv_c.h */,
-				0014B84D09C0D977003A99D5 /* SDL_x11yuv.c */,
+				F3DEB6320C57E3C4003E2527 /* SDL_x11window.c */,
+				F3C834960DD22A4D00B01593 /* SDL_x11window.h */,
 			);
 			path = x11;
 			sourceTree = "<group>";
@@ -881,24 +953,15 @@
 		0014B87D09C0D98A003A99D5 /* Xext */ = {
 			isa = PBXGroup;
 			children = (
-				0014B87E09C0D9BD003A99D5 /* Xxf86dga */,
 				0014B87F09C0D9D1003A99D5 /* Xxf86vm */,
 				0014B88309C0DA1A003A99D5 /* Xv */,
 				0014B88209C0DA0F003A99D5 /* Xinerama */,
 				0014B88109C0DA04003A99D5 /* XME */,
+				F3DEB6400C57E483003E2527 /* XmuStdCmap */,
 			);
 			path = Xext;
 			sourceTree = "<group>";
 		};
-		0014B87E09C0D9BD003A99D5 /* Xxf86dga */ = {
-			isa = PBXGroup;
-			children = (
-				0014B89009C0DA94003A99D5 /* XF86DGA.c */,
-				0014B89109C0DA94003A99D5 /* XF86DGA2.c */,
-			);
-			path = Xxf86dga;
-			sourceTree = "<group>";
-		};
 		0014B87F09C0D9D1003A99D5 /* Xxf86vm */ = {
 			isa = PBXGroup;
 			children = (
@@ -982,8 +1045,8 @@
 			children = (
 				00162F3409BE27FB0037C8D0 /* SDL_nullevents.c */,
 				00162F3509BE27FB0037C8D0 /* SDL_nullevents_c.h */,
-				00162F3609BE27FB0037C8D0 /* SDL_nullmouse.c */,
-				00162F3709BE27FB0037C8D0 /* SDL_nullmouse_c.h */,
+				F3DEB61A0C57E321003E2527 /* SDL_nullrender.c */,
+				F3DEB6190C57E321003E2527 /* SDL_nullrender_c.h */,
 				00162F3809BE27FB0037C8D0 /* SDL_nullvideo.c */,
 				00162F3909BE27FB0037C8D0 /* SDL_nullvideo.h */,
 			);
@@ -1026,6 +1089,7 @@
 				01538330006D78D67F000001 /* SDL_audio.c */,
 				01538331006D78D67F000001 /* SDL_audiocvt.c */,
 				01538332006D78D67F000001 /* SDL_audiodev.c */,
+				F3DEB5880C57E182003E2527 /* SDL_audiotypecvt.c */,
 				01538334006D78D67F000001 /* SDL_mixer.c */,
 				00B7E61F097F2D9E00826121 /* SDL_mixer_MMX.c */,
 				00B7E620097F2D9E00826121 /* SDL_mixer_MMX.h */,
@@ -1046,13 +1110,11 @@
 		01538367006D79147F000001 /* events */ = {
 			isa = PBXGroup;
 			children = (
-				01538368006D79147F000001 /* SDL_active.c */,
 				01538369006D79147F000001 /* SDL_events.c */,
-				0153836A006D79147F000001 /* SDL_expose.c */,
 				0153836B006D79147F000001 /* SDL_keyboard.c */,
 				0153836C006D79147F000001 /* SDL_mouse.c */,
 				0153836D006D79147F000001 /* SDL_quit.c */,
-				0153836E006D79147F000001 /* SDL_resize.c */,
+				F3DEB58D0C57E1EA003E2527 /* SDL_windowevents.c */,
 			);
 			name = events;
 			path = ../../src/events;
@@ -1090,87 +1152,70 @@
 		015383BE006D7A567F000001 /* video */ = {
 			isa = PBXGroup;
 			children = (
-				0FCDF5B50083FCE77F000001 /* quartz */,
-				015383C1006D7A567F000001 /* maccommon */,
-				015383CE006D7A567F000001 /* macdsp */,
-				015383D3006D7A567F000001 /* macrom */,
+				F3DEB5B00C57E2BF003E2527 /* cocoa */,
 				00162F3209BE27FB0037C8D0 /* dummy */,
 				0014B83109C0D91E003A99D5 /* x11 */,
-				0014B7D809C0D808003A99D5 /* dga */,
 				0014B87D09C0D98A003A99D5 /* Xext */,
+				F3C834BC0DD22C4300B01593 /* e_log.h */,
+				F3C834BD0DD22C4300B01593 /* e_pow.h */,
+				F3C834BE0DD22C4300B01593 /* e_sqrt.h */,
+				F3C834BF0DD22C4300B01593 /* math_private.h */,
+				F3C834C00DD22C4300B01593 /* mmx.h */,
 				015383D8006D7A567F000001 /* SDL_blit.c */,
+				F3C834C10DD22C4300B01593 /* SDL_blit.h */,
 				015383DA006D7A567F000001 /* SDL_blit_0.c */,
 				015383DB006D7A567F000001 /* SDL_blit_1.c */,
 				015383DC006D7A567F000001 /* SDL_blit_A.c */,
 				015383DE006D7A567F000001 /* SDL_blit_N.c */,
+				F317F3B80C789CCE00411C95 /* SDL_blit_auto.c */,
+				F3C834C20DD22C4300B01593 /* SDL_blit_auto.h */,
+				F317F3BA0C789CCE00411C95 /* SDL_blit_copy.c */,
+				F3C834C30DD22C4300B01593 /* SDL_blit_copy.h */,
+				F317F3BC0C789CCE00411C95 /* SDL_blit_slow.c */,
 				015383DF006D7A567F000001 /* SDL_bmp.c */,
-				015383E0006D7A567F000001 /* SDL_cursor.c */,
+				F317F3BE0C789CCF00411C95 /* SDL_fill.c */,
 				015383E2006D7A567F000001 /* SDL_gamma.c */,
+				F3C834C40DD22C4300B01593 /* SDL_glfuncs.h */,
+				F3C834C50DD22C4300B01593 /* SDL_leaks.h */,
 				015383E6006D7A567F000001 /* SDL_pixels.c */,
+				F3C834C60DD22C4300B01593 /* SDL_pixels_c.h */,
+				F3DEB59C0C57E282003E2527 /* SDL_rect.c */,
+				F3C834C70DD22C4300B01593 /* SDL_rect_c.h */,
+				F3DEB59E0C57E282003E2527 /* SDL_renderer_gl.c */,
+				F3C834C80DD22C4300B01593 /* SDL_renderer_gl.h */,
+				F3DEB59F0C57E282003E2527 /* SDL_renderer_sw.c */,
+				F3C834C90DD22C4300B01593 /* SDL_renderer_sw.h */,
 				015383E8006D7A567F000001 /* SDL_RLEaccel.c */,
+				F3C834CA0DD22C4300B01593 /* SDL_RLEaccel_c.h */,
 				015383EA006D7A567F000001 /* SDL_stretch.c */,
+				F3C834CB0DD22C4300B01593 /* SDL_stretch_c.h */,
 				015383EC006D7A567F000001 /* SDL_surface.c */,
+				F3C834CC0DD22C4300B01593 /* SDL_sysvideo.h */,
 				015383EE006D7A567F000001 /* SDL_video.c */,
-				015383EF006D7A567F000001 /* SDL_yuv.c */,
 				00B7E625097F2DD100826121 /* SDL_yuv_mmx.c */,
 				015383F1006D7A567F000001 /* SDL_yuv_sw.c */,
+				F3C834CD0DD22C4300B01593 /* SDL_yuv_sw_c.h */,
 			);
 			name = video;
 			path = ../../src/video;
 			sourceTree = SOURCE_ROOT;
 		};
-		015383C1006D7A567F000001 /* maccommon */ = {
-			isa = PBXGroup;
-			children = (
-				015383C5006D7A567F000001 /* SDL_macevents.c */,
-				015383C7006D7A567F000001 /* SDL_macgl.c */,
-				015383CA006D7A567F000001 /* SDL_macmouse.c */,
-				015383CC006D7A567F000001 /* SDL_macwm.c */,
-			);
-			path = maccommon;
-			sourceTree = "<group>";
-		};
-		015383CE006D7A567F000001 /* macdsp */ = {
-			isa = PBXGroup;
-			children = (
-				015383D1006D7A567F000001 /* SDL_dspvideo.c */,
-				015383D2006D7A567F000001 /* SDL_dspvideo.h */,
-			);
-			path = macdsp;
-			sourceTree = "<group>";
-		};
-		015383D3006D7A567F000001 /* macrom */ = {
-			isa = PBXGroup;
-			children = (
-				015383D6006D7A567F000001 /* SDL_romvideo.c */,
-			);
-			path = macrom;
-			sourceTree = "<group>";
-		};
 		0153844A006D81B07F000001 /* Public Headers */ = {
 			isa = PBXGroup;
 			children = (
-				00162D3109BD1FA80037C8D0 /* SDL_config_amiga.h */,
-				00162D3209BD1FA90037C8D0 /* SDL_config_dreamcast.h */,
-				00162D3309BD1FA90037C8D0 /* SDL_config_macos.h */,
 				00162D3409BD1FA90037C8D0 /* SDL_config_macosx.h */,
-				00162D3509BD1FA90037C8D0 /* SDL_config_os2.h */,
-				00162D3609BD1FA90037C8D0 /* SDL_config_win32.h */,
 				00162D3709BD1FA90037C8D0 /* SDL_config.h */,
-				00162D3809BD1FA90037C8D0 /* SDL_platform.h */,
 				00162D3909BD1FA90037C8D0 /* SDL_stdinc.h */,
 				0C5AF5E501191D2B7F000001 /* begin_code.h */,
 				0C5AF5E601191D2B7F000001 /* close_code.h */,
-				0C5AF5E701191D2B7F000001 /* SDL_active.h */,
 				0C5AF5E801191D2B7F000001 /* SDL_audio.h */,
-				0C5AF5E901191D2B7F000001 /* SDL_byteorder.h */,
 				0C5AF5EA01191D2B7F000001 /* SDL_cdrom.h */,
+				F3DEB5820C57E0D4003E2527 /* SDL_compat.h */,
 				0C5AF5EB01191D2B7F000001 /* SDL_copying.h */,
 				B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */,
 				0C5AF5EC01191D2B7F000001 /* SDL_endian.h */,
 				0C5AF5ED01191D2B7F000001 /* SDL_error.h */,
 				0C5AF5EE01191D2B7F000001 /* SDL_events.h */,
-				0C5AF5EF01191D2B7F000001 /* SDL_getenv.h */,
 				0C5AF5F001191D2B7F000001 /* SDL_joystick.h */,
 				0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */,
 				0C5AF5F201191D2B7F000001 /* SDL_keysym.h */,
@@ -1180,8 +1225,13 @@
 				0C5AF5F501191D2B7F000001 /* SDL_mutex.h */,
 				B2CF8DC705C4450500E5DC7F /* SDL_name.h */,
 				0C5AF5F601191D2B7F000001 /* SDL_opengl.h */,
+				00162D3809BD1FA90037C8D0 /* SDL_platform.h */,
+				F3C833480DCDBDF900B01593 /* SDL_pixels.h */,
 				0C5AF5F701191D2B7F000001 /* SDL_quit.h */,
+				F3C8334F0DCDBE3B00B01593 /* SDL_rect.h */,
 				0C5AF5F801191D2B7F000001 /* SDL_rwops.h */,
+				F3C832DE0DCDAE7200B01593 /* SDL_scancode.h */,
+				F3C833540DCDBE8400B01593 /* SDL_surface.h */,
 				0C5AF5F901191D2B7F000001 /* SDL_syswm.h */,
 				0C5AF5FA01191D2B7F000001 /* SDL_thread.h */,
 				0C5AF5FB01191D2B7F000001 /* SDL_timer.h */,
@@ -1199,11 +1249,10 @@
 				089C1665FE841158C02AAC07 /* Resources */,
 				BECDF66C0761BA81005FE872 /* SDL.framework */,
 				BECDF6B30761BA81005FE872 /* libSDL.a */,
-				BECDF6BA0761BA81005FE872 /* libSDLmain.a */,
 				BECDF6BE0761BA81005FE872 /* Standard DMG */,
 				BECDF6C30761BA81005FE872 /* Developer Extras Package */,
-				0014B9A809C0E585003A99D5 /* SDL.framework */,
 				002F327609CA02D800EBEB88 /* libSDL.a */,
+				F3A40F4F0C5CE1B200BB2308 /* SDL.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1251,7 +1300,6 @@
 				F5A2EF3900C6A39A01000001 /* BUGS */,
 				F5A2EF3A00C6A3C201000001 /* README.MacOSX */,
 				F59C70FC00D5CB5801000001 /* pkg-support */,
-				F5B2A58400C5D39001000001 /* Main */,
 				0153844A006D81B07F000001 /* Public Headers */,
 				08FB77ACFE841707C02AAC07 /* Library Source */,
 				034768DDFF38A45A11DB9C8B /* Products */,
@@ -1287,28 +1335,11 @@
 				01538438006D7D947F000001 /* SDL_error.c */,
 				01538439006D7D947F000001 /* SDL_fatal.c */,
 				0153843C006D7D947F000001 /* SDL.c */,
+				F317F44C0C789F2600411C95 /* SDL_compat.c */,
 			);
 			name = "Library Source";
 			sourceTree = "<group>";
 		};
-		0FCDF5B50083FCE77F000001 /* quartz */ = {
-			isa = PBXGroup;
-			children = (
-				B24DA4D605A88AD0006B9F1C /* CGS.h */,
-				B24DA4D705A88AD0006B9F1C /* SDL_QuartzEvents.m */,
-				B24DA4D805A88AD0006B9F1C /* SDL_QuartzGL.m */,
-				B24DA4D905A88AD0006B9F1C /* SDL_QuartzKeys.h */,
-				B24DA4DA05A88AD0006B9F1C /* SDL_QuartzVideo.h */,
-				B24DA4DB05A88AD0006B9F1C /* SDL_QuartzVideo.m */,
-				B24DA4DC05A88AD0006B9F1C /* SDL_QuartzWindow.h */,
-				B24DA4DD05A88AD0006B9F1C /* SDL_QuartzWindow.m */,
-				B24DA4DE05A88AD0006B9F1C /* SDL_QuartzWM.m */,
-				B24DA4DF05A88AD0006B9F1C /* SDL_QuartzYUV.m */,
-			);
-			name = quartz;
-			path = ../../src/video/quartz;
-			sourceTree = SOURCE_ROOT;
-		};
 		B24DA50105A88D52006B9F1C /* cpuinfo */ = {
 			isa = PBXGroup;
 			children = (
@@ -1359,6 +1390,42 @@
 			path = ../../src/audio/macosx;
 			sourceTree = SOURCE_ROOT;
 		};
+		F3DEB5B00C57E2BF003E2527 /* cocoa */ = {
+			isa = PBXGroup;
+			children = (
+				F3DEB6230C57E360003E2527 /* SDL_cocoaevents.h */,
+				F3DEB5B20C57E2BF003E2527 /* SDL_cocoaevents.m */,
+				F3DEB6240C57E360003E2527 /* SDL_cocoakeyboard.h */,
+				F3DEB5B40C57E2BF003E2527 /* SDL_cocoakeyboard.m */,
+				F3DEB6260C57E360003E2527 /* SDL_cocoamodes.h */,
+				F3DEB5B70C57E2BF003E2527 /* SDL_cocoamodes.m */,
+				F3DEB6270C57E360003E2527 /* SDL_cocoamouse.h */,
+				F3DEB5B90C57E2BF003E2527 /* SDL_cocoamouse.m */,
+				F3DEB6280C57E360003E2527 /* SDL_cocoaopengl.h */,
+				F3DEB5BB0C57E2BF003E2527 /* SDL_cocoaopengl.m */,
+				F3DEB6290C57E360003E2527 /* SDL_cocoavideo.h */,
+				F3DEB5BD0C57E2BF003E2527 /* SDL_cocoavideo.m */,
+				F3DEB62A0C57E360003E2527 /* SDL_cocoawindow.h */,
+				F3DEB5BF0C57E2BF003E2527 /* SDL_cocoawindow.m */,
+			);
+			path = cocoa;
+			sourceTree = "<group>";
+		};
+		F3DEB6400C57E483003E2527 /* XmuStdCmap */ = {
+			isa = PBXGroup;
+			children = (
+				F3DEB6410C57E483003E2527 /* AllCmap.c */,
+				F3DEB6420C57E483003E2527 /* CmapAlloc.c */,
+				F3DEB6430C57E483003E2527 /* CrCmap.c */,
+				F3DEB6440C57E483003E2527 /* DelCmap.c */,
+				F3DEB6450C57E483003E2527 /* Distinct.c */,
+				F3DEB6460C57E483003E2527 /* LookupCmap.c */,
+				F3DEB6470C57E483003E2527 /* StdCmap.c */,
+				F3DEB6480C57E483003E2527 /* VisCmap.c */,
+			);
+			path = XmuStdCmap;
+			sourceTree = "<group>";
+		};
 		F51789D001769A2401D3D55B /* darwin */ = {
 			isa = PBXGroup;
 			children = (
@@ -1401,16 +1468,6 @@
 			path = resources;
 			sourceTree = "<group>";
 		};
-		F5B2A58400C5D39001000001 /* Main */ = {
-			isa = PBXGroup;
-			children = (
-				2EECDF2D0086C3A07F000001 /* SDLMain.h */,
-				2EECDF2E0086C3A07F000001 /* SDLMain.m */,
-				2EECDF2F0086C3A07F000001 /* SDLMain.nib */,
-			);
-			name = Main;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -1418,27 +1475,19 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0014B91B09C0E585003A99D5 /* SDL_config_amiga.h in Headers */,
-				0014B91C09C0E585003A99D5 /* SDL_config_dreamcast.h in Headers */,
-				0014B91D09C0E585003A99D5 /* SDL_config_macos.h in Headers */,
 				0014B91E09C0E585003A99D5 /* SDL_config_macosx.h in Headers */,
-				0014B91F09C0E585003A99D5 /* SDL_config_os2.h in Headers */,
-				0014B92009C0E585003A99D5 /* SDL_config_win32.h in Headers */,
 				0014B92109C0E585003A99D5 /* SDL_config.h in Headers */,
 				0014B92209C0E585003A99D5 /* SDL_platform.h in Headers */,
 				0014B92309C0E585003A99D5 /* SDL_stdinc.h in Headers */,
 				0014B92409C0E585003A99D5 /* begin_code.h in Headers */,
 				0014B92509C0E585003A99D5 /* close_code.h in Headers */,
-				0014B92609C0E585003A99D5 /* SDL_active.h in Headers */,
 				0014B92709C0E585003A99D5 /* SDL_audio.h in Headers */,
-				0014B92809C0E585003A99D5 /* SDL_byteorder.h in Headers */,
 				0014B92909C0E585003A99D5 /* SDL_cdrom.h in Headers */,
 				0014B92A09C0E585003A99D5 /* SDL_copying.h in Headers */,
 				0014B92B09C0E585003A99D5 /* SDL_cpuinfo.h in Headers */,
 				0014B92C09C0E585003A99D5 /* SDL_endian.h in Headers */,
 				0014B92D09C0E585003A99D5 /* SDL_error.h in Headers */,
 				0014B92E09C0E585003A99D5 /* SDL_events.h in Headers */,
-				0014B92F09C0E585003A99D5 /* SDL_getenv.h in Headers */,
 				0014B93009C0E585003A99D5 /* SDL_joystick.h in Headers */,
 				0014B93109C0E585003A99D5 /* SDL_keyboard.h in Headers */,
 				0014B93209C0E585003A99D5 /* SDL_keysym.h in Headers */,
@@ -1457,6 +1506,39 @@
 				0014B93F09C0E585003A99D5 /* SDL_version.h in Headers */,
 				0014B94009C0E585003A99D5 /* SDL_video.h in Headers */,
 				0014B94109C0E585003A99D5 /* SDL.h in Headers */,
+				F3DEB5850C57E0D4003E2527 /* SDL_compat.h in Headers */,
+				F3C832E20DCDAE7200B01593 /* SDL_scancode.h in Headers */,
+				F3C8334C0DCDBDF900B01593 /* SDL_pixels.h in Headers */,
+				F3C833530DCDBE3B00B01593 /* SDL_rect.h in Headers */,
+				F3C833580DCDBE8400B01593 /* SDL_surface.h in Headers */,
+				F3C835040DD22C4300B01593 /* e_log.h in Headers */,
+				F3C835050DD22C4300B01593 /* e_pow.h in Headers */,
+				F3C835060DD22C4300B01593 /* e_sqrt.h in Headers */,
+				F3C835070DD22C4300B01593 /* math_private.h in Headers */,
+				F3C835080DD22C4300B01593 /* mmx.h in Headers */,
+				F3C835090DD22C4300B01593 /* SDL_blit.h in Headers */,
+				F3C8350A0DD22C4300B01593 /* SDL_blit_auto.h in Headers */,
+				F3C8350B0DD22C4300B01593 /* SDL_blit_copy.h in Headers */,
+				F3C8350C0DD22C4300B01593 /* SDL_glfuncs.h in Headers */,
+				F3C8350D0DD22C4300B01593 /* SDL_leaks.h in Headers */,
+				F3C8350E0DD22C4300B01593 /* SDL_pixels_c.h in Headers */,
+				F3C8350F0DD22C4300B01593 /* SDL_rect_c.h in Headers */,
+				F3C835100DD22C4300B01593 /* SDL_renderer_gl.h in Headers */,
+				F3C835110DD22C4300B01593 /* SDL_renderer_sw.h in Headers */,
+				F3C835120DD22C4300B01593 /* SDL_RLEaccel_c.h in Headers */,
+				F3C835130DD22C4300B01593 /* SDL_stretch_c.h in Headers */,
+				F3C835140DD22C4300B01593 /* SDL_sysvideo.h in Headers */,
+				F3C835150DD22C4300B01593 /* SDL_yuv_sw_c.h in Headers */,
+				F3C8354B0DD22EEA00B01593 /* SDL_cocoaevents.h in Headers */,
+				F3C8354C0DD22EEA00B01593 /* SDL_cocoakeyboard.h in Headers */,
+				F3C8354D0DD22EEA00B01593 /* SDL_cocoamodes.h in Headers */,
+				F3C8354E0DD22EEA00B01593 /* SDL_cocoamouse.h in Headers */,
+				F3C8354F0DD22EEA00B01593 /* SDL_cocoaopengl.h in Headers */,
+				F3C835500DD22EEA00B01593 /* SDL_cocoavideo.h in Headers */,
+				F3C835510DD22EEA00B01593 /* SDL_cocoawindow.h in Headers */,
+				F3C8355C0DD22F4000B01593 /* SDL_nullevents_c.h in Headers */,
+				F3C8355D0DD22F4000B01593 /* SDL_nullrender_c.h in Headers */,
+				F3C8355E0DD22F4000B01593 /* SDL_nullvideo.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1464,20 +1546,11 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F31EB09CA02D800EBEB88 /* CGS.h in Headers */,
-				002F31EC09CA02D800EBEB88 /* SDL_QuartzKeys.h in Headers */,
-				002F31ED09CA02D800EBEB88 /* SDL_QuartzVideo.h in Headers */,
-				002F31EE09CA02D800EBEB88 /* SDL_QuartzWindow.h in Headers */,
 				002F31EF09CA02D800EBEB88 /* SDL_cpuinfo.h in Headers */,
 				002F31F009CA02D800EBEB88 /* SDL_name.h in Headers */,
 				002F31F109CA02D800EBEB88 /* SDL_coreaudio.h in Headers */,
 				002F31F209CA02D800EBEB88 /* SDLOSXCAGuard.h in Headers */,
-				002F31F309CA02D800EBEB88 /* SDL_config_amiga.h in Headers */,
-				002F31F409CA02D800EBEB88 /* SDL_config_dreamcast.h in Headers */,
-				002F31F509CA02D800EBEB88 /* SDL_config_macos.h in Headers */,
 				002F31F609CA02D800EBEB88 /* SDL_config_macosx.h in Headers */,
-				002F31F709CA02D800EBEB88 /* SDL_config_os2.h in Headers */,
-				002F31F809CA02D800EBEB88 /* SDL_config_win32.h in Headers */,
 				002F31F909CA02D800EBEB88 /* SDL_config.h in Headers */,
 				002F31FA09CA02D800EBEB88 /* SDL_platform.h in Headers */,
 				002F31FB09CA02D800EBEB88 /* SDL_stdinc.h in Headers */,
@@ -1485,10 +1558,40 @@
 				002F31FD09CA02D800EBEB88 /* SDL_systhread_c.h in Headers */,
 				002F31FE09CA02D800EBEB88 /* SDL_mixer_MMX.h in Headers */,
 				002F31FF09CA02D800EBEB88 /* SDL_nullevents_c.h in Headers */,
-				002F320009CA02D800EBEB88 /* SDL_nullmouse_c.h in Headers */,
 				002F320109CA02D800EBEB88 /* SDL_nullvideo.h in Headers */,
 				002F32DF09CA0BE700EBEB88 /* SDL_diskaudio.h in Headers */,
 				002F32ED09CA0BF600EBEB88 /* SDL_dummyaudio.h in Headers */,
+				F3DEB5860C57E0D4003E2527 /* SDL_compat.h in Headers */,
+				F3DEB6210C57E321003E2527 /* SDL_nullrender_c.h in Headers */,
+				F3C832E10DCDAE7200B01593 /* SDL_scancode.h in Headers */,
+				F3C8334B0DCDBDF900B01593 /* SDL_pixels.h in Headers */,
+				F3C833520DCDBE3B00B01593 /* SDL_rect.h in Headers */,
+				F3C833570DCDBE8400B01593 /* SDL_surface.h in Headers */,
+				F3C834F20DD22C4300B01593 /* e_log.h in Headers */,
+				F3C834F30DD22C4300B01593 /* e_pow.h in Headers */,
+				F3C834F40DD22C4300B01593 /* e_sqrt.h in Headers */,
+				F3C834F50DD22C4300B01593 /* math_private.h in Headers */,
+				F3C834F60DD22C4300B01593 /* mmx.h in Headers */,
+				F3C834F70DD22C4300B01593 /* SDL_blit.h in Headers */,
+				F3C834F80DD22C4300B01593 /* SDL_blit_auto.h in Headers */,
+				F3C834F90DD22C4300B01593 /* SDL_blit_copy.h in Headers */,
+				F3C834FA0DD22C4300B01593 /* SDL_glfuncs.h in Headers */,
+				F3C834FB0DD22C4300B01593 /* SDL_leaks.h in Headers */,
+				F3C834FC0DD22C4300B01593 /* SDL_pixels_c.h in Headers */,
+				F3C834FD0DD22C4300B01593 /* SDL_rect_c.h in Headers */,
+				F3C834FE0DD22C4300B01593 /* SDL_renderer_gl.h in Headers */,
+				F3C834FF0DD22C4300B01593 /* SDL_renderer_sw.h in Headers */,
+				F3C835000DD22C4300B01593 /* SDL_RLEaccel_c.h in Headers */,
+				F3C835010DD22C4300B01593 /* SDL_stretch_c.h in Headers */,
+				F3C835020DD22C4300B01593 /* SDL_sysvideo.h in Headers */,
+				F3C835030DD22C4300B01593 /* SDL_yuv_sw_c.h in Headers */,
+				F3C835520DD22EEB00B01593 /* SDL_cocoaevents.h in Headers */,
+				F3C835530DD22EEB00B01593 /* SDL_cocoakeyboard.h in Headers */,
+				F3C835540DD22EEB00B01593 /* SDL_cocoamodes.h in Headers */,
+				F3C835550DD22EEB00B01593 /* SDL_cocoamouse.h in Headers */,
+				F3C835560DD22EEB00B01593 /* SDL_cocoaopengl.h in Headers */,
+				F3C835570DD22EEB00B01593 /* SDL_cocoavideo.h in Headers */,
+				F3C835580DD22EEB00B01593 /* SDL_cocoawindow.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1496,27 +1599,19 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				00162DA309BD222F0037C8D0 /* SDL_config_amiga.h in Headers */,
-				00162DA409BD222F0037C8D0 /* SDL_config_dreamcast.h in Headers */,
-				00162DA509BD222F0037C8D0 /* SDL_config_macos.h in Headers */,
 				00162DA609BD222F0037C8D0 /* SDL_config_macosx.h in Headers */,
-				00162DA709BD222F0037C8D0 /* SDL_config_os2.h in Headers */,
-				00162DA809BD222F0037C8D0 /* SDL_config_win32.h in Headers */,
 				00162DA909BD222F0037C8D0 /* SDL_config.h in Headers */,
 				00162DAA09BD222F0037C8D0 /* SDL_platform.h in Headers */,
 				00162DAB09BD222F0037C8D0 /* SDL_stdinc.h in Headers */,
 				00162DAC09BD222F0037C8D0 /* begin_code.h in Headers */,
 				00162DAD09BD222F0037C8D0 /* close_code.h in Headers */,
-				00162DAE09BD222F0037C8D0 /* SDL_active.h in Headers */,
 				00162DAF09BD222F0037C8D0 /* SDL_audio.h in Headers */,
-				00162DB009BD222F0037C8D0 /* SDL_byteorder.h in Headers */,
 				00162DB109BD222F0037C8D0 /* SDL_cdrom.h in Headers */,
 				00162DB209BD222F0037C8D0 /* SDL_copying.h in Headers */,
 				00162DB309BD222F0037C8D0 /* SDL_cpuinfo.h in Headers */,
 				00162DB409BD222F0037C8D0 /* SDL_endian.h in Headers */,
 				00162DB509BD222F0037C8D0 /* SDL_error.h in Headers */,
 				00162DB609BD222F0037C8D0 /* SDL_events.h in Headers */,
-				00162DB709BD222F0037C8D0 /* SDL_getenv.h in Headers */,
 				00162DB809BD222F0037C8D0 /* SDL_joystick.h in Headers */,
 				00162DB909BD222F0037C8D0 /* SDL_keyboard.h in Headers */,
 				00162DBA09BD222F0037C8D0 /* SDL_keysym.h in Headers */,
@@ -1535,6 +1630,50 @@
 				00162DC709BD222F0037C8D0 /* SDL_version.h in Headers */,
 				00162DC809BD222F0037C8D0 /* SDL_video.h in Headers */,
 				00162DC909BD222F0037C8D0 /* SDL.h in Headers */,
+				F3DEB5830C57E0D4003E2527 /* SDL_compat.h in Headers */,
+				F3C832DF0DCDAE7200B01593 /* SDL_scancode.h in Headers */,
+				F3C833490DCDBDF900B01593 /* SDL_pixels.h in Headers */,
+				F3C833500DCDBE3B00B01593 /* SDL_rect.h in Headers */,
+				F3C833550DCDBE8400B01593 /* SDL_surface.h in Headers */,
+				F3C834970DD22A4D00B01593 /* imKStoUCS.h in Headers */,
+				F3C834980DD22A4D00B01593 /* SDL_x11events.h in Headers */,
+				F3C834990DD22A4D00B01593 /* SDL_x11gamma.h in Headers */,
+				F3C8349A0DD22A4D00B01593 /* SDL_x11keyboard.h in Headers */,
+				F3C8349B0DD22A4D00B01593 /* SDL_x11modes.h in Headers */,
+				F3C8349C0DD22A4D00B01593 /* SDL_x11mouse.h in Headers */,
+				F3C8349D0DD22A4D00B01593 /* SDL_x11opengl.h in Headers */,
+				F3C8349E0DD22A4D00B01593 /* SDL_x11window.h in Headers */,
+				F3C834CE0DD22C4300B01593 /* e_log.h in Headers */,
+				F3C834CF0DD22C4300B01593 /* e_pow.h in Headers */,
+				F3C834D00DD22C4300B01593 /* e_sqrt.h in Headers */,
+				F3C834D10DD22C4300B01593 /* math_private.h in Headers */,
+				F3C834D20DD22C4300B01593 /* mmx.h in Headers */,
+				F3C834D30DD22C4300B01593 /* SDL_blit.h in Headers */,
+				F3C834D40DD22C4300B01593 /* SDL_blit_auto.h in Headers */,
+				F3C834D50DD22C4300B01593 /* SDL_blit_copy.h in Headers */,
+				F3C834D60DD22C4300B01593 /* SDL_glfuncs.h in Headers */,
+				F3C834D70DD22C4300B01593 /* SDL_leaks.h in Headers */,
+				F3C834D80DD22C4300B01593 /* SDL_pixels_c.h in Headers */,
+				F3C834D90DD22C4300B01593 /* SDL_rect_c.h in Headers */,
+				F3C834DA0DD22C4300B01593 /* SDL_renderer_gl.h in Headers */,
+				F3C834DB0DD22C4300B01593 /* SDL_renderer_sw.h in Headers */,
+				F3C834DC0DD22C4300B01593 /* SDL_RLEaccel_c.h in Headers */,
+				F3C834DD0DD22C4300B01593 /* SDL_stretch_c.h in Headers */,
+				F3C834DE0DD22C4300B01593 /* SDL_sysvideo.h in Headers */,
+				F3C834DF0DD22C4300B01593 /* SDL_yuv_sw_c.h in Headers */,
+				F3C8353D0DD22EE800B01593 /* SDL_cocoaevents.h in Headers */,
+				F3C8353E0DD22EE800B01593 /* SDL_cocoakeyboard.h in Headers */,
+				F3C8353F0DD22EE800B01593 /* SDL_cocoamodes.h in Headers */,
+				F3C835400DD22EE800B01593 /* SDL_cocoamouse.h in Headers */,
+				F3C835410DD22EE800B01593 /* SDL_cocoaopengl.h in Headers */,
+				F3C835420DD22EE800B01593 /* SDL_cocoavideo.h in Headers */,
+				F3C835430DD22EE800B01593 /* SDL_cocoawindow.h in Headers */,
+				F3C835590DD22F3F00B01593 /* SDL_nullevents_c.h in Headers */,
+				F3C8355A0DD22F3F00B01593 /* SDL_nullrender_c.h in Headers */,
+				F3C8355B0DD22F3F00B01593 /* SDL_nullvideo.h in Headers */,
+				F3C835600DD22F7A00B01593 /* SDL_x11dyn.h in Headers */,
+				F3C835610DD22F7A00B01593 /* SDL_x11sym.h in Headers */,
+				F3C835620DD22F7A00B01593 /* SDL_x11video.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1542,20 +1681,11 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BECDF6720761BA81005FE872 /* CGS.h in Headers */,
-				BECDF6730761BA81005FE872 /* SDL_QuartzKeys.h in Headers */,
-				BECDF6740761BA81005FE872 /* SDL_QuartzVideo.h in Headers */,
-				BECDF6750761BA81005FE872 /* SDL_QuartzWindow.h in Headers */,
 				BECDF6760761BA81005FE872 /* SDL_cpuinfo.h in Headers */,
 				BECDF6770761BA81005FE872 /* SDL_name.h in Headers */,
 				BECDF6780761BA81005FE872 /* SDL_coreaudio.h in Headers */,
 				004C2C940975E13300E9D430 /* SDLOSXCAGuard.h in Headers */,
-				00162D4309BD1FA90037C8D0 /* SDL_config_amiga.h in Headers */,
-				00162D4409BD1FA90037C8D0 /* SDL_config_dreamcast.h in Headers */,
-				00162D4509BD1FA90037C8D0 /* SDL_config_macos.h in Headers */,
 				00162D4609BD1FA90037C8D0 /* SDL_config_macosx.h in Headers */,
-				00162D4709BD1FA90037C8D0 /* SDL_config_os2.h in Headers */,
-				00162D4809BD1FA90037C8D0 /* SDL_config_win32.h in Headers */,
 				00162D4909BD1FA90037C8D0 /* SDL_config.h in Headers */,
 				00162D4A09BD1FA90037C8D0 /* SDL_platform.h in Headers */,
 				00162D4B09BD1FA90037C8D0 /* SDL_stdinc.h in Headers */,
@@ -1563,33 +1693,52 @@
 				00162D5E09BD20DA0037C8D0 /* SDL_systhread_c.h in Headers */,
 				00162E6B09BD27370037C8D0 /* SDL_mixer_MMX.h in Headers */,
 				00162F4209BE27FB0037C8D0 /* SDL_nullevents_c.h in Headers */,
-				00162F4409BE27FB0037C8D0 /* SDL_nullmouse_c.h in Headers */,
 				00162F4609BE27FB0037C8D0 /* SDL_nullvideo.h in Headers */,
-				0014B7F409C0D8D2003A99D5 /* SDL_dgaevents_c.h in Headers */,
-				0014B7F609C0D8D2003A99D5 /* SDL_dgamouse_c.h in Headers */,
-				0014B7F909C0D8D2003A99D5 /* SDL_dgavideo.h in Headers */,
-				0014B86509C0D977003A99D5 /* SDL_x11dga_c.h in Headers */,
 				0014B86809C0D977003A99D5 /* SDL_x11dyn.h in Headers */,
-				0014B86909C0D977003A99D5 /* SDL_x11events_c.h in Headers */,
-				0014B86B09C0D977003A99D5 /* SDL_x11gamma_c.h in Headers */,
-				0014B86D09C0D977003A99D5 /* SDL_x11gl_c.h in Headers */,
-				0014B86F09C0D977003A99D5 /* SDL_x11image_c.h in Headers */,
-				0014B87109C0D977003A99D5 /* SDL_x11modes_c.h in Headers */,
-				0014B87309C0D977003A99D5 /* SDL_x11mouse_c.h in Headers */,
 				0014B87509C0D977003A99D5 /* SDL_x11sym.h in Headers */,
 				0014B87709C0D977003A99D5 /* SDL_x11video.h in Headers */,
-				0014B87809C0D977003A99D5 /* SDL_x11wm_c.h in Headers */,
-				0014B87A09C0D977003A99D5 /* SDL_x11yuv_c.h in Headers */,
 				0014B89E09C0DAAE003A99D5 /* Xvlibint.h in Headers */,
 				002F32DA09CA0BE700EBEB88 /* SDL_diskaudio.h in Headers */,
 				002F32E809CA0BF600EBEB88 /* SDL_dummyaudio.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		BECDF6B50761BA81005FE872 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
+				F3DEB5840C57E0D4003E2527 /* SDL_compat.h in Headers */,
+				F3DEB61D0C57E321003E2527 /* SDL_nullrender_c.h in Headers */,
+				F3C832E00DCDAE7200B01593 /* SDL_scancode.h in Headers */,
+				F3C8334A0DCDBDF900B01593 /* SDL_pixels.h in Headers */,
+				F3C833510DCDBE3B00B01593 /* SDL_rect.h in Headers */,
+				F3C833560DCDBE8400B01593 /* SDL_surface.h in Headers */,
+				F3C8349F0DD22A4D00B01593 /* imKStoUCS.h in Headers */,
+				F3C834A00DD22A4D00B01593 /* SDL_x11events.h in Headers */,
+				F3C834A10DD22A4D00B01593 /* SDL_x11gamma.h in Headers */,
+				F3C834A20DD22A4D00B01593 /* SDL_x11keyboard.h in Headers */,
+				F3C834A30DD22A4D00B01593 /* SDL_x11modes.h in Headers */,
+				F3C834A40DD22A4D00B01593 /* SDL_x11mouse.h in Headers */,
+				F3C834A50DD22A4D00B01593 /* SDL_x11opengl.h in Headers */,
+				F3C834A60DD22A4D00B01593 /* SDL_x11window.h in Headers */,
+				F3C834E00DD22C4300B01593 /* e_log.h in Headers */,
+				F3C834E10DD22C4300B01593 /* e_pow.h in Headers */,
+				F3C834E20DD22C4300B01593 /* e_sqrt.h in Headers */,
+				F3C834E30DD22C4300B01593 /* math_private.h in Headers */,
+				F3C834E40DD22C4300B01593 /* mmx.h in Headers */,
+				F3C834E50DD22C4300B01593 /* SDL_blit.h in Headers */,
+				F3C834E60DD22C4300B01593 /* SDL_blit_auto.h in Headers */,
+				F3C834E70DD22C4300B01593 /* SDL_blit_copy.h in Headers */,
+				F3C834E80DD22C4300B01593 /* SDL_glfuncs.h in Headers */,
+				F3C834E90DD22C4300B01593 /* SDL_leaks.h in Headers */,
+				F3C834EA0DD22C4300B01593 /* SDL_pixels_c.h in Headers */,
+				F3C834EB0DD22C4300B01593 /* SDL_rect_c.h in Headers */,
+				F3C834EC0DD22C4300B01593 /* SDL_renderer_gl.h in Headers */,
+				F3C834ED0DD22C4300B01593 /* SDL_renderer_sw.h in Headers */,
+				F3C834EE0DD22C4300B01593 /* SDL_RLEaccel_c.h in Headers */,
+				F3C834EF0DD22C4300B01593 /* SDL_stretch_c.h in Headers */,
+				F3C834F00DD22C4300B01593 /* SDL_sysvideo.h in Headers */,
+				F3C834F10DD22C4300B01593 /* SDL_yuv_sw_c.h in Headers */,
+				F3C835440DD22EE900B01593 /* SDL_cocoaevents.h in Headers */,
+				F3C835450DD22EE900B01593 /* SDL_cocoakeyboard.h in Headers */,
+				F3C835460DD22EE900B01593 /* SDL_cocoamodes.h in Headers */,
+				F3C835470DD22EE900B01593 /* SDL_cocoamouse.h in Headers */,
+				F3C835480DD22EE900B01593 /* SDL_cocoaopengl.h in Headers */,
+				F3C835490DD22EE900B01593 /* SDL_cocoavideo.h in Headers */,
+				F3C8354A0DD22EE900B01593 /* SDL_cocoawindow.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1609,80 +1758,13 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				EXPORTED_SYMBOLS_FILE = ../../src/main/macosx/exports/SDL.x;
-				FRAMEWORK_SEARCH_PATHS = "";
-				FRAMEWORK_VERSION = A;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					ENABLE_QUARTZ,
-					PTHREAD_NO_RECURSIVE_MUTEX,
-					SDL_USE_PTHREADS,
-					TARGET_API_MAC_CARBON,
-					TARGET_API_MAC_OSX,
-					MACOSX,
-					HAVE_OPENGL,
-				);
-				GCC_USE_GCC3_PFE_SUPPORT = YES;
-				HEADER_SEARCH_PATHS = (
-					/System/Library/Frameworks/Carbon.framework/Headers,
-					../../src,
-					../../include,
-					../../src/audio,
-					../../src/cdrom,
-					../../src/endian,
-					../../src/events,
-					../../src/file,
-					../../src/hermes,
-					../../src/joystick,
-					../../src/main,
-					../../src/thread,
-					../../src/timer,
-					../../src/video,
-				);
-				INFOPLIST_FILE = "Info-Framework__Upgraded_.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-seg1addr",
-					0x30000000,
-					"-framework",
-					IOKit,
-					"-framework",
-					Cocoa,
-					"-framework",
-					OpenGL,
-					"-framework",
-					Carbon,
-					"-framework",
-					QuickTime,
-					"-framework",
-					AudioToolbox,
-					"-framework",
-					AudioUnit,
-					"-framework",
-					CoreAudio,
-				);
-				PRODUCT_NAME = SDL;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wall",
-					"-Wno-four-char-constants",
-				);
-				WRAPPER_EXTENSION = framework;
-			};
 			comments = "We recommend installing to /Library/Frameworks\nAn alternative is $(HOME)/Library/Frameworks for per-user if permissions are an issue.\n\nAdd the framework to the Groups & Files panel (under Linked Frameworks is a good place) and enable the check box for the targets that need to link to it. You can also manually add \"-framework SDL\" to your linker flags if you don't like the check box system.\n\nAdd /Library/Frameworks/SDL.framework/Headers to your header search path\nAdd /Library/Frameworks to your library search path\n(Adjust the two above if installed in $(HOME)/Library/Frameworks. You can also list both paths if you want robustness.)\n\nWe used to use an exports file. It was becoming a maintenance issue we kept neglecting, so we have removed it. If you need it back, set the \"Exported Symbols File\" option to:\n../../src/main/macosx/exports/SDL.x\n(You may need to regenerate the exports list. There is a Makefile in that directory that you can run from the command line to rebuild it.)\nLong term, we want to utilize gcc 4.0's new visibility feature (analogous to declspec on Windows). Other platforms would benefit from this change too. The downside is that we still use gcc 3.3 for the PowerPC build here so only our x86 builds will cull the symbols if we go down this route (and don't use the exports file).\n\n";
 			dependencies = (
 			);
 			name = "Framework Without X11 Stuff (for those who didn't install the X11 headers with Xcode)";
 			productInstallPath = "@executable_path/../Frameworks";
 			productName = SDL;
-			productReference = 0014B9A809C0E585003A99D5 /* SDL.framework */;
+			productReference = F3A40F4F0C5CE1B200BB2308 /* SDL.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 		002F31E909CA02D800EBEB88 /* Static Library Without X11 Stuff (for those who didn't install the X11 headers with Xcode) */ = {
@@ -1697,50 +1779,6 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					ENABLE_QUARTZ,
-					PTHREAD_NO_RECURSIVE_MUTEX,
-					SDL_USE_PTHREADS,
-					DISABLE_JOYSTICK,
-					DISABLE_CDROM,
-					TARGET_API_MAC_CARBON,
-					TARGET_API_MAC_OSX,
-					MACOSX,
-					HAVE_OPENGL,
-				);
-				HEADER_SEARCH_PATHS = (
-					/System/Library/Frameworks/Carbon.framework/Headers/,
-					../../src,
-					../../include,
-					../../src/audio,
-					../../src/cdrom,
-					../../src/endian,
-					../../src/events,
-					../../src/file,
-					../../src/joystick,
-					../../src/thread,
-					../../src/timer,
-					../../src/video,
-				);
-				LIBRARY_STYLE = STATIC;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOL_FLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = SDL;
-				REZ_EXECUTABLE = YES;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
 			comments = "This produces libsdl.a, which is the static build of SDL. You will have to link to the Cocoa and OpenGL frameworks in your application.";
 			dependencies = (
 			);
@@ -1763,73 +1801,6 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				EXPORTED_SYMBOLS_FILE = ../../src/main/macosx/exports/SDL.x;
-				FRAMEWORK_SEARCH_PATHS = "";
-				FRAMEWORK_VERSION = A;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					ENABLE_QUARTZ,
-					PTHREAD_NO_RECURSIVE_MUTEX,
-					SDL_USE_PTHREADS,
-					TARGET_API_MAC_CARBON,
-					TARGET_API_MAC_OSX,
-					MACOSX,
-					HAVE_OPENGL,
-				);
-				GCC_USE_GCC3_PFE_SUPPORT = YES;
-				HEADER_SEARCH_PATHS = (
-					/System/Library/Frameworks/Carbon.framework/Headers,
-					../../src,
-					../../include,
-					../../src/audio,
-					../../src/cdrom,
-					../../src/endian,
-					../../src/events,
-					../../src/file,
-					../../src/hermes,
-					../../src/joystick,
-					../../src/main,
-					../../src/thread,
-					../../src/timer,
-					../../src/video,
-				);
-				INFOPLIST_FILE = "Info-Framework__Upgraded_.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-seg1addr",
-					0x30000000,
-					"-framework",
-					IOKit,
-					"-framework",
-					Cocoa,
-					"-framework",
-					OpenGL,
-					"-framework",
-					Carbon,
-					"-framework",
-					QuickTime,
-					"-framework",
-					AudioToolbox,
-					"-framework",
-					AudioUnit,
-					"-framework",
-					CoreAudio,
-				);
-				PRODUCT_NAME = SDL;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wall",
-					"-Wno-four-char-constants",
-				);
-				WRAPPER_EXTENSION = framework;
-			};
 			comments = "We recommend installing to /Library/Frameworks\nAn alternative is $(HOME)/Library/Frameworks for per-user if permissions are an issue.\n\nAdd the framework to the Groups & Files panel (under Linked Frameworks is a good place) and enable the check box for the targets that need to link to it. You can also manually add \"-framework SDL\" to your linker flags if you don't like the check box system.\n\nAdd /Library/Frameworks/SDL.framework/Headers to your header search path\nAdd /Library/Frameworks to your library search path\n(Adjust the two above if installed in $(HOME)/Library/Frameworks. You can also list both paths if you want robustness.)\n\nWe used to use an exports file. It was becoming a maintenance issue we kept neglecting, so we have removed it. If you need it back, set the \"Exported Symbols File\" option to:\n../../src/main/macosx/exports/SDL.x\n(You may need to regenerate the exports list. There is a Makefile in that directory that you can run from the command line to rebuild it.)\nLong term, we want to utilize gcc 4.0's new visibility feature (analogous to declspec on Windows). Other platforms would benefit from this change too. The downside is that we still use gcc 3.3 for the PowerPC build here so only our x86 builds will cull the symbols if we go down this route (and don't use the exports file).\n\n";
 			dependencies = (
 			);
@@ -1851,50 +1822,6 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					ENABLE_QUARTZ,
-					PTHREAD_NO_RECURSIVE_MUTEX,
-					SDL_USE_PTHREADS,
-					DISABLE_JOYSTICK,
-					DISABLE_CDROM,
-					TARGET_API_MAC_CARBON,
-					TARGET_API_MAC_OSX,
-					MACOSX,
-					HAVE_OPENGL,
-				);
-				HEADER_SEARCH_PATHS = (
-					/System/Library/Frameworks/Carbon.framework/Headers/,
-					../../src,
-					../../include,
-					../../src/audio,
-					../../src/cdrom,
-					../../src/endian,
-					../../src/events,
-					../../src/file,
-					../../src/joystick,
-					../../src/thread,
-					../../src/timer,
-					../../src/video,
-				);
-				LIBRARY_STYLE = STATIC;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOL_FLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = SDL;
-				REZ_EXECUTABLE = YES;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
 			comments = "This produces libsdl.a, which is the static build of SDL. You will have to link to the Cocoa and OpenGL frameworks in your application.";
 			dependencies = (
 			);
@@ -1904,45 +1831,6 @@
 			productReference = BECDF6B30761BA81005FE872 /* libSDL.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		BECDF6B40761BA81005FE872 /* Main Library */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 007317820858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Main Library" */;
-			buildPhases = (
-				BECDF6B50761BA81005FE872 /* Headers */,
-				BECDF6B60761BA81005FE872 /* Sources */,
-				BECDF6B80761BA81005FE872 /* Frameworks */,
-				BECDF6B90761BA81005FE872 /* Rez */,
-			);
-			buildRules = (
-			);
-			buildSettings = {
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				LIBRARY_STYLE = STATIC;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOL_FLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = SDLmain;
-				REZ_EXECUTABLE = YES;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			comments = "This produces libSDLmain.a, which contains only SDL_main.m, the hook to get the app running correctly before your SDL code executes.";
-			dependencies = (
-			);
-			name = "Main Library";
-			productInstallPath = /usr/local/lib;
-			productName = libSDLmain.a;
-			productReference = BECDF6BA0761BA81005FE872 /* libSDLmain.a */;
-			productType = "com.apple.product-type.library.static";
-		};
 		BECDF6BB0761BA81005FE872 /* Standard DMG */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 007317860858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Standard DMG" */;
@@ -1951,19 +1839,6 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = "Standard Package";
-				REZ_EXECUTABLE = YES;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
 			dependencies = (
 				BECDF6C60761BA81005FE872 /* PBXTargetDependency */,
 			);
@@ -1981,19 +1856,6 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = "Devel Package";
-				REZ_EXECUTABLE = YES;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
 			dependencies = (
 			);
 			name = "Developer Extras Package";
@@ -2008,21 +1870,15 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 0073178E0858DB0500B2BC32 /* Build configuration list for PBXProject "SDL" */;
-			buildSettings = {
-				MACOSX_DEPLOYMENT_TARGET = 10.1;
-			};
-			buildStyles = (
-				F512D95E02A6E0AB01D28762 /* Development */,
-				F512D95F02A6E0AB01D28762 /* Deployment */,
-			);
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 0867D691FE84028FC02AAC07 /* SDLFramework */;
 			productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
 			projectDirPath = "";
+			projectRoot = ../..;
 			targets = (
 				BECDF5FE0761BA81005FE872 /* Framework */,
 				BECDF66D0761BA81005FE872 /* Static Library */,
-				BECDF6B40761BA81005FE872 /* Main Library */,
 				BECDF6BB0761BA81005FE872 /* Standard DMG */,
 				BECDF6C00761BA81005FE872 /* Developer Extras Package */,
 				0014B91909C0E585003A99D5 /* Framework Without X11 Stuff (for those who didn't install the X11 headers with Xcode) */,
@@ -2036,7 +1892,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0014B94309C0E585003A99D5 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2044,7 +1899,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BECDF62B0761BA81005FE872 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2079,13 +1933,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BECDF6B90761BA81005FE872 /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXRezBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -2177,13 +2024,10 @@
 				0014B94809C0E585003A99D5 /* SDL_audiodev.c in Sources */,
 				0014B94909C0E585003A99D5 /* SDL_mixer.c in Sources */,
 				0014B94A09C0E585003A99D5 /* SDL_wave.c in Sources */,
-				0014B94B09C0E585003A99D5 /* SDL_active.c in Sources */,
 				0014B94C09C0E585003A99D5 /* SDL_events.c in Sources */,
-				0014B94D09C0E585003A99D5 /* SDL_expose.c in Sources */,
 				0014B94E09C0E585003A99D5 /* SDL_keyboard.c in Sources */,
 				0014B94F09C0E585003A99D5 /* SDL_mouse.c in Sources */,
 				0014B95009C0E585003A99D5 /* SDL_quit.c in Sources */,
-				0014B95109C0E585003A99D5 /* SDL_resize.c in Sources */,
 				0014B95209C0E585003A99D5 /* SDL_rwops.c in Sources */,
 				0014B95309C0E585003A99D5 /* SDL_timer.c in Sources */,
 				0014B95409C0E585003A99D5 /* SDL_blit.c in Sources */,
@@ -2192,13 +2036,11 @@
 				0014B95709C0E585003A99D5 /* SDL_blit_A.c in Sources */,
 				0014B95809C0E585003A99D5 /* SDL_blit_N.c in Sources */,
 				0014B95909C0E585003A99D5 /* SDL_bmp.c in Sources */,
-				0014B95A09C0E585003A99D5 /* SDL_cursor.c in Sources */,
 				0014B95B09C0E585003A99D5 /* SDL_gamma.c in Sources */,
 				0014B95C09C0E585003A99D5 /* SDL_pixels.c in Sources */,
 				0014B95D09C0E585003A99D5 /* SDL_RLEaccel.c in Sources */,
 				0014B95E09C0E585003A99D5 /* SDL_surface.c in Sources */,
 				0014B95F09C0E585003A99D5 /* SDL_video.c in Sources */,
-				0014B96009C0E585003A99D5 /* SDL_yuv.c in Sources */,
 				0014B96109C0E585003A99D5 /* SDL_yuv_sw.c in Sources */,
 				0014B96209C0E585003A99D5 /* SDL_error.c in Sources */,
 				0014B96309C0E585003A99D5 /* SDL_fatal.c in Sources */,
@@ -2208,12 +2050,6 @@
 				0014B96709C0E585003A99D5 /* SDL_joystick.c in Sources */,
 				0014B96809C0E585003A99D5 /* SDL_stretch.c in Sources */,
 				0014B96909C0E585003A99D5 /* SDL_sysjoystick.c in Sources */,
-				0014B96A09C0E585003A99D5 /* SDL_QuartzEvents.m in Sources */,
-				0014B96B09C0E585003A99D5 /* SDL_QuartzGL.m in Sources */,
-				0014B96C09C0E585003A99D5 /* SDL_QuartzVideo.m in Sources */,
-				0014B96D09C0E585003A99D5 /* SDL_QuartzWindow.m in Sources */,
-				0014B96E09C0E585003A99D5 /* SDL_QuartzWM.m in Sources */,
-				0014B96F09C0E585003A99D5 /* SDL_QuartzYUV.m in Sources */,
 				0014B97009C0E585003A99D5 /* SDL_cpuinfo.c in Sources */,
 				0014B97109C0E585003A99D5 /* SDL_syscdrom.c in Sources */,
 				0014B97209C0E585003A99D5 /* SDL_coreaudio.c in Sources */,
@@ -2233,13 +2069,31 @@
 				0014B98009C0E585003A99D5 /* SDL_string.c in Sources */,
 				0014B98109C0E585003A99D5 /* SDL_mixer_MMX.c in Sources */,
 				0014B98309C0E585003A99D5 /* SDL_nullevents.c in Sources */,
-				0014B98409C0E585003A99D5 /* SDL_nullmouse.c in Sources */,
 				0014B98509C0E585003A99D5 /* SDL_nullvideo.c in Sources */,
 				002F328809CA049100EBEB88 /* SDL_iconv.c in Sources */,
 				002F32DC09CA0BE700EBEB88 /* SDL_diskaudio.c in Sources */,
 				002F32EA09CA0BF600EBEB88 /* SDL_dummyaudio.c in Sources */,
 				046B91EB0A11B53500FB151C /* SDL_sysloadso.c in Sources */,
 				046B92120A11B8AD00FB151C /* SDL_dlcompat.c in Sources */,
+				F3DEB58B0C57E182003E2527 /* SDL_audiotypecvt.c in Sources */,
+				F3DEB5900C57E1EA003E2527 /* SDL_windowevents.c in Sources */,
+				F3DEB5A80C57E282003E2527 /* SDL_rect.c in Sources */,
+				F3DEB5AA0C57E282003E2527 /* SDL_renderer_gl.c in Sources */,
+				F3DEB5AB0C57E282003E2527 /* SDL_renderer_sw.c in Sources */,
+				F3DEB5DF0C57E2BF003E2527 /* SDL_cocoaevents.m in Sources */,
+				F3DEB5E10C57E2BF003E2527 /* SDL_cocoakeyboard.m in Sources */,
+				F3DEB5E40C57E2BF003E2527 /* SDL_cocoamodes.m in Sources */,
+				F3DEB5E60C57E2BF003E2527 /* SDL_cocoamouse.m in Sources */,
+				F3DEB5E80C57E2BF003E2527 /* SDL_cocoaopengl.m in Sources */,
+				F3DEB5EA0C57E2BF003E2527 /* SDL_cocoavideo.m in Sources */,
+				F3DEB5EC0C57E2BF003E2527 /* SDL_cocoawindow.m in Sources */,
+				F3DEB6200C57E321003E2527 /* SDL_nullrender.c in Sources */,
+				F317F3E80C789CCF00411C95 /* SDL_blit_auto.c in Sources */,
+				F317F3EA0C789CCF00411C95 /* SDL_blit_copy.c in Sources */,
+				F317F3EC0C789CCF00411C95 /* SDL_blit_slow.c in Sources */,
+				F317F3EE0C789CCF00411C95 /* SDL_fill.c in Sources */,
+				F317F44F0C789F2600411C95 /* SDL_compat.c in Sources */,
+				F306D6A20CB645B100B70512 /* SDL_yuv_mmx.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2254,13 +2108,10 @@
 				002F321709CA02D800EBEB88 /* SDL_wave.c in Sources */,
 				002F321809CA02D800EBEB88 /* SDL_romaudio.c in Sources */,
 				002F321909CA02D800EBEB88 /* SDL_cdrom.c in Sources */,
-				002F321A09CA02D800EBEB88 /* SDL_active.c in Sources */,
 				002F321B09CA02D800EBEB88 /* SDL_events.c in Sources */,
-				002F321C09CA02D800EBEB88 /* SDL_expose.c in Sources */,
 				002F321D09CA02D800EBEB88 /* SDL_keyboard.c in Sources */,
 				002F321E09CA02D800EBEB88 /* SDL_mouse.c in Sources */,
 				002F321F09CA02D800EBEB88 /* SDL_quit.c in Sources */,
-				002F322009CA02D800EBEB88 /* SDL_resize.c in Sources */,
 				002F322109CA02D800EBEB88 /* SDL_rwops.c in Sources */,
 				002F322209CA02D800EBEB88 /* SDL_joystick.c in Sources */,
 				002F322309CA02D800EBEB88 /* SDL_thread.c in Sources */,
@@ -2271,26 +2122,18 @@
 				002F322809CA02D800EBEB88 /* SDL_blit_A.c in Sources */,
 				002F322909CA02D800EBEB88 /* SDL_blit_N.c in Sources */,
 				002F322A09CA02D800EBEB88 /* SDL_bmp.c in Sources */,
-				002F322B09CA02D800EBEB88 /* SDL_cursor.c in Sources */,
 				002F322C09CA02D800EBEB88 /* SDL_gamma.c in Sources */,
 				002F322D09CA02D800EBEB88 /* SDL_pixels.c in Sources */,
 				002F322E09CA02D800EBEB88 /* SDL_RLEaccel.c in Sources */,
 				002F322F09CA02D800EBEB88 /* SDL_stretch.c in Sources */,
 				002F323009CA02D800EBEB88 /* SDL_surface.c in Sources */,
 				002F323109CA02D800EBEB88 /* SDL_video.c in Sources */,
-				002F323209CA02D800EBEB88 /* SDL_yuv.c in Sources */,
 				002F323309CA02D800EBEB88 /* SDL_yuv_sw.c in Sources */,
 				002F323409CA02D800EBEB88 /* SDL_error.c in Sources */,
 				002F323509CA02D800EBEB88 /* SDL_fatal.c in Sources */,
 				002F323609CA02D800EBEB88 /* SDL.c in Sources */,
 				002F323709CA02D800EBEB88 /* SDL_sysjoystick.c in Sources */,
 				002F323809CA02D800EBEB88 /* SDL_syscdrom.c in Sources */,
-				002F323909CA02D800EBEB88 /* SDL_QuartzEvents.m in Sources */,
-				002F323A09CA02D800EBEB88 /* SDL_QuartzGL.m in Sources */,
-				002F323B09CA02D800EBEB88 /* SDL_QuartzVideo.m in Sources */,
-				002F323C09CA02D800EBEB88 /* SDL_QuartzWindow.m in Sources */,
-				002F323D09CA02D800EBEB88 /* SDL_QuartzWM.m in Sources */,
-				002F323E09CA02D800EBEB88 /* SDL_QuartzYUV.m in Sources */,
 				002F323F09CA02D800EBEB88 /* SDL_cpuinfo.c in Sources */,
 				002F324009CA02D800EBEB88 /* SDL_coreaudio.c in Sources */,
 				002F324109CA02D800EBEB88 /* AudioFilePlayer.c in Sources */,
@@ -2309,13 +2152,31 @@
 				002F324E09CA02D800EBEB88 /* SDL_string.c in Sources */,
 				002F324F09CA02D800EBEB88 /* SDL_mixer_MMX.c in Sources */,
 				002F325109CA02D800EBEB88 /* SDL_nullevents.c in Sources */,
-				002F325209CA02D800EBEB88 /* SDL_nullmouse.c in Sources */,
 				002F325309CA02D800EBEB88 /* SDL_nullvideo.c in Sources */,
 				002F328909CA049100EBEB88 /* SDL_iconv.c in Sources */,
 				002F32DE09CA0BE700EBEB88 /* SDL_diskaudio.c in Sources */,
 				002F32EC09CA0BF600EBEB88 /* SDL_dummyaudio.c in Sources */,
 				046B91EA0A11B53500FB151C /* SDL_sysloadso.c in Sources */,
 				046B92110A11B8AD00FB151C /* SDL_dlcompat.c in Sources */,
+				F3DEB58C0C57E182003E2527 /* SDL_audiotypecvt.c in Sources */,
+				F3DEB5910C57E1EA003E2527 /* SDL_windowevents.c in Sources */,
+				F3DEB5AC0C57E282003E2527 /* SDL_rect.c in Sources */,
+				F3DEB5AE0C57E282003E2527 /* SDL_renderer_gl.c in Sources */,
+				F3DEB5AF0C57E282003E2527 /* SDL_renderer_sw.c in Sources */,
+				F3DEB5EE0C57E2BF003E2527 /* SDL_cocoaevents.m in Sources */,
+				F3DEB5F00C57E2BF003E2527 /* SDL_cocoakeyboard.m in Sources */,
+				F3DEB5F30C57E2BF003E2527 /* SDL_cocoamodes.m in Sources */,
+				F3DEB5F50C57E2BF003E2527 /* SDL_cocoamouse.m in Sources */,
+				F3DEB5F70C57E2BF003E2527 /* SDL_cocoaopengl.m in Sources */,
+				F3DEB5F90C57E2BF003E2527 /* SDL_cocoavideo.m in Sources */,
+				F3DEB5FB0C57E2BF003E2527 /* SDL_cocoawindow.m in Sources */,
+				F3DEB6220C57E321003E2527 /* SDL_nullrender.c in Sources */,
+				F317F3F80C789CCF00411C95 /* SDL_blit_auto.c in Sources */,
+				F317F3FA0C789CCF00411C95 /* SDL_blit_copy.c in Sources */,
+				F317F3FC0C789CCF00411C95 /* SDL_blit_slow.c in Sources */,
+				F317F3FE0C789CCF00411C95 /* SDL_fill.c in Sources */,
+				F317F4500C789F2600411C95 /* SDL_compat.c in Sources */,
+				F306D6A30CB645B100B70512 /* SDL_yuv_mmx.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2329,13 +2190,10 @@
 				BECDF6300761BA81005FE872 /* SDL_audiodev.c in Sources */,
 				BECDF6320761BA81005FE872 /* SDL_mixer.c in Sources */,
 				BECDF6330761BA81005FE872 /* SDL_wave.c in Sources */,
-				BECDF6350761BA81005FE872 /* SDL_active.c in Sources */,
 				BECDF6360761BA81005FE872 /* SDL_events.c in Sources */,
-				BECDF6370761BA81005FE872 /* SDL_expose.c in Sources */,
 				BECDF6380761BA81005FE872 /* SDL_keyboard.c in Sources */,
 				BECDF6390761BA81005FE872 /* SDL_mouse.c in Sources */,
 				BECDF63A0761BA81005FE872 /* SDL_quit.c in Sources */,
-				BECDF63B0761BA81005FE872 /* SDL_resize.c in Sources */,
 				BECDF63C0761BA81005FE872 /* SDL_rwops.c in Sources */,
 				BECDF63E0761BA81005FE872 /* SDL_timer.c in Sources */,
 				BECDF63F0761BA81005FE872 /* SDL_blit.c in Sources */,
@@ -2344,13 +2202,11 @@
 				BECDF6420761BA81005FE872 /* SDL_blit_A.c in Sources */,
 				BECDF6430761BA81005FE872 /* SDL_blit_N.c in Sources */,
 				BECDF6440761BA81005FE872 /* SDL_bmp.c in Sources */,
-				BECDF6450761BA81005FE872 /* SDL_cursor.c in Sources */,
 				BECDF6460761BA81005FE872 /* SDL_gamma.c in Sources */,
 				BECDF6470761BA81005FE872 /* SDL_pixels.c in Sources */,
 				BECDF6480761BA81005FE872 /* SDL_RLEaccel.c in Sources */,
 				BECDF6490761BA81005FE872 /* SDL_surface.c in Sources */,
 				BECDF64A0761BA81005FE872 /* SDL_video.c in Sources */,
-				BECDF64B0761BA81005FE872 /* SDL_yuv.c in Sources */,
 				BECDF64C0761BA81005FE872 /* SDL_yuv_sw.c in Sources */,
 				BECDF64D0761BA81005FE872 /* SDL_error.c in Sources */,
 				BECDF64E0761BA81005FE872 /* SDL_fatal.c in Sources */,
@@ -2360,12 +2216,6 @@
 				BECDF6530761BA81005FE872 /* SDL_joystick.c in Sources */,
 				BECDF6580761BA81005FE872 /* SDL_stretch.c in Sources */,
 				BECDF6590761BA81005FE872 /* SDL_sysjoystick.c in Sources */,
-				BECDF65B0761BA81005FE872 /* SDL_QuartzEvents.m in Sources */,
-				BECDF65C0761BA81005FE872 /* SDL_QuartzGL.m in Sources */,
-				BECDF65D0761BA81005FE872 /* SDL_QuartzVideo.m in Sources */,
-				BECDF65E0761BA81005FE872 /* SDL_QuartzWindow.m in Sources */,
-				BECDF65F0761BA81005FE872 /* SDL_QuartzWM.m in Sources */,
-				BECDF6600761BA81005FE872 /* SDL_QuartzYUV.m in Sources */,
 				BECDF6610761BA81005FE872 /* SDL_cpuinfo.c in Sources */,
 				BECDF6620761BA81005FE872 /* SDL_syscdrom.c in Sources */,
 				BECDF6670761BA81005FE872 /* SDL_coreaudio.c in Sources */,
@@ -2385,24 +2235,13 @@
 				00162D6F09BD214F0037C8D0 /* SDL_string.c in Sources */,
 				00162E6809BD27300037C8D0 /* SDL_mixer_MMX.c in Sources */,
 				00162F3B09BE27FB0037C8D0 /* SDL_nullevents.c in Sources */,
-				00162F3D09BE27FB0037C8D0 /* SDL_nullmouse.c in Sources */,
 				00162F3F09BE27FB0037C8D0 /* SDL_nullvideo.c in Sources */,
-				0014B7EF09C0D8D2003A99D5 /* SDL_dgaevents.c in Sources */,
-				0014B7F109C0D8D2003A99D5 /* SDL_dgamouse.c in Sources */,
-				0014B7F209C0D8D2003A99D5 /* SDL_dgavideo.c in Sources */,
-				0014B84F09C0D977003A99D5 /* SDL_x11dga.c in Sources */,
 				0014B85009C0D977003A99D5 /* SDL_x11dyn.c in Sources */,
 				0014B85309C0D977003A99D5 /* SDL_x11events.c in Sources */,
 				0014B85509C0D977003A99D5 /* SDL_x11gamma.c in Sources */,
-				0014B85709C0D977003A99D5 /* SDL_x11gl.c in Sources */,
-				0014B85909C0D977003A99D5 /* SDL_x11image.c in Sources */,
 				0014B85B09C0D977003A99D5 /* SDL_x11modes.c in Sources */,
 				0014B85D09C0D977003A99D5 /* SDL_x11mouse.c in Sources */,
 				0014B85F09C0D977003A99D5 /* SDL_x11video.c in Sources */,
-				0014B86209C0D977003A99D5 /* SDL_x11wm.c in Sources */,
-				0014B86409C0D977003A99D5 /* SDL_x11yuv.c in Sources */,
-				0014B89209C0DA94003A99D5 /* XF86DGA.c in Sources */,
-				0014B89309C0DA94003A99D5 /* XF86DGA2.c in Sources */,
 				0014B89709C0DAA1003A99D5 /* XF86VMode.c in Sources */,
 				0014B89B09C0DAAE003A99D5 /* Xv.c in Sources */,
 				0014B8A009C0DAB9003A99D5 /* Xinerama.c in Sources */,
@@ -2412,6 +2251,37 @@
 				002F32E509CA0BF600EBEB88 /* SDL_dummyaudio.c in Sources */,
 				046B91EC0A11B53500FB151C /* SDL_sysloadso.c in Sources */,
 				046B92130A11B8AD00FB151C /* SDL_dlcompat.c in Sources */,
+				F3DEB5890C57E182003E2527 /* SDL_audiotypecvt.c in Sources */,
+				F3DEB58E0C57E1EA003E2527 /* SDL_windowevents.c in Sources */,
+				F3DEB5A00C57E282003E2527 /* SDL_rect.c in Sources */,
+				F3DEB5A20C57E282003E2527 /* SDL_renderer_gl.c in Sources */,
+				F3DEB5A30C57E282003E2527 /* SDL_renderer_sw.c in Sources */,
+				F3DEB5C10C57E2BF003E2527 /* SDL_cocoaevents.m in Sources */,
+				F3DEB5C30C57E2BF003E2527 /* SDL_cocoakeyboard.m in Sources */,
+				F3DEB5C60C57E2BF003E2527 /* SDL_cocoamodes.m in Sources */,
+				F3DEB5C80C57E2BF003E2527 /* SDL_cocoamouse.m in Sources */,
+				F3DEB5CA0C57E2BF003E2527 /* SDL_cocoaopengl.m in Sources */,
+				F3DEB5CC0C57E2BF003E2527 /* SDL_cocoavideo.m in Sources */,
+				F3DEB5CE0C57E2BF003E2527 /* SDL_cocoawindow.m in Sources */,
+				F3DEB61C0C57E321003E2527 /* SDL_nullrender.c in Sources */,
+				F3DEB6330C57E3C4003E2527 /* SDL_x11keyboard.c in Sources */,
+				F3DEB6340C57E3C4003E2527 /* SDL_x11opengl.c in Sources */,
+				F3DEB6350C57E3C4003E2527 /* SDL_x11window.c in Sources */,
+				F3DEB6490C57E483003E2527 /* AllCmap.c in Sources */,
+				F3DEB64A0C57E483003E2527 /* CmapAlloc.c in Sources */,
+				F3DEB64B0C57E483003E2527 /* CrCmap.c in Sources */,
+				F3DEB64C0C57E483003E2527 /* DelCmap.c in Sources */,
+				F3DEB64D0C57E483003E2527 /* Distinct.c in Sources */,
+				F3DEB64E0C57E483003E2527 /* LookupCmap.c in Sources */,
+				F3DEB64F0C57E483003E2527 /* StdCmap.c in Sources */,
+				F3DEB6500C57E483003E2527 /* VisCmap.c in Sources */,
+				F317F3C80C789CCF00411C95 /* SDL_blit_auto.c in Sources */,
+				F317F3CA0C789CCF00411C95 /* SDL_blit_copy.c in Sources */,
+				F317F3CC0C789CCF00411C95 /* SDL_blit_slow.c in Sources */,
+				F317F3CE0C789CCF00411C95 /* SDL_fill.c in Sources */,
+				F317F44D0C789F2600411C95 /* SDL_compat.c in Sources */,
+				F306D6A00CB645A900B70512 /* SDL_yuv_mmx.c in Sources */,
+				F38109E30D27B07E002DA2C1 /* imKStoUCS.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2426,13 +2296,10 @@
 				BECDF67F0761BA81005FE872 /* SDL_wave.c in Sources */,
 				BECDF6800761BA81005FE872 /* SDL_romaudio.c in Sources */,
 				BECDF6810761BA81005FE872 /* SDL_cdrom.c in Sources */,
-				BECDF6830761BA81005FE872 /* SDL_active.c in Sources */,
 				BECDF6840761BA81005FE872 /* SDL_events.c in Sources */,
-				BECDF6850761BA81005FE872 /* SDL_expose.c in Sources */,
 				BECDF6860761BA81005FE872 /* SDL_keyboard.c in Sources */,
 				BECDF6870761BA81005FE872 /* SDL_mouse.c in Sources */,
 				BECDF6880761BA81005FE872 /* SDL_quit.c in Sources */,
-				BECDF6890761BA81005FE872 /* SDL_resize.c in Sources */,
 				BECDF68A0761BA81005FE872 /* SDL_rwops.c in Sources */,
 				BECDF68B0761BA81005FE872 /* SDL_joystick.c in Sources */,
 				BECDF68C0761BA81005FE872 /* SDL_thread.c in Sources */,
@@ -2443,26 +2310,18 @@
 				BECDF6960761BA81005FE872 /* SDL_blit_A.c in Sources */,
 				BECDF6970761BA81005FE872 /* SDL_blit_N.c in Sources */,
 				BECDF6980761BA81005FE872 /* SDL_bmp.c in Sources */,
-				BECDF6990761BA81005FE872 /* SDL_cursor.c in Sources */,
 				BECDF69A0761BA81005FE872 /* SDL_gamma.c in Sources */,
 				BECDF69B0761BA81005FE872 /* SDL_pixels.c in Sources */,
 				BECDF69C0761BA81005FE872 /* SDL_RLEaccel.c in Sources */,
 				BECDF69D0761BA81005FE872 /* SDL_stretch.c in Sources */,
 				BECDF69E0761BA81005FE872 /* SDL_surface.c in Sources */,
 				BECDF69F0761BA81005FE872 /* SDL_video.c in Sources */,
-				BECDF6A00761BA81005FE872 /* SDL_yuv.c in Sources */,
 				BECDF6A10761BA81005FE872 /* SDL_yuv_sw.c in Sources */,
 				BECDF6A20761BA81005FE872 /* SDL_error.c in Sources */,
 				BECDF6A30761BA81005FE872 /* SDL_fatal.c in Sources */,
 				BECDF6A50761BA81005FE872 /* SDL.c in Sources */,
 				BECDF6A60761BA81005FE872 /* SDL_sysjoystick.c in Sources */,
 				BECDF6A80761BA81005FE872 /* SDL_syscdrom.c in Sources */,
-				BECDF6A90761BA81005FE872 /* SDL_QuartzEvents.m in Sources */,
-				BECDF6AA0761BA81005FE872 /* SDL_QuartzGL.m in Sources */,
-				BECDF6AB0761BA81005FE872 /* SDL_QuartzVideo.m in Sources */,
-				BECDF6AC0761BA81005FE872 /* SDL_QuartzWindow.m in Sources */,
-				BECDF6AD0761BA81005FE872 /* SDL_QuartzWM.m in Sources */,
-				BECDF6AE0761BA81005FE872 /* SDL_QuartzYUV.m in Sources */,
 				BECDF6AF0761BA81005FE872 /* SDL_cpuinfo.c in Sources */,
 				BECDF6B00761BA81005FE872 /* SDL_coreaudio.c in Sources */,
 				004C2C900975E13300E9D430 /* AudioFilePlayer.c in Sources */,
@@ -2481,24 +2340,13 @@
 				00162D7409BD214F0037C8D0 /* SDL_string.c in Sources */,
 				00162E6A09BD27360037C8D0 /* SDL_mixer_MMX.c in Sources */,
 				00162F4109BE27FB0037C8D0 /* SDL_nullevents.c in Sources */,
-				00162F4309BE27FB0037C8D0 /* SDL_nullmouse.c in Sources */,
 				00162F4509BE27FB0037C8D0 /* SDL_nullvideo.c in Sources */,
-				0014B7F509C0D8D2003A99D5 /* SDL_dgaevents.c in Sources */,
-				0014B7F709C0D8D2003A99D5 /* SDL_dgamouse.c in Sources */,
-				0014B7F809C0D8D2003A99D5 /* SDL_dgavideo.c in Sources */,
-				0014B86609C0D977003A99D5 /* SDL_x11dga.c in Sources */,
 				0014B86709C0D977003A99D5 /* SDL_x11dyn.c in Sources */,
 				0014B86A09C0D977003A99D5 /* SDL_x11events.c in Sources */,
 				0014B86C09C0D977003A99D5 /* SDL_x11gamma.c in Sources */,
-				0014B86E09C0D977003A99D5 /* SDL_x11gl.c in Sources */,
-				0014B87009C0D977003A99D5 /* SDL_x11image.c in Sources */,
 				0014B87209C0D977003A99D5 /* SDL_x11modes.c in Sources */,
 				0014B87409C0D977003A99D5 /* SDL_x11mouse.c in Sources */,
 				0014B87609C0D977003A99D5 /* SDL_x11video.c in Sources */,
-				0014B87909C0D977003A99D5 /* SDL_x11wm.c in Sources */,
-				0014B87B09C0D977003A99D5 /* SDL_x11yuv.c in Sources */,
-				0014B89409C0DA94003A99D5 /* XF86DGA.c in Sources */,
-				0014B89509C0DA94003A99D5 /* XF86DGA2.c in Sources */,
 				0014B89809C0DAA1003A99D5 /* XF86VMode.c in Sources */,
 				0014B89D09C0DAAE003A99D5 /* Xv.c in Sources */,
 				0014B8A109C0DAB9003A99D5 /* Xinerama.c in Sources */,
@@ -2508,14 +2356,37 @@
 				002F32E709CA0BF600EBEB88 /* SDL_dummyaudio.c in Sources */,
 				046B91ED0A11B53500FB151C /* SDL_sysloadso.c in Sources */,
 				046B92140A11B8AD00FB151C /* SDL_dlcompat.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		BECDF6B60761BA81005FE872 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				BECDF6B70761BA81005FE872 /* SDLMain.m in Sources */,
+				F3DEB58A0C57E182003E2527 /* SDL_audiotypecvt.c in Sources */,
+				F3DEB58F0C57E1EA003E2527 /* SDL_windowevents.c in Sources */,
+				F3DEB5A40C57E282003E2527 /* SDL_rect.c in Sources */,
+				F3DEB5A60C57E282003E2527 /* SDL_renderer_gl.c in Sources */,
+				F3DEB5A70C57E282003E2527 /* SDL_renderer_sw.c in Sources */,
+				F3DEB5D00C57E2BF003E2527 /* SDL_cocoaevents.m in Sources */,
+				F3DEB5D20C57E2BF003E2527 /* SDL_cocoakeyboard.m in Sources */,
+				F3DEB5D50C57E2BF003E2527 /* SDL_cocoamodes.m in Sources */,
+				F3DEB5D70C57E2BF003E2527 /* SDL_cocoamouse.m in Sources */,
+				F3DEB5D90C57E2BF003E2527 /* SDL_cocoaopengl.m in Sources */,
+				F3DEB5DB0C57E2BF003E2527 /* SDL_cocoavideo.m in Sources */,
+				F3DEB5DD0C57E2BF003E2527 /* SDL_cocoawindow.m in Sources */,
+				F3DEB61E0C57E321003E2527 /* SDL_nullrender.c in Sources */,
+				F3DEB6360C57E3C4003E2527 /* SDL_x11keyboard.c in Sources */,
+				F3DEB6370C57E3C4003E2527 /* SDL_x11opengl.c in Sources */,
+				F3DEB6380C57E3C4003E2527 /* SDL_x11window.c in Sources */,
+				F3DEB6510C57E483003E2527 /* AllCmap.c in Sources */,
+				F3DEB6520C57E483003E2527 /* CmapAlloc.c in Sources */,
+				F3DEB6530C57E483003E2527 /* CrCmap.c in Sources */,
+				F3DEB6540C57E483003E2527 /* DelCmap.c in Sources */,
+				F3DEB6550C57E483003E2527 /* Distinct.c in Sources */,
+				F3DEB6560C57E483003E2527 /* LookupCmap.c in Sources */,
+				F3DEB6570C57E483003E2527 /* StdCmap.c in Sources */,
+				F3DEB6580C57E483003E2527 /* VisCmap.c in Sources */,
+				F317F3D80C789CCF00411C95 /* SDL_blit_auto.c in Sources */,
+				F317F3DA0C789CCF00411C95 /* SDL_blit_copy.c in Sources */,
+				F317F3DC0C789CCF00411C95 /* SDL_blit_slow.c in Sources */,
+				F317F3DE0C789CCF00411C95 /* SDL_fill.c in Sources */,
+				F317F44E0C789F2600411C95 /* SDL_compat.c in Sources */,
+				F306D6A10CB645AF00B70512 /* SDL_yuv_mmx.c in Sources */,
+				F38109E40D27B07E002DA2C1 /* imKStoUCS.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2628,23 +2499,28 @@
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_VERSION = A;
+				FRAMEWORK_VERSION = B;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
-					"SDL_VIDEO_DRIVER_DGA=1",
 					"SDL_VIDEO_DRIVER_X11=1",
-					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC=\"/usr/X11R6/lib/libX11.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\"/usr/X11R6/lib/libXext.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\"/usr/X11R6/lib/libXrandr.2.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\"/usr/X11R6/lib/libXrender.1.dylib\"",
+					"SDL_VIDEO_DRIVER_X11_DPMS=1",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
 					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
 					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
 					"SDL_VIDEO_DRIVER_X11_XME=1",
 					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
 					"SDL_VIDEO_DRIVER_X11_XV=1",
+					"SDL_VIDEO_OPENGL_GLX=1",
 				);
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				HEADER_SEARCH_PATHS = /usr/X11R6/include;
 				INFOPLIST_FILE = "Info-Framework.plist";
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
@@ -2664,23 +2540,28 @@
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_VERSION = A;
+				FRAMEWORK_VERSION = B;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
-					"SDL_VIDEO_DRIVER_DGA=1",
 					"SDL_VIDEO_DRIVER_X11=1",
-					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC=\"/usr/X11R6/lib/libX11.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\"/usr/X11R6/lib/libXext.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\"/usr/X11R6/lib/libXrandr.2.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\"/usr/X11R6/lib/libXrender.1.dylib\"",
+					"SDL_VIDEO_DRIVER_X11_DPMS=1",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
 					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
 					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
 					"SDL_VIDEO_DRIVER_X11_XME=1",
 					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
 					"SDL_VIDEO_DRIVER_X11_XV=1",
+					"SDL_VIDEO_OPENGL_GLX=1",
 				);
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				HEADER_SEARCH_PATHS = /usr/X11R6/include;
 				INFOPLIST_FILE = "Info-Framework.plist";
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
@@ -2700,23 +2581,28 @@
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_VERSION = A;
+				FRAMEWORK_VERSION = B;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
-					"SDL_VIDEO_DRIVER_DGA=1",
 					"SDL_VIDEO_DRIVER_X11=1",
-					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC=\"/usr/X11R6/lib/libX11.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\"/usr/X11R6/lib/libXext.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\"/usr/X11R6/lib/libXrandr.2.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\"/usr/X11R6/lib/libXrender.1.dylib\"",
+					"SDL_VIDEO_DRIVER_X11_DPMS=1",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
 					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
 					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
 					"SDL_VIDEO_DRIVER_X11_XME=1",
 					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
 					"SDL_VIDEO_DRIVER_X11_XV=1",
+					"SDL_VIDEO_OPENGL_GLX=1",
 				);
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				HEADER_SEARCH_PATHS = /usr/X11R6/include;
 				INFOPLIST_FILE = "Info-Framework.plist";
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
@@ -2739,16 +2625,20 @@
 					"SDL_VIDEO_DRIVER_DGA=1",
 					"SDL_VIDEO_DRIVER_X11=1",
 					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC=\"/usr/X11R6/lib/libX11.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\"/usr/X11R6/lib/libXext.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\"/usr/X11R6/lib/libXrandr.2.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\"/usr/X11R6/lib/libXrender.1.dylib\"",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
 					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
 					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
 					"SDL_VIDEO_DRIVER_X11_XME=1",
 					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
 					"SDL_VIDEO_DRIVER_X11_XV=1",
 				);
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
 				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
 				OTHER_CFLAGS_i386 = "";
 				OTHER_CFLAGS_ppc = "";
@@ -2764,16 +2654,20 @@
 					"SDL_VIDEO_DRIVER_DGA=1",
 					"SDL_VIDEO_DRIVER_X11=1",
 					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC=\"/usr/X11R6/lib/libX11.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\"/usr/X11R6/lib/libXext.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\"/usr/X11R6/lib/libXrandr.2.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\"/usr/X11R6/lib/libXrender.1.dylib\"",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
 					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
 					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
 					"SDL_VIDEO_DRIVER_X11_XME=1",
 					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
 					"SDL_VIDEO_DRIVER_X11_XV=1",
 				);
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
 				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
 				OTHER_CFLAGS_i386 = "";
 				OTHER_CFLAGS_ppc = "";
@@ -2789,16 +2683,20 @@
 					"SDL_VIDEO_DRIVER_DGA=1",
 					"SDL_VIDEO_DRIVER_X11=1",
 					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC=\"/usr/X11R6/lib/libX11.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\"/usr/X11R6/lib/libXext.6.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\"/usr/X11R6/lib/libXrandr.2.dylib\"",
-					"SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\"/usr/X11R6/lib/libXrender.1.dylib\"",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
+					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
 					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
 					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
 					"SDL_VIDEO_DRIVER_X11_XME=1",
 					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
 					"SDL_VIDEO_DRIVER_X11_XV=1",
 				);
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
 				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
 				OTHER_CFLAGS_i386 = "";
 				OTHER_CFLAGS_ppc = "";
@@ -2806,27 +2704,6 @@
 			};
 			name = Default;
 		};
-		007317830858DB0500B2BC32 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = SDLmain;
-			};
-			name = Development;
-		};
-		007317840858DB0500B2BC32 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = SDLmain;
-			};
-			name = Deployment;
-		};
-		007317850858DB0500B2BC32 /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = SDLmain;
-			};
-			name = Default;
-		};
 		007317870858DB0500B2BC32 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -2993,16 +2870,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Default;
 		};
-		007317820858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Main Library" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				007317830858DB0500B2BC32 /* Development */,
-				007317840858DB0500B2BC32 /* Deployment */,
-				007317850858DB0500B2BC32 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
 		007317860858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Standard DMG" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Xcode/SDLTest/Info-testwm2.plist	Sun Jul 20 21:34:04 2008 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.testwm2</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.testwm2</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
--- a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj	Sun Jul 20 16:21:15 2008 +0000
+++ b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj	Sun Jul 20 21:34:04 2008 +0000
@@ -12,18 +12,6 @@
 			buildConfigurationList = 001B599808BDB826006539E9 /* Build configuration list for PBXAggregateTarget "All" */;
 			buildPhases = (
 			);
-			buildSettings = {
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = "Build All";
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
 			dependencies = (
 				003FA6A809400236000C53B3 /* PBXTargetDependency */,
 				BEC568010761D90600A33029 /* PBXTargetDependency */,
@@ -63,11 +51,7 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		002F337509CA14F900EBEB88 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
-		002F337909CA14F900EBEB88 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
 		002F337A09CA14F900EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL.framework */; };
-		002F338B09CA16BF00EBEB88 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
-		002F338F09CA16BF00EBEB88 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
 		002F339009CA16BF00EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL.framework */; };
 		002F339B09CA17BC00EBEB88 /* testblitspeed.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F339A09CA17BC00EBEB88 /* testblitspeed.c */; };
 		002F33A809CA188600EBEB88 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
@@ -96,28 +80,18 @@
 		002F33BF09CA188600EBEB88 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
 		002F33C009CA188600EBEB88 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
 		002F33C109CA188600EBEB88 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
-		002F33CF09CA19A600EBEB88 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
-		002F33D209CA19A600EBEB88 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
 		002F33D309CA19A600EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL.framework */; };
 		002F33D409CA19A600EBEB88 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
 		002F33E309CA1A0B00EBEB88 /* testdyngl.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F33E209CA1A0B00EBEB88 /* testdyngl.c */; };
-		002F340609CA1BFF00EBEB88 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
-		002F340909CA1BFF00EBEB88 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
 		002F340A09CA1BFF00EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL.framework */; };
 		002F340B09CA1BFF00EBEB88 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
 		002F341809CA1C5B00EBEB88 /* testfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F341709CA1C5B00EBEB88 /* testfile.c */; };
-		002F342509CA1F0300EBEB88 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
-		002F342809CA1F0300EBEB88 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
 		002F342909CA1F0300EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL.framework */; };
 		002F342A09CA1F0300EBEB88 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
 		002F343709CA1F6F00EBEB88 /* testiconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F343609CA1F6F00EBEB88 /* testiconv.c */; };
-		002F344109CA1FB300EBEB88 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
-		002F344409CA1FB300EBEB88 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
 		002F344509CA1FB300EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL.framework */; };
 		002F344609CA1FB300EBEB88 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
 		002F345409CA202000EBEB88 /* testoverlay2.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F345209CA201C00EBEB88 /* testoverlay2.c */; };
-		002F345E09CA204F00EBEB88 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
-		002F346109CA204F00EBEB88 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
 		002F346209CA204F00EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL.framework */; };
 		002F346309CA204F00EBEB88 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
 		002F347009CA20A600EBEB88 /* testplatform.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F346F09CA20A600EBEB88 /* testplatform.c */; };
@@ -157,110 +131,35 @@
 		00794F0B09D238F4003FC8A1 /* sample.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6109D20839003FC8A1 /* sample.bmp */; };
 		00794F1109D2392B003FC8A1 /* icon.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.bmp */; };
 		00794F8709D2413B003FC8A1 /* sample.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6109D20839003FC8A1 /* sample.bmp */; };
-		BEC566AF0761D90300A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC566B10761D90300A33029 /* checkkeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 092D6D10FFB30A2C7F000001 /* checkkeys.c */; };
-		BEC566BC0761D90300A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC566BE0761D90300A33029 /* graywin.c in Sources */ = {isa = PBXBuildFile; fileRef = 092D6D1BFFB30C237F000001 /* graywin.c */; };
-		BEC566C90761D90300A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC566CB0761D90300A33029 /* loopwave.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4872006D84C97F000001 /* loopwave.c */; };
-		BEC566D70761D90300A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC566D90761D90300A33029 /* testalpha.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4874006D84F77F000001 /* testalpha.c */; };
-		BEC566E50761D90300A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC566E70761D90300A33029 /* testbitmap.c in Sources */ = {isa = PBXBuildFile; fileRef = 092D6D25FFB30D1A7F000001 /* testbitmap.c */; };
-		BEC566F20761D90300A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC566F40761D90300A33029 /* testcdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4876006D85297F000001 /* testcdrom.c */; };
-		BEC566FF0761D90300A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567010761D90300A33029 /* testerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4878006D85357F000001 /* testerror.c */; };
-		BEC5670C0761D90400A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC5670E0761D90400A33029 /* testgamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E487A006D85477F000001 /* testgamma.c */; };
-		BEC5671A0761D90400A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC5671C0761D90400A33029 /* testgl.c in Sources */ = {isa = PBXBuildFile; fileRef = 092D6D4EFFB311087F000001 /* testgl.c */; };
-		BEC567270761D90400A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567290761D90400A33029 /* testhread.c in Sources */ = {isa = PBXBuildFile; fileRef = 092D6D58FFB311A97F000001 /* testhread.c */; };
-		BEC567340761D90400A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567360761D90400A33029 /* testjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 092D6D62FFB312AA7F000001 /* testjoystick.c */; };
-		BEC567410761D90400A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567430761D90400A33029 /* testkeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 092D6D6CFFB313437F000001 /* testkeys.c */; };
-		BEC5674E0761D90400A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567500761D90400A33029 /* testlock.c in Sources */ = {isa = PBXBuildFile; fileRef = 092D6D75FFB313BB7F000001 /* testlock.c */; };
 		BEC5675D0761D90400A33029 /* testoverlay.c in Sources */ = {isa = PBXBuildFile; fileRef = F57DC39802A6E6A201D28762 /* testoverlay.c */; };
-		BEC567680761D90400A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC5676A0761D90400A33029 /* testpalette.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E487C006D856B7F000001 /* testpalette.c */; };
-		BEC567760761D90500A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567780761D90500A33029 /* testsem.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E487E006D86A17F000001 /* testsem.c */; };
-		BEC567830761D90500A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567850761D90500A33029 /* testsprite.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E487F006D86A17F000001 /* testsprite.c */; };
-		BEC567910761D90500A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567930761D90500A33029 /* testtimer.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4880006D86A17F000001 /* testtimer.c */; };
-		BEC567AB0761D90500A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567AD0761D90500A33029 /* testver.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4882006D86A17F000001 /* testver.c */; };
-		BEC567B80761D90500A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567BA0761D90500A33029 /* testvidinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4883006D86A17F000001 /* testvidinfo.c */; };
-		BEC567C50761D90500A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567C70761D90500A33029 /* testwin.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4884006D86A17F000001 /* testwin.c */; };
-		BEC567D30761D90500A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567D50761D90500A33029 /* testwm.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4885006D86A17F000001 /* testwm.c */; };
-		BEC567E10761D90600A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567E30761D90600A33029 /* threadwin.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4886006D86A17F000001 /* threadwin.c */; };
-		BEC567EE0761D90600A33029 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2EECDF3D0086C5EA7F000001 /* SDLMain.nib */; };
 		BEC567F00761D90600A33029 /* torturethread.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4887006D86A17F000001 /* torturethread.c */; };
-		BEC567F90761D90600A33029 /* SDLMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EECDF3B0086C5EA7F000001 /* SDLMain.h */; };
-		BEC567FA0761D90600A33029 /* libsdlmain_prefix.h in Headers */ = {isa = PBXBuildFile; fileRef = B207FF2404E1B19600A80002 /* libsdlmain_prefix.h */; };
-		BEC567FC0761D90600A33029 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EECDF3C0086C5EA7F000001 /* SDLMain.m */; };
-		BEC568620761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568630761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568640761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568650761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568660761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568670761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568680761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568690761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC5686A0761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC5686B0761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC5686C0761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC5686D0761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC5686E0761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC5686F0761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568700761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568710761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568720761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568730761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568750761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568760761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568770761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568780761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC568790761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
-		BEC5687A0761D90600A33029 /* libsdlmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC567FF0761D90600A33029 /* libsdlmain.a */; };
+		F3DEB70D0C58C17E003E2527 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6A50C58BF48003E2527 /* common.c */; };
+		F3DEB70E0C58C17E003E2527 /* testwm2.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DEB6A70C58BF51003E2527 /* testwm2.c */; };
+		F3DEB70F0C58C186003E2527 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL.framework */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildStyle section */
-		0153847F006D83E07F000001 /* Development */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_LDFLAGS = "\U0001";
-				ZERO_LINK = YES;
-			};
-			name = Development;
-		};
-		01538480006D83E07F000001 /* Deployment */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUGGING_SYMBOLS = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				OPTIMIZATION_CFLAGS = "-O3";
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
 		002F332709CA0EEA00EBEB88 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -276,55 +175,6 @@
 			remoteGlobalIDString = 002F327609CA02D800EBEB88;
 			remoteInfo = "Static Library Without X11 Stuff (for those who didn't install the X11 headers with Xcode)";
 		};
-		002F337209CA14F900EBEB88 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		002F338809CA16BF00EBEB88 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		002F33CC09CA19A600EBEB88 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		002F340309CA1BFF00EBEB88 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		002F342209CA1F0300EBEB88 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		002F343E09CA1FB300EBEB88 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		002F345B09CA204F00EBEB88 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
 		002F347809CA215600EBEB88 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -388,13 +238,6 @@
 			remoteGlobalIDString = BECDF6B30761BA81005FE872;
 			remoteInfo = "Static Library";
 		};
-		003FA646093FFD41000C53B3 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 003FA63A093FFD41000C53B3 /* SDL.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = BECDF6BA0761BA81005FE872;
-			remoteInfo = "Main Library";
-		};
 		003FA648093FFD41000C53B3 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 003FA63A093FFD41000C53B3 /* SDL.xcodeproj */;
@@ -577,174 +420,6 @@
 			remoteGlobalIDString = BEC567EA0761D90600A33029;
 			remoteInfo = "torturethread (Upgraded)";
 		};
-		BEC568300761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568320761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568340761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568360761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568380761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC5683A0761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC5683C0761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC5683E0761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568400761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568420761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568440761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568460761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568480761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC5684A0761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC5684C0761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC5684E0761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568500761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568520761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568560761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568580761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC5685A0761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC5685C0761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC5685E0761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
-		BEC568600761D90600A33029 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = BEC567F70761D90600A33029;
-			remoteInfo = "libsdlmain.a (Upgraded)";
-		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -862,7 +537,7 @@
 
 /* Begin PBXFileReference section */
 		002F338109CA14F900EBEB88 /* test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = test.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		002F339709CA16BF00EBEB88 /* test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = test.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		002F339709CA16BF00EBEB88 /* testblitspeed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testblitspeed.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		002F339A09CA17BC00EBEB88 /* testblitspeed.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testblitspeed.c; path = ../../test/testblitspeed.c; sourceTree = SOURCE_ROOT; };
 		002F33A709CA188600EBEB88 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		002F33DB09CA19A600EBEB88 /* testdyngl.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testdyngl.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -907,10 +582,6 @@
 		092D6D62FFB312AA7F000001 /* testjoystick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testjoystick.c; path = ../../test/testjoystick.c; sourceTree = SOURCE_ROOT; };
 		092D6D6CFFB313437F000001 /* testkeys.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testkeys.c; path = ../../test/testkeys.c; sourceTree = SOURCE_ROOT; };
 		092D6D75FFB313BB7F000001 /* testlock.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testlock.c; path = ../../test/testlock.c; sourceTree = SOURCE_ROOT; };
-		2EECDF3B0086C5EA7F000001 /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDLMain.h; path = ../../src/main/macosx/SDLMain.h; sourceTree = SOURCE_ROOT; };
-		2EECDF3C0086C5EA7F000001 /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SDLMain.m; path = ../../src/main/macosx/SDLMain.m; sourceTree = SOURCE_ROOT; };
-		2EECDF3D0086C5EA7F000001 /* SDLMain.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SDLMain.nib; path = ../../src/main/macosx/SDLMain.nib; sourceTree = SOURCE_ROOT; };
-		B207FF2404E1B19600A80002 /* libsdlmain_prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libsdlmain_prefix.h; sourceTree = "<group>"; };
 		BEC566B60761D90300A33029 /* checkkeys.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = checkkeys.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		BEC566C30761D90300A33029 /* graywin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = graywin.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		BEC566D10761D90300A33029 /* loopwave.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = loopwave.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -935,7 +606,10 @@
 		BEC567DB0761D90600A33029 /* testwm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testwm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		BEC567E80761D90600A33029 /* threadwin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = threadwin.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		BEC567F50761D90600A33029 /* torturethread.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = torturethread.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		BEC567FF0761D90600A33029 /* libsdlmain.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsdlmain.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		F3DEB6A50C58BF48003E2527 /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../../test/common.c; sourceTree = SOURCE_ROOT; };
+		F3DEB6A70C58BF51003E2527 /* testwm2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testwm2.c; path = ../../test/testwm2.c; sourceTree = SOURCE_ROOT; };
+		F3DEB7060C58C13E003E2527 /* testwm2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testwm2.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		F3DEB7080C58C13E003E2527 /* Info-testwm2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-testwm2.plist"; sourceTree = "<group>"; };
 		F57DC39802A6E6A201D28762 /* testoverlay.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testoverlay.c; path = ../../test/testoverlay.c; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
@@ -944,7 +618,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F337909CA14F900EBEB88 /* libsdlmain.a in Frameworks */,
 				002F337A09CA14F900EBEB88 /* SDL.framework in Frameworks */,
 				002F33A909CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -954,7 +627,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F338F09CA16BF00EBEB88 /* libsdlmain.a in Frameworks */,
 				002F339009CA16BF00EBEB88 /* SDL.framework in Frameworks */,
 				002F33A809CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -964,7 +636,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F33D209CA19A600EBEB88 /* libsdlmain.a in Frameworks */,
 				002F33D309CA19A600EBEB88 /* SDL.framework in Frameworks */,
 				002F33D409CA19A600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -974,7 +645,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F340909CA1BFF00EBEB88 /* libsdlmain.a in Frameworks */,
 				002F340A09CA1BFF00EBEB88 /* SDL.framework in Frameworks */,
 				002F340B09CA1BFF00EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -984,7 +654,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F342809CA1F0300EBEB88 /* libsdlmain.a in Frameworks */,
 				002F342909CA1F0300EBEB88 /* SDL.framework in Frameworks */,
 				002F342A09CA1F0300EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -994,7 +663,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F344409CA1FB300EBEB88 /* libsdlmain.a in Frameworks */,
 				002F344509CA1FB300EBEB88 /* SDL.framework in Frameworks */,
 				002F344609CA1FB300EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1004,7 +672,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F346109CA204F00EBEB88 /* libsdlmain.a in Frameworks */,
 				002F346209CA204F00EBEB88 /* SDL.framework in Frameworks */,
 				002F346309CA204F00EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1014,7 +681,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568620761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA64D093FFDB3000C53B3 /* SDL.framework in Frameworks */,
 				002F33C109CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1024,7 +690,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568630761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA64E093FFDB5000C53B3 /* SDL.framework in Frameworks */,
 				002F33C009CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1034,7 +699,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568640761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA64F093FFDB7000C53B3 /* SDL.framework in Frameworks */,
 				002F33BF09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1044,7 +708,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568650761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA650093FFDBA000C53B3 /* SDL.framework in Frameworks */,
 				002F33BE09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1054,7 +717,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568660761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA651093FFDBC000C53B3 /* SDL.framework in Frameworks */,
 				002F33BD09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1064,7 +726,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568670761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA652093FFDBE000C53B3 /* SDL.framework in Frameworks */,
 				002F33BB09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1074,7 +735,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568680761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA653093FFDC1000C53B3 /* SDL.framework in Frameworks */,
 				002F33BC09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1084,7 +744,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568690761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA654093FFDC3000C53B3 /* SDL.framework in Frameworks */,
 				002F33BA09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1094,7 +753,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5686A0761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA655093FFDC6000C53B3 /* SDL.framework in Frameworks */,
 				002F33B909CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 				00794DD909D1F894003FC8A1 /* OpenGL.framework in Frameworks */,
@@ -1105,7 +763,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5686B0761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA656093FFDC8000C53B3 /* SDL.framework in Frameworks */,
 				002F33B809CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1115,7 +772,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5686C0761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA657093FFDCA000C53B3 /* SDL.framework in Frameworks */,
 				002F33B709CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1125,7 +781,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5686D0761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA658093FFDCC000C53B3 /* SDL.framework in Frameworks */,
 				002F33B509CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1135,7 +790,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5686E0761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA659093FFDCF000C53B3 /* SDL.framework in Frameworks */,
 				002F33B609CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1145,7 +799,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5686F0761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA65A093FFDD1000C53B3 /* SDL.framework in Frameworks */,
 				002F33B409CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1155,7 +808,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568700761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA65B093FFDD3000C53B3 /* SDL.framework in Frameworks */,
 				002F33B309CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1165,7 +817,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568710761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA65C093FFDD5000C53B3 /* SDL.framework in Frameworks */,
 				002F33B209CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1175,7 +826,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568720761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA65D093FFDD7000C53B3 /* SDL.framework in Frameworks */,
 				002F33B109CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1185,7 +835,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568730761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA65E093FFDDA000C53B3 /* SDL.framework in Frameworks */,
 				002F33B009CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1195,7 +844,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568750761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA660093FFDDF000C53B3 /* SDL.framework in Frameworks */,
 				002F33AF09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1205,7 +853,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568760761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA661093FFDE1000C53B3 /* SDL.framework in Frameworks */,
 				002F33AE09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1215,7 +862,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568770761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA662093FFDE3000C53B3 /* SDL.framework in Frameworks */,
 				002F33AD09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1225,7 +871,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568780761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA663093FFDE6000C53B3 /* SDL.framework in Frameworks */,
 				002F33AC09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1235,7 +880,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC568790761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA665093FFDEA000C53B3 /* SDL.framework in Frameworks */,
 				002F33AB09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
@@ -1245,16 +889,16 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5687A0761D90600A33029 /* libsdlmain.a in Frameworks */,
 				003FA664093FFDE8000C53B3 /* SDL.framework in Frameworks */,
 				002F33AA09CA188600EBEB88 /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BEC567FD0761D90600A33029 /* Frameworks */ = {
+		F3DEB7040C58C13E003E2527 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F3DEB70F0C58C186003E2527 /* SDL.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1275,7 +919,6 @@
 			children = (
 				003FA643093FFD41000C53B3 /* SDL.framework */,
 				003FA645093FFD41000C53B3 /* libSDL.a */,
-				003FA647093FFD41000C53B3 /* libSDLmain.a */,
 				003FA649093FFD41000C53B3 /* Standard DMG */,
 				003FA64B093FFD41000C53B3 /* Developer Extras Package */,
 				002F332809CA0EEA00EBEB88 /* SDL.framework */,
@@ -1303,13 +946,10 @@
 			children = (
 				003FA63A093FFD41000C53B3 /* SDL.xcodeproj */,
 				08FB7795FE84155DC02AAC07 /* Source */,
-				2EECDF3B0086C5EA7F000001 /* SDLMain.h */,
-				2EECDF3C0086C5EA7F000001 /* SDLMain.m */,
-				B207FF2404E1B19600A80002 /* libsdlmain_prefix.h */,
-				2EECDF3D0086C5EA7F000001 /* SDLMain.nib */,
 				002F33A209CA183B00EBEB88 /* Linked Frameworks */,
 				00794E4609D207B4003FC8A1 /* Resources */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,
+				F3DEB7080C58C13E003E2527 /* Info-testwm2.plist */,
 			);
 			comments = "I made these tests link against our \"default\" framework which includes X11 stuff. If you didn't install the X11 headers with Xcode, you might have problems building the SDL.framework (which is a dependency). You can swap the dependencies around to get around this, or you can modify the default SDL.framework target to not include X11 stuff. (Go into its target build options and remove all the Preprocessor macros.)\n\n\n\nWe are sort of in a half-way state at the moment. Going \"all-the-way\" means we copy the SDL.framework inside the app bundle so we can run the test without the step of the user \"installing\" the framework. But there is an oversight/bug in Xcode that doesn't correctly find the location of the framework when in an embedded/nested Xcode project. We could probably try to hack this with a shell script that checks multiple directories for existence, but this is messier and more work than I prefer, so I rather just wait for Apple to fix this. In the meantime...\n\nThe \"All\" target will build the SDL framework from the Xcode project. The other targets do not have this dependency set (for flexibility reasons in case we make changes). If you have not built the framework, you will probably be unable to link. You will either need to build the framework, or you need to add \"-framework SDL\" to the link options and make sure you have the SDL.framework installed somewhere where it can be seen (like /Library/Frameworks...I think we already set this one up.) \n\nTo run though, you should have a copy of the SDL.framework in /Library/Frameworks or ~/Library/Frameworks.\n\n\n\n\ntestgl and testdyngl need -DHAVE_OPENGL\ntestgl needs to link against OpenGL.framework\n\n";
 			name = SDLTest;
@@ -1318,6 +958,8 @@
 		08FB7795FE84155DC02AAC07 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				F3DEB6A50C58BF48003E2527 /* common.c */,
+				F3DEB6A70C58BF51003E2527 /* testwm2.c */,
 				092D6D10FFB30A2C7F000001 /* checkkeys.c */,
 				092D6D1BFFB30C237F000001 /* graywin.c */,
 				083E4872006D84C97F000001 /* loopwave.c */,
@@ -1379,14 +1021,14 @@
 				BEC567DB0761D90600A33029 /* testwm.app */,
 				BEC567E80761D90600A33029 /* threadwin.app */,
 				BEC567F50761D90600A33029 /* torturethread.app */,
-				BEC567FF0761D90600A33029 /* libsdlmain.a */,
 				002F338109CA14F900EBEB88 /* test.app */,
-				002F339709CA16BF00EBEB88 /* test.app */,
+				002F339709CA16BF00EBEB88 /* testblitspeed.app */,
 				002F33DB09CA19A600EBEB88 /* testdyngl.app */,
 				002F341209CA1BFF00EBEB88 /* testfile.app */,
 				002F343109CA1F0300EBEB88 /* testiconv.app */,
 				002F344D09CA1FB300EBEB88 /* testoverlay2.app */,
 				002F346A09CA204F00EBEB88 /* testplatform.app */,
+				F3DEB7060C58C13E003E2527 /* testwm2.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1611,15 +1253,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BEC567F80761D90600A33029 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				BEC567F90761D90600A33029 /* SDLMain.h in Headers */,
-				BEC567FA0761D90600A33029 /* libsdlmain_prefix.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
@@ -1634,29 +1267,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testalpha__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testalpha;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				002F337109CA14F900EBEB88 /* PBXTargetDependency */,
 			);
 			name = test;
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -1676,34 +1287,12 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testalpha__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testalpha;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				002F338709CA16BF00EBEB88 /* PBXTargetDependency */,
 			);
 			name = testblitspeed;
 			productInstallPath = "$(USER_APPS_DIR)";
 			productName = testalpha;
-			productReference = 002F339709CA16BF00EBEB88 /* test.app */;
+			productReference = 002F339709CA16BF00EBEB88 /* testblitspeed.app */;
 			productType = "com.apple.product-type.application";
 		};
 		002F33CA09CA19A600EBEB88 /* testdyngl */ = {
@@ -1717,29 +1306,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testalpha__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testalpha;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				002F33CB09CA19A600EBEB88 /* PBXTargetDependency */,
 			);
 			name = testdyngl;
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -1758,29 +1325,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testalpha__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testalpha;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				002F340209CA1BFF00EBEB88 /* PBXTargetDependency */,
 			);
 			name = testfile;
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -1800,29 +1345,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testalpha__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testalpha;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				002F342109CA1F0300EBEB88 /* PBXTargetDependency */,
 			);
 			name = testiconv;
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -1842,29 +1365,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testalpha__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testalpha;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				002F343D09CA1FB300EBEB88 /* PBXTargetDependency */,
 			);
 			name = testoverlay2;
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -1883,29 +1384,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testalpha__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testalpha;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				002F345A09CA204F00EBEB88 /* PBXTargetDependency */,
 			);
 			name = testplatform;
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -1924,29 +1403,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-checkkeys__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = checkkeys;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568310761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "checkkeys (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -1965,29 +1422,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks/\"";
-				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-graywin__Upgraded_.plist";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = graywin;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568330761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "graywin (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2007,28 +1442,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-loopwave__Upgraded_.plist";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = loopwave;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568350761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "loopwave (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2048,29 +1462,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testalpha__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testalpha;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568370761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testalpha (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2089,29 +1481,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testbitmap__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testbitmap;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568390761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testbitmap (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2130,29 +1500,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testcdrom__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testcdrom;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC5683B0761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testcdrom (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2171,29 +1519,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testerror__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testerror;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC5683D0761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testerror (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2213,29 +1539,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testgamma__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testgamma;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC5683F0761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testgamma (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2254,32 +1558,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				GCC_PREPROCESSOR_DEFINITIONS = HAVE_OPENGL;
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testgl__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-					"-framework",
-					OpenGL,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testgl;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568410761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testgl (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2298,29 +1577,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testthread__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testthread;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568430761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testthread (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2339,29 +1596,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testjoystick__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testjoystick;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568450761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testjoystick (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2380,29 +1615,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testkeys__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testkeys;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568470761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testkeys (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2421,29 +1634,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testlock__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testlock;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568490761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testlock (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2463,29 +1654,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testoverlay__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Cocoa,
-					"-framework",
-					SDL,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testoverlay;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC5684B0761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testoverlay (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2505,29 +1674,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testpalette__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testpalette;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC5684D0761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testpalette (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2546,29 +1693,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testsem__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testsem;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC5684F0761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testsem (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2588,31 +1713,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testsprite__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testsprite;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568510761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testsprite (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2631,29 +1732,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testtimer__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testtimer;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568530761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testtimer (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2672,29 +1751,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testversion__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testversion;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568570761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testversion (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2713,30 +1770,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testvidinfo__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testvidinfo;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568590761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testvidinfo (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2756,29 +1790,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testwin__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testwin;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC5685B0761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testwin (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2798,30 +1810,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-testwm__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = testwm;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC5685D0761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "testwm (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2840,29 +1829,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-threadwin__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = threadwin;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC5685F0761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "threadwin (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2881,29 +1848,7 @@
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "\"/Library/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				INFOPLIST_FILE = "Info-torturethread__Upgraded_.plist";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					SDL,
-					"-framework",
-					Cocoa,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = torturethread;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
 			dependencies = (
-				BEC568610761D90600A33029 /* PBXTargetDependency */,
 			);
 			name = "torturethread (Upgraded)";
 			productInstallPath = "$(USER_APPS_DIR)";
@@ -2911,43 +1856,22 @@
 			productReference = BEC567F50761D90600A33029 /* torturethread.app */;
 			productType = "com.apple.product-type.application";
 		};
-		BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */ = {
+		F3DEB7050C58C13E003E2527 /* testwm2 */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 001B593408BDB826006539E9 /* Build configuration list for PBXNativeTarget "libsdlmain.a (Upgraded)" */;
+			buildConfigurationList = F3DEB7090C58C13E003E2527 /* Build configuration list for PBXNativeTarget "testwm2" */;
 			buildPhases = (
-				BEC567F80761D90600A33029 /* Headers */,
-				BEC567FB0761D90600A33029 /* Sources */,
-				BEC567FD0761D90600A33029 /* Frameworks */,
-				BEC567FE0761D90600A33029 /* Rez */,
+				F3DEB7020C58C13E003E2527 /* Resources */,
+				F3DEB7030C58C13E003E2527 /* Sources */,
+				F3DEB7040C58C13E003E2527 /* Frameworks */,
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = libsdlmain_prefix.h;
-				HEADER_SEARCH_PATHS = "\"/Library/Frameworks/SDL.framework/Headers\"";
-				LIBRARY_STYLE = STATIC;
-				OTHER_CFLAGS = "";
-				OTHER_LIBTOOL_FLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = sdlmain;
-				REZ_EXECUTABLE = YES;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
 			dependencies = (
 			);
-			name = "libsdlmain.a (Upgraded)";
-			productInstallPath = /usr/local/lib;
-			productName = libsdlmain.a;
-			productReference = BEC567FF0761D90600A33029 /* libsdlmain.a */;
-			productType = "com.apple.product-type.library.static";
+			name = testwm2;
+			productName = testwm2;
+			productReference = F3DEB7060C58C13E003E2527 /* testwm2.app */;
+			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
 
@@ -2955,12 +1879,7 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 001B5A0C08BDB826006539E9 /* Build configuration list for PBXProject "SDLTest" */;
-			buildSettings = {
-			};
-			buildStyles = (
-				01538480006D83E07F000001 /* Deployment */,
-				0153847F006D83E07F000001 /* Development */,
-			);
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 08FB7794FE84155DC02AAC07 /* SDLTest */;
 			projectDirPath = "";
@@ -2970,6 +1889,7 @@
 					ProjectRef = 003FA63A093FFD41000C53B3 /* SDL.xcodeproj */;
 				},
 			);
+			projectRoot = ../..;
 			targets = (
 				BEC566920761D90300A33029 /* All */,
 				BEC566AB0761D90300A33029 /* checkkeys (Upgraded) */,
@@ -3002,8 +1922,8 @@
 				BEC567CF0761D90500A33029 /* testwm (Upgraded) */,
 				BEC567DD0761D90600A33029 /* threadwin (Upgraded) */,
 				BEC567EA0761D90600A33029 /* torturethread (Upgraded) */,
-				BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */,
 				002F337009CA14F900EBEB88 /* test */,
+				F3DEB7050C58C13E003E2527 /* testwm2 */,
 			);
 		};
 /* End PBXProject section */
@@ -3037,13 +1957,6 @@
 			remoteRef = 003FA644093FFD41000C53B3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		003FA647093FFD41000C53B3 /* libSDLmain.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libSDLmain.a;
-			remoteRef = 003FA646093FFD41000C53B3 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		003FA649093FFD41000C53B3 /* Standard DMG */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.executable";
@@ -3065,7 +1978,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F337509CA14F900EBEB88 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3073,7 +1985,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F338B09CA16BF00EBEB88 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3081,7 +1992,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F33CF09CA19A600EBEB88 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3089,7 +1999,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F340609CA1BFF00EBEB88 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3097,7 +2006,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F342509CA1F0300EBEB88 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3105,7 +2013,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F344109CA1FB300EBEB88 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3113,7 +2020,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F345E09CA204F00EBEB88 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3121,7 +2027,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC566AF0761D90300A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3129,7 +2034,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC566BC0761D90300A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3137,7 +2041,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC566C90761D90300A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3145,7 +2048,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC566D70761D90300A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3153,7 +2055,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC566E50761D90300A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3161,7 +2062,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC566F20761D90300A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3169,7 +2069,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC566FF0761D90300A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3177,7 +2076,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5670C0761D90400A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3185,7 +2083,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5671A0761D90400A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3193,7 +2090,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567270761D90400A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3201,7 +2097,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567340761D90400A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3209,7 +2104,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567410761D90400A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3217,7 +2111,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC5674E0761D90400A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3232,7 +2125,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567680761D90400A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3240,7 +2132,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567760761D90500A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3248,7 +2139,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567830761D90500A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3256,7 +2146,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567910761D90500A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3264,7 +2153,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567AB0761D90500A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3272,7 +2160,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567B80761D90500A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3280,7 +2167,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567C50761D90500A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3288,7 +2174,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567D30761D90500A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3296,7 +2181,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567E10761D90600A33029 /* SDLMain.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3304,22 +2188,18 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567EE0761D90600A33029 /* SDLMain.nib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		F3DEB7020C58C13E003E2527 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXRezBuildPhase section */
-		BEC567FE0761D90600A33029 /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		002F337609CA14F900EBEB88 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -3568,52 +2448,18 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BEC567FB0761D90600A33029 /* Sources */ = {
+		F3DEB7030C58C13E003E2527 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEC567FC0761D90600A33029 /* SDLMain.m in Sources */,
+				F3DEB70D0C58C17E003E2527 /* common.c in Sources */,
+				F3DEB70E0C58C17E003E2527 /* testwm2.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		002F337109CA14F900EBEB88 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = 002F337209CA14F900EBEB88 /* PBXContainerItemProxy */;
-		};
-		002F338709CA16BF00EBEB88 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = 002F338809CA16BF00EBEB88 /* PBXContainerItemProxy */;
-		};
-		002F33CB09CA19A600EBEB88 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = 002F33CC09CA19A600EBEB88 /* PBXContainerItemProxy */;
-		};
-		002F340209CA1BFF00EBEB88 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = 002F340309CA1BFF00EBEB88 /* PBXContainerItemProxy */;
-		};
-		002F342109CA1F0300EBEB88 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = 002F342209CA1F0300EBEB88 /* PBXContainerItemProxy */;
-		};
-		002F343D09CA1FB300EBEB88 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = 002F343E09CA1FB300EBEB88 /* PBXContainerItemProxy */;
-		};
-		002F345A09CA204F00EBEB88 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = 002F345B09CA204F00EBEB88 /* PBXContainerItemProxy */;
-		};
 		002F347909CA215600EBEB88 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 002F338609CA16BF00EBEB88 /* testblitspeed */;
@@ -3769,153 +2615,9 @@
 			target = BEC567EA0761D90600A33029 /* torturethread (Upgraded) */;
 			targetProxy = BEC5682E0761D90600A33029 /* PBXContainerItemProxy */;
 		};
-		BEC568310761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568300761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568330761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568320761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568350761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568340761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568370761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568360761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568390761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568380761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC5683B0761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC5683A0761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC5683D0761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC5683C0761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC5683F0761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC5683E0761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568410761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568400761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568430761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568420761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568450761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568440761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568470761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568460761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568490761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568480761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC5684B0761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC5684A0761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC5684D0761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC5684C0761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC5684F0761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC5684E0761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568510761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568500761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568530761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568520761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568570761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568560761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568590761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568580761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC5685B0761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC5685A0761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC5685D0761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC5685C0761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC5685F0761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC5685E0761D90600A33029 /* PBXContainerItemProxy */;
-		};
-		BEC568610761D90600A33029 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BEC567F70761D90600A33029 /* libsdlmain.a (Upgraded) */;
-			targetProxy = BEC568600761D90600A33029 /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		001B593508BDB826006539E9 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_PREFIX_HEADER = libsdlmain_prefix.h;
-				PRODUCT_NAME = sdlmain;
-			};
-			name = Deployment;
-		};
-		001B593608BDB826006539E9 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_PREFIX_HEADER = libsdlmain_prefix.h;
-				PRODUCT_NAME = sdlmain;
-			};
-			name = Development;
-		};
-		001B593708BDB826006539E9 /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_PREFIX_HEADER = libsdlmain_prefix.h;
-				PRODUCT_NAME = sdlmain;
-			};
-			name = Default;
-		};
 		001B593908BDB826006539E9 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -4571,7 +3273,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = " ";
+				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = "Build All";
 				SECTORDER_FLAGS = "";
@@ -4748,7 +3450,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = "Info-testblitspeed.plist";
-				PRODUCT_NAME = test;
+				PRODUCT_NAME = testblitspeed;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Deployment;
@@ -4757,7 +3459,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = "Info-testblitspeed.plist";
-				PRODUCT_NAME = test;
+				PRODUCT_NAME = testblitspeed;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Development;
@@ -4766,7 +3468,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = "Info-testblitspeed.plist";
-				PRODUCT_NAME = test;
+				PRODUCT_NAME = testblitspeed;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Default;
@@ -4918,19 +3620,79 @@
 			};
 			name = Default;
 		};
+		F3DEB70A0C58C13E003E2527 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+				INFOPLIST_FILE = "Info-testwm2.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = testwm2;
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		F3DEB70B0C58C13E003E2527 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				INFOPLIST_FILE = "Info-testwm2.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = testwm2;
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = NO;
+			};
+			name = Development;
+		};
+		F3DEB70C0C58C13E003E2527 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+				INFOPLIST_FILE = "Info-testwm2.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = testwm2;
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = YES;
+			};
+			name = Default;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		001B593408BDB826006539E9 /* Build configuration list for PBXNativeTarget "libsdlmain.a (Upgraded)" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				001B593508BDB826006539E9 /* Deployment */,
-				001B593608BDB826006539E9 /* Development */,
-				001B593708BDB826006539E9 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
 		001B593808BDB826006539E9 /* Build configuration list for PBXNativeTarget "checkkeys (Upgraded)" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -5261,6 +4023,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Default;
 		};
+		F3DEB7090C58C13E003E2527 /* Build configuration list for PBXNativeTarget "testwm2" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				F3DEB70A0C58C13E003E2527 /* Deployment */,
+				F3DEB70B0C58C13E003E2527 /* Development */,
+				F3DEB70C0C58C13E003E2527 /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
--- a/include/SDL_config_macosx.h	Sun Jul 20 16:21:15 2008 +0000
+++ b/include/SDL_config_macosx.h	Sun Jul 20 21:34:04 2008 +0000
@@ -122,6 +122,7 @@
 /* Enable OpenGL support */
 #define SDL_VIDEO_OPENGL	1
 #define SDL_VIDEO_OPENGL_CGL	1
+#define SDL_VIDEO_RENDER_OGL	1
 
 /* Enable assembly routines */
 #define SDL_ASSEMBLY_ROUTINES	1
--- a/src/video/SDL_sysvideo.h	Sun Jul 20 16:21:15 2008 +0000
+++ b/src/video/SDL_sysvideo.h	Sun Jul 20 21:34:04 2008 +0000
@@ -127,7 +127,6 @@
 
     int display;
     SDL_Renderer *renderer;
-    SDL_GLContext context;
 
     void *userdata;
     void *driverdata;
--- a/src/video/SDL_video.c	Sun Jul 20 16:21:15 2008 +0000
+++ b/src/video/SDL_video.c	Sun Jul 20 21:34:04 2008 +0000
@@ -2525,12 +2525,6 @@
     if (!context) {
         window = NULL;
     }
-    if (window) {
-        if (window->context == context) {
-            return 0;
-        }
-        window->context = context;
-    }
     return _this->GL_MakeCurrent(_this, window, context);
 }
 
--- a/src/video/cocoa/SDL_cocoaopengl.m	Sun Jul 20 16:21:15 2008 +0000
+++ b/src/video/cocoa/SDL_cocoaopengl.m	Sun Jul 20 21:34:04 2008 +0000
@@ -288,7 +288,7 @@
 {
     NSAutoreleasePool *pool;
     NSOpenGLContext *nscontext;
-    long value;
+    GLint value;
     int status;
 
     pool = [[NSAutoreleasePool alloc] init];
@@ -312,7 +312,7 @@
 {
     NSAutoreleasePool *pool;
     NSOpenGLContext *nscontext;
-    long value;
+    GLint value;
     int status;
 
     pool = [[NSAutoreleasePool alloc] init];