diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 67ab47951..226bf1654 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -74,9 +74,27 @@ $Id$ Produced by Eric Poncet Commissioned by Harvey Ginter + * Fix OS X 10.9 issue of current directory set by Finder + to something else than folder where app bundle resides. + * Customization support for Mac OS X (automatic, under XCode) and Windows (manual). + * Some Mac OS X build / project changes & updates. + + * Adjustments to Mac OS X fontconfig config file, to avoid warnings + and make things more robust. + + * Updates to some #include's to catch up with newer library revisions. + + * Tweaks to pixel read/write on Apple. + + * Introduction of 'intprt_t' casting to avoid warnings on x64. + + * Some additional debugging output. + + * Logging stderr & stdout to /tmp/tuxpaint.log + * Accessibility Improvements: --------------------------- * Added a mouse accessibility mode to avoid the need to drag the mouse. diff --git a/macosx/Read Me.txt b/macosx/Read Me.txt index ecc54e7c0..030121023 100644 --- a/macosx/Read Me.txt +++ b/macosx/Read Me.txt @@ -74,8 +74,7 @@ This library will already have been built and installed by MacPorts, but will no % tar xzf fontconfig*.tar.gz % cd fontconfig* % sudo port deactivate fontconfig -% ./configure --prefix=/Users/Shared/tuxpaint --enable-static --disable-shared -% --disable-docs --with-confdir="/Library/Application Support/TuxPaint/fontconfig/fonts" --with-cache-dir="/Library/Application Support/TuxPaint/fontconfig/cache" CPPFLAGS=-I/opt/local/include LDFLAGS=-L/opt/local/lib +% ./configure --prefix=/Users/Shared/tuxpaint --enable-static --disable-shared --disable-docs --with-confdir="/Library/Application Support/TuxPaint/fontconfig/fonts" --with-cache-dir="/Library/Application Support/TuxPaint/fontconfig/cache" CPPFLAGS=-I/opt/local/include LDFLAGS=-L/opt/local/lib % sudo make install % sudo port activate fontconfig @@ -102,6 +101,7 @@ MacPorts only installs the dynamic libraries for Pango. We need to reconfigure % cd pango* % sudo port deactivate pango % ./configure --prefix=/Users/Shared/tuxpaint --enable-static CPPFLAGS=-I/opt/local/include LDFLAGS=-L/opt/local/lib --with-included-modules=yes --with-dynamic-modules=no --disable-shared +//EP pas de "make" ? % sudo make install % sudo find . -name "*.a" -exec cp {} /Users/Shared/tuxpaint/lib/ \; % sudo port activate pango @@ -116,6 +116,7 @@ Assuming you place the sources in /Users/Shared/tuxpaint/src/libsvg, you can con % cd /Users/Shared/tuxpaint/src/libsvg % ./autogen.sh % ./configure --prefix=/Users/Shared/tuxpaint LIBSVG_CFLAGS=-I/usr/include LIBSVG_LIBS=-L/usr/lib --disable-shared +//EP pas de "make" ? % make install SVG Cairo: diff --git a/macosx/SDLMain.m b/macosx/SDLMain.m index 8fad05cda..4c564e37d 100644 --- a/macosx/SDLMain.m +++ b/macosx/SDLMain.m @@ -131,7 +131,7 @@ static NSString *getApplicationName(void) mainBundle = [NSBundle mainBundle]; path = [mainBundle pathForResource:@"data" ofType:nil]; - [path getCString:(macosx.dataPath)]; + [path getCString:(macosx.dataPath) maxLength:sizeof(macosx.dataPath) encoding:NSUTF8StringEncoding]; //EP added maxLength: and encoding: to avoid deprecation warning for 10.6 } -(void) preferencesPath; @@ -139,10 +139,11 @@ static NSString *getApplicationName(void) NSString *path; path = [@"~/Library/Application Support/TuxPaint" stringByExpandingTildeInPath]; - [path getCString:(macosx.preferencesPath)]; - + [path getCString:(macosx.preferencesPath) maxLength:sizeof(macosx.preferencesPath) encoding:NSUTF8StringEncoding]; //EP added maxLength: and encoding: to avoid deprecation warning for 10.6 + path = @"/Library/Application Support/TuxPaint"; - [path getCString:(macosx.globalPreferencesPath)]; + [path getCString:(macosx.globalPreferencesPath) maxLength:sizeof(macosx.globalPreferencesPath) encoding:NSUTF8StringEncoding]; //EP added maxLength: and encoding: to avoid deprecation warning for 10.6 + } -(void) fontsPath; @@ -150,7 +151,7 @@ static NSString *getApplicationName(void) NSString *path; path = [@"~/Library/Fonts" stringByExpandingTildeInPath]; - [path getCString:(macosx.fontsPath)]; + [path getCString:(macosx.fontsPath) maxLength:sizeof(macosx.fontsPath) encoding:NSUTF8StringEncoding]; //EP added maxLength: and encoding: to avoid deprecation warning for 10.6 } @end @@ -330,7 +331,7 @@ static NSString *getApplicationName(void) if ([menuItem hasSubmenu]) [self fixMenu:[menuItem submenu] withAppName:appName]; } - [aMenu sizeToFit]; + //EP commented line to avoid deprecation warning for 10.6: [aMenu sizeToFit]; } #else @@ -488,7 +489,8 @@ static void CustomApplicationMain (argc, argv) NSString *arguments = [NSString stringWithCString:(macosx.globalPreferencesPath)]; char command[4096]; - sprintf(command, "\"%s\" \"%s\"", [executable cString], [arguments cString]); + //EP commented to avoid deprecation warning for 10.6: sprintf(command, "\"%s\" \"%s\"", [executable cString], [arguments cString]); + sprintf(command, "\"%@\" \"%@\"", executable, arguments); int result = system(command); @@ -520,7 +522,7 @@ static void CustomApplicationMain (argc, argv) char *arguments[] = { "/Library/Application Support/TuxPaint", NULL }; FILE *communicationsPipe = NULL; - strcpy(executable, [fcInstallerPath cString]); + strcpy(executable, [fcInstallerPath cStringUsingEncoding:NSUTF8StringEncoding]); //EP replaced cString by cStringUsingEncoding: to avoid deprecation warning for 10.6 flags = kAuthorizationFlagDefaults; status = AuthorizationExecuteWithPrivileges(authorizationRef, executable, flags, arguments, &communicationsPipe); @@ -547,8 +549,8 @@ static void CustomApplicationMain (argc, argv) - (void) setupFontconfig { /* Tell Fontconfig to use font configuration file in application bundle */ - setenv ("FONTCONFIG_PATH", [[[NSBundle mainBundle] resourcePath] cString], 1); - + setenv ("FONTCONFIG_PATH", [[[NSBundle mainBundle] resourcePath] cStringUsingEncoding:NSUTF8StringEncoding], 1); //EP replaced cString by cStringUsingEncoding: to avoid deprecation warning for 10.6 + /* Install font configuration file */ /* BOOL filesExist = [self fontconfigFilesAreInstalled]; diff --git a/macosx/TuxPaint.xcodeproj/project.pbxproj b/macosx/TuxPaint.xcodeproj/project.pbxproj index 2903d8726..2f76e8773 100644 --- a/macosx/TuxPaint.xcodeproj/project.pbxproj +++ b/macosx/TuxPaint.xcodeproj/project.pbxproj @@ -3,34 +3,21 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 45; objects = { /* Begin PBXBuildFile section */ + 078E0CE817E292F800D9AE98 /* onscreen_keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 078E0CE717E292F800D9AE98 /* onscreen_keyboard.c */; }; + 07D48B7618020EB400795B98 /* patch.c in Sources */ = {isa = PBXBuildFile; fileRef = 078E0CFC17E2A38E00D9AE98 /* patch.c */; }; 2202639807AC5D3000C3AEAB /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2202639707AC5D3000C3AEAB /* ApplicationServices.framework */; }; 2202646707AC603500C3AEAB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2202646607AC603500C3AEAB /* CoreFoundation.framework */; }; - 2214087F0D0D17F0009534C6 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D1107310486CEB800E47090 /* Info.plist */; }; 221408D00D0D1DC7009534C6 /* credits.txt in Resources */ = {isa = PBXBuildFile; fileRef = 221408CF0D0D1DC6009534C6 /* credits.txt */; }; 22140ABE0D110600009534C6 /* TransparentTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 22140ABC0D110600009534C6 /* TransparentTextView.m */; }; 22140B9D0D1252E5009534C6 /* speech.m in Sources */ = {isa = PBXBuildFile; fileRef = 22140B9B0D1252E4009534C6 /* speech.m */; }; 221532C30C94825B00CDCB3B /* im.c in Sources */ = {isa = PBXBuildFile; fileRef = 221532C10C94825B00CDCB3B /* im.c */; }; - 221532E40C9499D100CDCB3B /* libsvg-cairo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 221532E10C9499D100CDCB3B /* libsvg-cairo.a */; }; - 221532E50C9499D100CDCB3B /* libsvg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 221532E20C9499D100CDCB3B /* libsvg.a */; }; 22153A600C94C0EE00CDCB3B /* images in Resources */ = {isa = PBXBuildFile; fileRef = 221539CA0C94C0EE00CDCB3B /* images */; }; 22153A610C94C0EE00CDCB3B /* sounds in Resources */ = {isa = PBXBuildFile; fileRef = 22153A3F0C94C0EE00CDCB3B /* sounds */; }; 222862BE0D0B48B100CA3F84 /* message.m in Sources */ = {isa = PBXBuildFile; fileRef = 222862BC0D0B48B100CA3F84 /* message.m */; }; - 2248FBE20CDEAC38004BC461 /* libSDL_Pango.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FBE10CDEAC38004BC461 /* libSDL_Pango.a */; }; - 2248FC0F0CDEEDDE004BC461 /* libpango-1.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC0B0CDEEDDE004BC461 /* libpango-1.0.a */; }; - 2248FC3B0CDEF241004BC461 /* libcairo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC330CDEF241004BC461 /* libcairo.a */; }; - 2248FC3C0CDEF241004BC461 /* libfontconfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC340CDEF241004BC461 /* libfontconfig.a */; }; - 2248FC3D0CDEF241004BC461 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC350CDEF241004BC461 /* libfreetype.a */; }; - 2248FC3E0CDEF241004BC461 /* libglib-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC360CDEF241004BC461 /* libglib-2.0.a */; }; - 2248FC3F0CDEF241004BC461 /* libgmodule-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC370CDEF241004BC461 /* libgmodule-2.0.a */; }; - 2248FC400CDEF241004BC461 /* libgobject-2.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC380CDEF241004BC461 /* libgobject-2.0.a */; }; - 2248FC410CDEF241004BC461 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; - 2248FC420CDEF241004BC461 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC3A0CDEF241004BC461 /* libpng.a */; }; - 2248FC4C0CDEF395004BC461 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC4B0CDEF395004BC461 /* libexpat.a */; }; - 2248FC5A0CE19305004BC461 /* libpangoft2-1.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC590CE19305004BC461 /* libpangoft2-1.0.a */; }; 2248FC9C0CE2C797004BC461 /* tint.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC970CE2C6B5004BC461 /* tint.c */; }; 2248FC9E0CE2C7C9004BC461 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 2248FCA10CE2C7CB004BC461 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; @@ -50,104 +37,86 @@ 225FD5280934EC1A00F0B02F /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 225FD5290934EC1A00F0B02F /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 225FD52B0934EC1A00F0B02F /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; - 225FEDBA093ACC0A00F0B02F /* html in Resources */ = {isa = PBXBuildFile; fileRef = 225FED8E093ACC0A00F0B02F /* html */; }; 226E96D20FFB999A00A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E96D60FFB999A00A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E96D70FFB999A00A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E96D80FFB999A00A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E96D90FFB999A00A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E96DF0FFB99DB00A9A38E /* alien.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E969D0FFB981500A9A38E /* alien.c */; }; 226E96E70FFB9B3200A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E96EB0FFB9B3200A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E96EC0FFB9B3200A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E96ED0FFB9B3200A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E96EE0FFB9B3200A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97010FFB9BAE00A9A38E /* confetti.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E969E0FFB981500A9A38E /* confetti.c */; }; 226E97040FFB9BBD00A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97080FFB9BBD00A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97090FFB9BBD00A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E970A0FFB9BBD00A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E970B0FFB9BBD00A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97140FFB9C1800A9A38E /* fisheye.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E969F0FFB981500A9A38E /* fisheye.c */; }; 226E971A0FFB9C4E00A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E971E0FFB9C4E00A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E971F0FFB9C4E00A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97200FFB9C4E00A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97210FFB9C4E00A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97270FFB9C7200A9A38E /* fold.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96A00FFB981500A9A38E /* fold.c */; }; 226E972E0FFB9CB500A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97320FFB9CB500A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97330FFB9CB500A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97340FFB9CB500A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97350FFB9CB500A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97400FFB9D1300A9A38E /* mosaic.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96A10FFB981500A9A38E /* mosaic.c */; }; 226E97480FFB9D3300A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E974C0FFB9D3300A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E974D0FFB9D3300A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E974E0FFB9D3300A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E974F0FFB9D3300A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97550FFB9D7A00A9A38E /* noise.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96A20FFB981500A9A38E /* noise.c */; }; 226E975E0FFB9D9100A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97620FFB9D9100A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97630FFB9D9100A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97640FFB9D9100A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97650FFB9D9100A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E976B0FFB9DCB00A9A38E /* rails.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96A40FFB981500A9A38E /* rails.c */; }; 226E976E0FFB9DD600A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97720FFB9DD600A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97730FFB9DD600A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97740FFB9DD600A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97750FFB9DD600A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E977E0FFB9E2A00A9A38E /* rain.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96A50FFB981500A9A38E /* rain.c */; }; 226E97810FFB9E4000A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97850FFB9E4000A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97860FFB9E4000A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97870FFB9E4000A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97880FFB9E4000A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97900FFB9E8A00A9A38E /* realrainbow.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96A60FFB981500A9A38E /* realrainbow.c */; }; 226E97930FFB9E9600A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97970FFB9E9600A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97980FFB9E9600A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97990FFB9E9600A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E979A0FFB9E9600A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97A20FFB9EE600A9A38E /* rosette.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96A70FFB981500A9A38E /* rosette.c */; }; 226E97A50FFB9EEF00A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97A90FFB9EEF00A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97AA0FFB9EEF00A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97AB0FFB9EEF00A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97AC0FFB9EEF00A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97B40FFB9F3300A9A38E /* sharpen.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96A80FFB981500A9A38E /* sharpen.c */; }; 226E97B70FFB9F4200A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97BB0FFB9F4200A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97BC0FFB9F4200A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97BD0FFB9F4200A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97BE0FFB9F4200A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97C70FFB9F8400A9A38E /* snow.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96A90FFB981500A9A38E /* snow.c */; }; 226E97CA0FFB9F8E00A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97CE0FFB9F8E00A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97CF0FFB9F8E00A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97D00FFB9F8E00A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97D10FFB9F8E00A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97DB0FFB9FD100A9A38E /* string.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96AA0FFB981500A9A38E /* string.c */; }; 226E97DE0FFB9FEE00A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97E20FFB9FEE00A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97E30FFB9FEE00A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97E40FFB9FEE00A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97E50FFB9FEE00A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E97EF0FFBA03800A9A38E /* toothpaste.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96AB0FFB981500A9A38E /* toothpaste.c */; }; 226E97F20FFBA04000A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E97F60FFBA04000A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E97F70FFBA04000A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E97F80FFBA04000A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E97F90FFBA04000A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E98040FFBA08500A9A38E /* tornado.c in Sources */ = {isa = PBXBuildFile; fileRef = 226E96AC0FFB981500A9A38E /* tornado.c */; }; 226E98070FFBA08F00A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E980B0FFBA08F00A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E980C0FFBA08F00A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E980D0FFBA08F00A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E980E0FFBA08F00A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 226E98160FFBA10500A9A38E /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 226E981A0FFBA10500A9A38E /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 226E981B0FFBA10500A9A38E /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 226E981C0FFBA10500A9A38E /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 226E981D0FFBA10500A9A38E /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; @@ -194,16 +163,7 @@ 226E98A00FFBA41C00A9A38E /* tornado.so in Copy Magic Plugins */ = {isa = PBXBuildFile; fileRef = 226E97FE0FFBA04000A9A38E /* tornado.so */; }; 226E98A10FFBA41C00A9A38E /* tv.so in Copy Magic Plugins */ = {isa = PBXBuildFile; fileRef = 226E98130FFBA08F00A9A38E /* tv.so */; }; 226E98A20FFBA41C00A9A38E /* waves.so in Copy Magic Plugins */ = {isa = PBXBuildFile; fileRef = 22ECE4A70CF0CD8600D390B3 /* waves.so */; }; - 22710EE50AE5DEAD00FC7FCF /* AUTHORS.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22710D420AE5DEAB00FC7FCF /* AUTHORS.txt */; }; - 22710F030AE5DEAD00FC7FCF /* CHANGES.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22710D640AE5DEAB00FC7FCF /* CHANGES.txt */; }; - 22710F040AE5DEAD00FC7FCF /* COPYING.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22710D650AE5DEAB00FC7FCF /* COPYING.txt */; }; - 22710F3B0AE5DEAD00FC7FCF /* EXTENDING.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22710DA40AE5DEAC00FC7FCF /* EXTENDING.txt */; }; - 22710F3C0AE5DEAD00FC7FCF /* FAQ.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22710DA50AE5DEAC00FC7FCF /* FAQ.txt */; }; - 22710FD40AE5DEAD00FC7FCF /* INSTALL.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22710E4C0AE5DEAC00FC7FCF /* INSTALL.txt */; }; - 2271100F0AE5DEAD00FC7FCF /* OPTIONS.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22710E920AE5DEAC00FC7FCF /* OPTIONS.txt */; }; - 227110170AE5DEAD00FC7FCF /* PNG.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22710E9B0AE5DEAC00FC7FCF /* PNG.txt */; }; 227111800AE5EC6E00FC7FCF /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 2271114E0AE5EC6E00FC7FCF /* fonts */; }; - 228437C40EF5DE5F002A13FD /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 228437C30EF5DE5F002A13FD /* libfribidi.a */; }; 2286F34F0740B3FC001164FE /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2286F34D0740B3FC001164FE /* SDLMain.nib */; }; 22BA86D212C7C59E004C23C6 /* SDL.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22BA86D312C7C59E004C23C6 /* SDL_image.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; @@ -218,55 +178,44 @@ 22C0EDBE0735BED1008555A2 /* starters in Resources */ = {isa = PBXBuildFile; fileRef = 22C0EDAF0735BED1008555A2 /* starters */; }; 22C0F5F60735BFA8008555A2 /* brushes in Resources */ = {isa = PBXBuildFile; fileRef = 22C0F5350735BFA8008555A2 /* brushes */; }; 22D0201207434FD200494AE0 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = 22D01F2F07434FD100494AE0 /* locale */; }; - 22E554DB0D18CC5D007D14E9 /* magic-docs in Resources */ = {isa = PBXBuildFile; fileRef = 22E554A00D18CC5D007D14E9 /* magic-docs */; }; - 22E554DE0D18CD69007D14E9 /* SVG.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22E554DD0D18CD69007D14E9 /* SVG.txt */; }; 22ECE2B70CF01A2000D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE2B80CF01A2800D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE2B90CF01A3800D390B3 /* blocks_chalk_drip.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC830CE2C6B5004BC461 /* blocks_chalk_drip.c */; }; 22ECE2CB0CF0B08A00D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE2CE0CF0B08A00D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE2D10CF0B08C00D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; - 22ECE3230CF0C34F00D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE3240CF0C35600D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE3250CF0C35800D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE3260CF0C35800D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE3280CF0C39100D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; 22ECE3390CF0C4F100D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE33D0CF0C4F100D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE33E0CF0C4F100D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE33F0CF0C4F100D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE3400CF0C4F100D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE34B0CF0C5CE00D390B3 /* blur.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC840CE2C6B5004BC461 /* blur.c */; }; 22ECE34C0CF0C5D400D390B3 /* bricks.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC850CE2C6B5004BC461 /* bricks.c */; }; 22ECE3500CF0C7EF00D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE3540CF0C7EF00D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE3550CF0C7EF00D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE3560CF0C7EF00D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE3570CF0C7EF00D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE35F0CF0C81100D390B3 /* calligraphy.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC860CE2C6B5004BC461 /* calligraphy.c */; }; 22ECE3630CF0C81E00D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE3670CF0C81E00D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE3680CF0C81E00D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE3690CF0C81E00D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE36A0CF0C81E00D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE3750CF0C89300D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE3790CF0C89300D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE37A0CF0C89300D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE37B0CF0C89300D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE37C0CF0C89300D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE3820CF0C89D00D390B3 /* cartoon.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC870CE2C6B5004BC461 /* cartoon.c */; }; 22ECE38A0CF0C8E600D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE38E0CF0C8E600D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE38F0CF0C8E600D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE3900CF0C8E600D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE3910CF0C8E600D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE39D0CF0C90600D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE3A10CF0C90600D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE3A20CF0C90600D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE3A30CF0C90600D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE3A40CF0C90600D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE3B00CF0C9A300D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE3B40CF0C9A300D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE3B50CF0C9A300D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE3B60CF0C9A300D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE3B70CF0C9A300D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; @@ -275,92 +224,77 @@ 22ECE3C00CF0C9BF00D390B3 /* fill.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC8A0CE2C6B5004BC461 /* fill.c */; }; 22ECE3C10CF0C9C800D390B3 /* flower.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC8B0CE2C6B5004BC461 /* flower.c */; }; 22ECE3E70CF0CBDC00D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE3EB0CF0CBDC00D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE3EC0CF0CBDC00D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE3ED0CF0CBDC00D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE3EE0CF0CBDC00D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE3F60CF0CBF500D390B3 /* foam.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC8C0CE2C6B5004BC461 /* foam.c */; }; 22ECE3F90CF0CC0100D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE3FD0CF0CC0100D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE3FE0CF0CC0100D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE3FF0CF0CC0100D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4000CF0CC0100D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4080CF0CC2000D390B3 /* glasstile.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC8D0CE2C6B5004BC461 /* glasstile.c */; }; 22ECE40B0CF0CC2500D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE40F0CF0CC2500D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE4100CF0CC2500D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE4110CF0CC2500D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4120CF0CC2500D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4180CF0CC2F00D390B3 /* kalidescope.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC8E0CE2C6B5004BC461 /* kalidescope.c */; }; 22ECE41D0CF0CC4C00D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE4210CF0CC4C00D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE4220CF0CC4C00D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE4230CF0CC4C00D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4240CF0CC4C00D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE42C0CF0CC6100D390B3 /* light.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC8F0CE2C6B5004BC461 /* light.c */; }; 22ECE42F0CF0CC6B00D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE4330CF0CC6B00D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE4340CF0CC6B00D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE4350CF0CC6B00D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4360CF0CC6B00D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE43E0CF0CCAC00D390B3 /* mirror_flip.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC910CE2C6B5004BC461 /* mirror_flip.c */; }; 22ECE4410CF0CCB400D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE4450CF0CCB400D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE4460CF0CCB400D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE4470CF0CCB400D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4480CF0CCB400D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE44E0CF0CCBF00D390B3 /* negative.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC920CE2C6B5004BC461 /* negative.c */; }; 22ECE4530CF0CCDB00D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE4570CF0CCDB00D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE4580CF0CCDB00D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE4590CF0CCDB00D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE45A0CF0CCDB00D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4620CF0CD0000D390B3 /* rainbow.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC930CE2C6B5004BC461 /* rainbow.c */; }; 22ECE4650CF0CD1500D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE4690CF0CD1500D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE46A0CF0CD1500D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE46B0CF0CD1500D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE46C0CF0CD1500D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4720CF0CD1D00D390B3 /* ripples.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC940CE2C6B5004BC461 /* ripples.c */; }; 22ECE4770CF0CD4000D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE47B0CF0CD4000D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE47C0CF0CD4000D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE47D0CF0CD4000D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE47E0CF0CD4000D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4860CF0CD5C00D390B3 /* shift.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC950CE2C6B5004BC461 /* shift.c */; }; 22ECE4890CF0CD6400D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE48D0CF0CD6400D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE48E0CF0CD6400D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE48F0CF0CD6400D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4900CF0CD6400D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4960CF0CD6B00D390B3 /* smudge.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC960CE2C6B5004BC461 /* smudge.c */; }; 22ECE49B0CF0CD8600D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE49F0CF0CD8600D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE4A00CF0CD8600D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE4A10CF0CD8600D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4A20CF0CD8600D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4A80CF0CD9000D390B3 /* waves.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC980CE2C6B5004BC461 /* waves.c */; }; 22ECE4AD0CF0CDA500D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE4B10CF0CDA500D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE4B20CF0CDA500D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE4B30CF0CDA500D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4B40CF0CDA500D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4BA0CF0CDAD00D390B3 /* grass.c in Sources */ = {isa = PBXBuildFile; fileRef = 22F45E530CE4015300DB7761 /* grass.c */; }; 22ECE4BF0CF0CDE200D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE4C30CF0CDE200D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE4C40CF0CDE200D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE4C50CF0CDE200D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4C60CF0CDE200D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4CE0CF0CE1900D390B3 /* distortion.c in Sources */ = {isa = PBXBuildFile; fileRef = 22F45E500CE3FFE100DB7761 /* distortion.c */; }; 22ECE4D10CF0CE4A00D390B3 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22ECE4D50CF0CE4A00D390B3 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 22ECE4D60CF0CE4A00D390B3 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5270934EC1A00F0B02F /* SDL.framework */; }; 22ECE4D70CF0CE4A00D390B3 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5240934EC1A00F0B02F /* SDL_image.framework */; }; 22ECE4D80CF0CE4A00D390B3 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */; }; 22ECE4E00CF0CE6900D390B3 /* metalpaint.c in Sources */ = {isa = PBXBuildFile; fileRef = 2248FC990CE2C707004BC461 /* metalpaint.c */; }; 22F3EC9F0D5682620068DFB4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22F3EC9E0D5682620068DFB4 /* Security.framework */; }; 22F4616F0CE41B6E00DB7761 /* tp_magic_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F4616E0CE41B6E00DB7761 /* tp_magic_api.h */; }; - 22F461770CE41CDE00DB7761 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2248FC390CDEF241004BC461 /* libintl.a */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ @@ -685,7 +619,7 @@ /* Begin PBXCopyFilesBuildPhase section */ 22D5D2A80738498300B67229 /* Copy Frameworks */ = { isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 8; dstPath = ""; dstSubfolderSpec = 10; files = ( @@ -695,7 +629,7 @@ 22BA86D512C7C59E004C23C6 /* SDL_ttf.framework in Copy Frameworks */, ); name = "Copy Frameworks"; - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; }; 22ECE5730CF0D6F000D390B3 /* Copy Magic Plugins */ = { isa = PBXCopyFilesBuildPhase; @@ -751,6 +685,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 078E0CE717E292F800D9AE98 /* onscreen_keyboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = onscreen_keyboard.c; path = ../src/onscreen_keyboard.c; sourceTree = SOURCE_ROOT; }; + 078E0CF817E2A32200D9AE98 /* patch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = patch.h; sourceTree = ""; }; + 078E0CFC17E2A38E00D9AE98 /* patch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = patch.c; sourceTree = ""; }; 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 2202639707AC5D3000C3AEAB /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; @@ -762,24 +699,10 @@ 22140B9B0D1252E4009534C6 /* speech.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = speech.m; sourceTree = ""; }; 221532C10C94825B00CDCB3B /* im.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = im.c; path = ../src/im.c; sourceTree = SOURCE_ROOT; }; 221532C20C94825B00CDCB3B /* im.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = im.h; path = ../src/im.h; sourceTree = SOURCE_ROOT; }; - 221532E10C9499D100CDCB3B /* libsvg-cairo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = "libsvg-cairo.a"; path = "/Users/Shared/tuxpaint/lib/libsvg-cairo.a"; sourceTree = ""; }; - 221532E20C9499D100CDCB3B /* libsvg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsvg.a; path = /Users/Shared/tuxpaint/lib/libsvg.a; sourceTree = ""; }; 221539CA0C94C0EE00CDCB3B /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = SOURCE_ROOT; }; 22153A3F0C94C0EE00CDCB3B /* sounds */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sounds; path = ../data/sounds; sourceTree = SOURCE_ROOT; }; 222862BB0D0B48B000CA3F84 /* message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = message.h; sourceTree = ""; }; 222862BC0D0B48B100CA3F84 /* message.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = message.m; sourceTree = ""; }; - 2248FBE10CDEAC38004BC461 /* libSDL_Pango.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL_Pango.a; path = /Users/Shared/tuxpaint/lib/libSDL_Pango.a; sourceTree = ""; }; - 2248FC0B0CDEEDDE004BC461 /* libpango-1.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpango-1.0.a"; path = "/Users/Shared/tuxpaint/lib/libpango-1.0.a"; sourceTree = ""; }; - 2248FC330CDEF241004BC461 /* libcairo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcairo.a; path = /Users/Shared/tuxpaint/lib/libcairo.a; sourceTree = ""; }; - 2248FC340CDEF241004BC461 /* libfontconfig.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfontconfig.a; path = /Users/Shared/tuxpaint/lib/libfontconfig.a; sourceTree = ""; }; - 2248FC350CDEF241004BC461 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = /Users/Shared/tuxpaint/lib/libfreetype.a; sourceTree = ""; }; - 2248FC360CDEF241004BC461 /* libglib-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libglib-2.0.a"; path = "/Users/Shared/tuxpaint/lib/libglib-2.0.a"; sourceTree = ""; }; - 2248FC370CDEF241004BC461 /* libgmodule-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgmodule-2.0.a"; path = "/Users/Shared/tuxpaint/lib/libgmodule-2.0.a"; sourceTree = ""; }; - 2248FC380CDEF241004BC461 /* libgobject-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgobject-2.0.a"; path = "/Users/Shared/tuxpaint/lib/libgobject-2.0.a"; sourceTree = ""; }; - 2248FC390CDEF241004BC461 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libintl.a; path = /Users/Shared/tuxpaint/lib/libintl.a; sourceTree = ""; }; - 2248FC3A0CDEF241004BC461 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = /Users/Shared/tuxpaint/lib/libpng.a; sourceTree = ""; }; - 2248FC4B0CDEF395004BC461 /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = /Users/Shared/tuxpaint/lib/libexpat.a; sourceTree = ""; }; - 2248FC590CE19305004BC461 /* libpangoft2-1.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpangoft2-1.0.a"; path = "/Users/Shared/tuxpaint/lib/libpangoft2-1.0.a"; sourceTree = ""; }; 2248FC830CE2C6B5004BC461 /* blocks_chalk_drip.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = blocks_chalk_drip.c; path = ../magic/src/blocks_chalk_drip.c; sourceTree = SOURCE_ROOT; }; 2248FC840CE2C6B5004BC461 /* blur.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = blur.c; path = ../magic/src/blur.c; sourceTree = SOURCE_ROOT; }; 2248FC850CE2C6B5004BC461 /* bricks.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = bricks.c; path = ../magic/src/bricks.c; sourceTree = SOURCE_ROOT; }; @@ -830,7 +753,6 @@ 225FD5240934EC1A00F0B02F /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = ""; }; 225FD5250934EC1A00F0B02F /* SDL_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_mixer.framework; path = /Library/Frameworks/SDL_mixer.framework; sourceTree = ""; }; 225FD5270934EC1A00F0B02F /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; }; - 225FED8E093ACC0A00F0B02F /* html */ = {isa = PBXFileReference; lastKnownFileType = folder; path = html; sourceTree = ""; }; 226E969D0FFB981500A9A38E /* alien.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = alien.c; path = ../magic/src/alien.c; sourceTree = SOURCE_ROOT; }; 226E969E0FFB981500A9A38E /* confetti.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = confetti.c; path = ../magic/src/confetti.c; sourceTree = SOURCE_ROOT; }; 226E969F0FFB981500A9A38E /* fisheye.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fisheye.c; path = ../magic/src/fisheye.c; sourceTree = SOURCE_ROOT; }; @@ -865,16 +787,7 @@ 226E97FE0FFBA04000A9A38E /* tornado.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = tornado.so; sourceTree = BUILT_PRODUCTS_DIR; }; 226E98130FFBA08F00A9A38E /* tv.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = tv.so; sourceTree = BUILT_PRODUCTS_DIR; }; 226E98220FFBA10600A9A38E /* puzzle.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = puzzle.so; sourceTree = BUILT_PRODUCTS_DIR; }; - 22710D420AE5DEAB00FC7FCF /* AUTHORS.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = AUTHORS.txt; path = ../docs/AUTHORS.txt; sourceTree = SOURCE_ROOT; }; - 22710D640AE5DEAB00FC7FCF /* CHANGES.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = CHANGES.txt; path = ../docs/CHANGES.txt; sourceTree = SOURCE_ROOT; }; - 22710D650AE5DEAB00FC7FCF /* COPYING.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = COPYING.txt; path = ../docs/COPYING.txt; sourceTree = SOURCE_ROOT; }; - 22710DA40AE5DEAC00FC7FCF /* EXTENDING.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = EXTENDING.txt; path = ../docs/EXTENDING.txt; sourceTree = SOURCE_ROOT; }; - 22710DA50AE5DEAC00FC7FCF /* FAQ.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = FAQ.txt; path = ../docs/FAQ.txt; sourceTree = SOURCE_ROOT; }; - 22710E4C0AE5DEAC00FC7FCF /* INSTALL.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = INSTALL.txt; path = ../docs/INSTALL.txt; sourceTree = SOURCE_ROOT; }; - 22710E920AE5DEAC00FC7FCF /* OPTIONS.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = OPTIONS.txt; path = ../docs/OPTIONS.txt; sourceTree = SOURCE_ROOT; }; - 22710E9B0AE5DEAC00FC7FCF /* PNG.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = PNG.txt; path = ../docs/PNG.txt; sourceTree = SOURCE_ROOT; }; 2271114E0AE5EC6E00FC7FCF /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../fonts; sourceTree = SOURCE_ROOT; }; - 228437C30EF5DE5F002A13FD /* libfribidi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfribidi.a; path = /Users/Shared/tuxpaint/lib/libfribidi.a; sourceTree = ""; }; 2286F34E0740B3FC001164FE /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/SDLMain.nib; sourceTree = ""; }; 22BA872212C9643F004C23C6 /* parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = parse.c; path = ../obj/parse.c; sourceTree = SOURCE_ROOT; }; 22C005D30736650D008555A2 /* tuxpaint.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tuxpaint.icns; sourceTree = SOURCE_ROOT; }; @@ -895,8 +808,6 @@ 22C0EDAF0735BED1008555A2 /* starters */ = {isa = PBXFileReference; lastKnownFileType = folder; name = starters; path = ../starters; sourceTree = SOURCE_ROOT; }; 22C0F5350735BFA8008555A2 /* brushes */ = {isa = PBXFileReference; lastKnownFileType = folder; name = brushes; path = ../data/brushes; sourceTree = SOURCE_ROOT; }; 22D01F2F07434FD100494AE0 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = ../locale; sourceTree = SOURCE_ROOT; }; - 22E554A00D18CC5D007D14E9 /* magic-docs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "magic-docs"; path = "../magic/magic-docs"; sourceTree = SOURCE_ROOT; }; - 22E554DD0D18CD69007D14E9 /* SVG.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = SVG.txt; path = ../docs/SVG.txt; sourceTree = SOURCE_ROOT; }; 22ECE2AF0CEFE00200D390B3 /* blocks_chalk_drip.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = blocks_chalk_drip.so; sourceTree = BUILT_PRODUCTS_DIR; }; 22ECE3120CF0BC8F00D390B3 /* blur.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = blur.so; sourceTree = BUILT_PRODUCTS_DIR; }; 22ECE3450CF0C4F100D390B3 /* bricks.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = bricks.so; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -936,7 +847,6 @@ 2248FC9E0CE2C7C9004BC461 /* SDL_image.framework in Frameworks */, 2248FCA10CE2C7CB004BC461 /* SDL.framework in Frameworks */, 2248FCD10CE2C7E1004BC461 /* SDL_mixer.framework in Frameworks */, - 22F461770CE41CDE00DB7761 /* libintl.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -944,7 +854,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E96D60FFB999A00A9A38E /* libintl.a in Frameworks */, 226E96D70FFB999A00A9A38E /* SDL_image.framework in Frameworks */, 226E96D80FFB999A00A9A38E /* SDL_mixer.framework in Frameworks */, 226E96D90FFB999A00A9A38E /* SDL.framework in Frameworks */, @@ -955,7 +864,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E96EB0FFB9B3200A9A38E /* libintl.a in Frameworks */, 226E96EC0FFB9B3200A9A38E /* SDL.framework in Frameworks */, 226E96ED0FFB9B3200A9A38E /* SDL_image.framework in Frameworks */, 226E96EE0FFB9B3200A9A38E /* SDL_mixer.framework in Frameworks */, @@ -966,7 +874,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97080FFB9BBD00A9A38E /* libintl.a in Frameworks */, 226E97090FFB9BBD00A9A38E /* SDL.framework in Frameworks */, 226E970A0FFB9BBD00A9A38E /* SDL_image.framework in Frameworks */, 226E970B0FFB9BBD00A9A38E /* SDL_mixer.framework in Frameworks */, @@ -977,7 +884,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E971E0FFB9C4E00A9A38E /* libintl.a in Frameworks */, 226E971F0FFB9C4E00A9A38E /* SDL.framework in Frameworks */, 226E97200FFB9C4E00A9A38E /* SDL_image.framework in Frameworks */, 226E97210FFB9C4E00A9A38E /* SDL_mixer.framework in Frameworks */, @@ -988,7 +894,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97320FFB9CB500A9A38E /* libintl.a in Frameworks */, 226E97330FFB9CB500A9A38E /* SDL.framework in Frameworks */, 226E97340FFB9CB500A9A38E /* SDL_image.framework in Frameworks */, 226E97350FFB9CB500A9A38E /* SDL_mixer.framework in Frameworks */, @@ -999,7 +904,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E974C0FFB9D3300A9A38E /* libintl.a in Frameworks */, 226E974D0FFB9D3300A9A38E /* SDL.framework in Frameworks */, 226E974E0FFB9D3300A9A38E /* SDL_image.framework in Frameworks */, 226E974F0FFB9D3300A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1010,7 +914,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97620FFB9D9100A9A38E /* libintl.a in Frameworks */, 226E97630FFB9D9100A9A38E /* SDL.framework in Frameworks */, 226E97640FFB9D9100A9A38E /* SDL_image.framework in Frameworks */, 226E97650FFB9D9100A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1021,7 +924,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97720FFB9DD600A9A38E /* libintl.a in Frameworks */, 226E97730FFB9DD600A9A38E /* SDL.framework in Frameworks */, 226E97740FFB9DD600A9A38E /* SDL_image.framework in Frameworks */, 226E97750FFB9DD600A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1032,7 +934,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97850FFB9E4000A9A38E /* libintl.a in Frameworks */, 226E97860FFB9E4000A9A38E /* SDL.framework in Frameworks */, 226E97870FFB9E4000A9A38E /* SDL_image.framework in Frameworks */, 226E97880FFB9E4000A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1043,7 +944,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97970FFB9E9600A9A38E /* libintl.a in Frameworks */, 226E97980FFB9E9600A9A38E /* SDL.framework in Frameworks */, 226E97990FFB9E9600A9A38E /* SDL_image.framework in Frameworks */, 226E979A0FFB9E9600A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1054,7 +954,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97A90FFB9EEF00A9A38E /* libintl.a in Frameworks */, 226E97AA0FFB9EEF00A9A38E /* SDL.framework in Frameworks */, 226E97AB0FFB9EEF00A9A38E /* SDL_image.framework in Frameworks */, 226E97AC0FFB9EEF00A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1065,7 +964,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97BB0FFB9F4200A9A38E /* libintl.a in Frameworks */, 226E97BC0FFB9F4200A9A38E /* SDL.framework in Frameworks */, 226E97BD0FFB9F4200A9A38E /* SDL_image.framework in Frameworks */, 226E97BE0FFB9F4200A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1076,7 +974,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97CE0FFB9F8E00A9A38E /* libintl.a in Frameworks */, 226E97CF0FFB9F8E00A9A38E /* SDL.framework in Frameworks */, 226E97D00FFB9F8E00A9A38E /* SDL_image.framework in Frameworks */, 226E97D10FFB9F8E00A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1087,7 +984,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97E20FFB9FEE00A9A38E /* libintl.a in Frameworks */, 226E97E30FFB9FEE00A9A38E /* SDL.framework in Frameworks */, 226E97E40FFB9FEE00A9A38E /* SDL_image.framework in Frameworks */, 226E97E50FFB9FEE00A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1098,7 +994,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E97F60FFBA04000A9A38E /* libintl.a in Frameworks */, 226E97F70FFBA04000A9A38E /* SDL.framework in Frameworks */, 226E97F80FFBA04000A9A38E /* SDL_image.framework in Frameworks */, 226E97F90FFBA04000A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1109,7 +1004,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E980B0FFBA08F00A9A38E /* libintl.a in Frameworks */, 226E980C0FFBA08F00A9A38E /* SDL.framework in Frameworks */, 226E980D0FFBA08F00A9A38E /* SDL_image.framework in Frameworks */, 226E980E0FFBA08F00A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1120,7 +1014,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 226E981A0FFBA10500A9A38E /* libintl.a in Frameworks */, 226E981B0FFBA10500A9A38E /* SDL.framework in Frameworks */, 226E981C0FFBA10500A9A38E /* SDL_image.framework in Frameworks */, 226E981D0FFBA10500A9A38E /* SDL_mixer.framework in Frameworks */, @@ -1131,7 +1024,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE2B80CF01A2800D390B3 /* libintl.a in Frameworks */, 22ECE2CB0CF0B08A00D390B3 /* SDL_image.framework in Frameworks */, 22ECE2CE0CF0B08A00D390B3 /* SDL_mixer.framework in Frameworks */, 22ECE2D10CF0B08C00D390B3 /* SDL.framework in Frameworks */, @@ -1142,7 +1034,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE3230CF0C34F00D390B3 /* libintl.a in Frameworks */, 22ECE3240CF0C35600D390B3 /* SDL.framework in Frameworks */, 22ECE3250CF0C35800D390B3 /* SDL_image.framework in Frameworks */, 22ECE3260CF0C35800D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1153,7 +1044,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE33D0CF0C4F100D390B3 /* libintl.a in Frameworks */, 22ECE33E0CF0C4F100D390B3 /* SDL.framework in Frameworks */, 22ECE33F0CF0C4F100D390B3 /* SDL_image.framework in Frameworks */, 22ECE3400CF0C4F100D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1164,7 +1054,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE3540CF0C7EF00D390B3 /* libintl.a in Frameworks */, 22ECE3550CF0C7EF00D390B3 /* SDL.framework in Frameworks */, 22ECE3560CF0C7EF00D390B3 /* SDL_image.framework in Frameworks */, 22ECE3570CF0C7EF00D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1175,7 +1064,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE3670CF0C81E00D390B3 /* libintl.a in Frameworks */, 22ECE3680CF0C81E00D390B3 /* SDL.framework in Frameworks */, 22ECE3690CF0C81E00D390B3 /* SDL_image.framework in Frameworks */, 22ECE36A0CF0C81E00D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1186,7 +1074,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE3790CF0C89300D390B3 /* libintl.a in Frameworks */, 22ECE37A0CF0C89300D390B3 /* SDL.framework in Frameworks */, 22ECE37B0CF0C89300D390B3 /* SDL_image.framework in Frameworks */, 22ECE37C0CF0C89300D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1197,7 +1084,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE38E0CF0C8E600D390B3 /* libintl.a in Frameworks */, 22ECE38F0CF0C8E600D390B3 /* SDL.framework in Frameworks */, 22ECE3900CF0C8E600D390B3 /* SDL_image.framework in Frameworks */, 22ECE3910CF0C8E600D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1208,7 +1094,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE3A10CF0C90600D390B3 /* libintl.a in Frameworks */, 22ECE3A20CF0C90600D390B3 /* SDL.framework in Frameworks */, 22ECE3A30CF0C90600D390B3 /* SDL_image.framework in Frameworks */, 22ECE3A40CF0C90600D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1219,7 +1104,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE3B40CF0C9A300D390B3 /* libintl.a in Frameworks */, 22ECE3B50CF0C9A300D390B3 /* SDL.framework in Frameworks */, 22ECE3B60CF0C9A300D390B3 /* SDL_image.framework in Frameworks */, 22ECE3B70CF0C9A300D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1230,7 +1114,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE3EB0CF0CBDC00D390B3 /* libintl.a in Frameworks */, 22ECE3EC0CF0CBDC00D390B3 /* SDL.framework in Frameworks */, 22ECE3ED0CF0CBDC00D390B3 /* SDL_image.framework in Frameworks */, 22ECE3EE0CF0CBDC00D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1241,7 +1124,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE3FD0CF0CC0100D390B3 /* libintl.a in Frameworks */, 22ECE3FE0CF0CC0100D390B3 /* SDL.framework in Frameworks */, 22ECE3FF0CF0CC0100D390B3 /* SDL_image.framework in Frameworks */, 22ECE4000CF0CC0100D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1252,7 +1134,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE40F0CF0CC2500D390B3 /* libintl.a in Frameworks */, 22ECE4100CF0CC2500D390B3 /* SDL.framework in Frameworks */, 22ECE4110CF0CC2500D390B3 /* SDL_image.framework in Frameworks */, 22ECE4120CF0CC2500D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1263,7 +1144,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE4210CF0CC4C00D390B3 /* libintl.a in Frameworks */, 22ECE4220CF0CC4C00D390B3 /* SDL.framework in Frameworks */, 22ECE4230CF0CC4C00D390B3 /* SDL_image.framework in Frameworks */, 22ECE4240CF0CC4C00D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1274,7 +1154,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE4330CF0CC6B00D390B3 /* libintl.a in Frameworks */, 22ECE4340CF0CC6B00D390B3 /* SDL.framework in Frameworks */, 22ECE4350CF0CC6B00D390B3 /* SDL_image.framework in Frameworks */, 22ECE4360CF0CC6B00D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1285,7 +1164,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE4450CF0CCB400D390B3 /* libintl.a in Frameworks */, 22ECE4460CF0CCB400D390B3 /* SDL.framework in Frameworks */, 22ECE4470CF0CCB400D390B3 /* SDL_image.framework in Frameworks */, 22ECE4480CF0CCB400D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1296,7 +1174,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE4570CF0CCDB00D390B3 /* libintl.a in Frameworks */, 22ECE4580CF0CCDB00D390B3 /* SDL.framework in Frameworks */, 22ECE4590CF0CCDB00D390B3 /* SDL_image.framework in Frameworks */, 22ECE45A0CF0CCDB00D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1307,7 +1184,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE4690CF0CD1500D390B3 /* libintl.a in Frameworks */, 22ECE46A0CF0CD1500D390B3 /* SDL.framework in Frameworks */, 22ECE46B0CF0CD1500D390B3 /* SDL_image.framework in Frameworks */, 22ECE46C0CF0CD1500D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1318,7 +1194,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE47B0CF0CD4000D390B3 /* libintl.a in Frameworks */, 22ECE47C0CF0CD4000D390B3 /* SDL.framework in Frameworks */, 22ECE47D0CF0CD4000D390B3 /* SDL_image.framework in Frameworks */, 22ECE47E0CF0CD4000D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1329,7 +1204,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE48D0CF0CD6400D390B3 /* libintl.a in Frameworks */, 22ECE48E0CF0CD6400D390B3 /* SDL.framework in Frameworks */, 22ECE48F0CF0CD6400D390B3 /* SDL_image.framework in Frameworks */, 22ECE4900CF0CD6400D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1340,7 +1214,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE49F0CF0CD8600D390B3 /* libintl.a in Frameworks */, 22ECE4A00CF0CD8600D390B3 /* SDL.framework in Frameworks */, 22ECE4A10CF0CD8600D390B3 /* SDL_image.framework in Frameworks */, 22ECE4A20CF0CD8600D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1351,7 +1224,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE4B10CF0CDA500D390B3 /* libintl.a in Frameworks */, 22ECE4B20CF0CDA500D390B3 /* SDL.framework in Frameworks */, 22ECE4B30CF0CDA500D390B3 /* SDL_image.framework in Frameworks */, 22ECE4B40CF0CDA500D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1362,7 +1234,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE4C30CF0CDE200D390B3 /* libintl.a in Frameworks */, 22ECE4C40CF0CDE200D390B3 /* SDL.framework in Frameworks */, 22ECE4C50CF0CDE200D390B3 /* SDL_image.framework in Frameworks */, 22ECE4C60CF0CDE200D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1373,7 +1244,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22ECE4D50CF0CE4A00D390B3 /* libintl.a in Frameworks */, 22ECE4D60CF0CE4A00D390B3 /* SDL.framework in Frameworks */, 22ECE4D70CF0CE4A00D390B3 /* SDL_image.framework in Frameworks */, 22ECE4D80CF0CE4A00D390B3 /* SDL_mixer.framework in Frameworks */, @@ -1390,23 +1260,8 @@ 225FD5280934EC1A00F0B02F /* SDL_image.framework in Frameworks */, 225FD5290934EC1A00F0B02F /* SDL_mixer.framework in Frameworks */, 225FD52B0934EC1A00F0B02F /* SDL.framework in Frameworks */, - 221532E40C9499D100CDCB3B /* libsvg-cairo.a in Frameworks */, - 221532E50C9499D100CDCB3B /* libsvg.a in Frameworks */, - 2248FBE20CDEAC38004BC461 /* libSDL_Pango.a in Frameworks */, - 2248FC0F0CDEEDDE004BC461 /* libpango-1.0.a in Frameworks */, - 2248FC3B0CDEF241004BC461 /* libcairo.a in Frameworks */, - 2248FC3C0CDEF241004BC461 /* libfontconfig.a in Frameworks */, - 2248FC3D0CDEF241004BC461 /* libfreetype.a in Frameworks */, - 2248FC3E0CDEF241004BC461 /* libglib-2.0.a in Frameworks */, - 2248FC3F0CDEF241004BC461 /* libgmodule-2.0.a in Frameworks */, - 2248FC400CDEF241004BC461 /* libgobject-2.0.a in Frameworks */, - 2248FC410CDEF241004BC461 /* libintl.a in Frameworks */, - 2248FC420CDEF241004BC461 /* libpng.a in Frameworks */, - 2248FC4C0CDEF395004BC461 /* libexpat.a in Frameworks */, - 2248FC5A0CE19305004BC461 /* libpangoft2-1.0.a in Frameworks */, 225789450CFAA093002EE819 /* SDL_ttf.framework in Frameworks */, 22F3EC9F0D5682620068DFB4 /* Security.framework in Frameworks */, - 228437C40EF5DE5F002A13FD /* libfribidi.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1427,6 +1282,8 @@ 22140B9A0D1252E4009534C6 /* speech.h */, 22140B9B0D1252E4009534C6 /* speech.m */, 22C0EA9C0735B76F008555A2 /* wrapperdata.h */, + 078E0CF817E2A32200D9AE98 /* patch.h */, + 078E0CFC17E2A38E00D9AE98 /* patch.c */, ); name = "Mac Sources"; sourceTree = ""; @@ -1569,21 +1426,6 @@ 225FE714093AC50C00F0B02F /* Archives */ = { isa = PBXGroup; children = ( - 228437C30EF5DE5F002A13FD /* libfribidi.a */, - 2248FC390CDEF241004BC461 /* libintl.a */, - 2248FC3A0CDEF241004BC461 /* libpng.a */, - 2248FC4B0CDEF395004BC461 /* libexpat.a */, - 2248FC340CDEF241004BC461 /* libfontconfig.a */, - 2248FC350CDEF241004BC461 /* libfreetype.a */, - 2248FC330CDEF241004BC461 /* libcairo.a */, - 221532E20C9499D100CDCB3B /* libsvg.a */, - 221532E10C9499D100CDCB3B /* libsvg-cairo.a */, - 2248FC360CDEF241004BC461 /* libglib-2.0.a */, - 2248FC380CDEF241004BC461 /* libgobject-2.0.a */, - 2248FC370CDEF241004BC461 /* libgmodule-2.0.a */, - 2248FC0B0CDEEDDE004BC461 /* libpango-1.0.a */, - 2248FC590CE19305004BC461 /* libpangoft2-1.0.a */, - 2248FBE10CDEAC38004BC461 /* libSDL_Pango.a */, ); name = Archives; sourceTree = ""; @@ -1591,17 +1433,6 @@ 22710D380AE5DEAB00FC7FCF /* docs */ = { isa = PBXGroup; children = ( - 22E554A00D18CC5D007D14E9 /* magic-docs */, - 225FED8E093ACC0A00F0B02F /* html */, - 22710D420AE5DEAB00FC7FCF /* AUTHORS.txt */, - 22710D640AE5DEAB00FC7FCF /* CHANGES.txt */, - 22710D650AE5DEAB00FC7FCF /* COPYING.txt */, - 22710DA40AE5DEAC00FC7FCF /* EXTENDING.txt */, - 22710DA50AE5DEAC00FC7FCF /* FAQ.txt */, - 22710E4C0AE5DEAC00FC7FCF /* INSTALL.txt */, - 22710E920AE5DEAC00FC7FCF /* OPTIONS.txt */, - 22710E9B0AE5DEAC00FC7FCF /* PNG.txt */, - 22E554DD0D18CD69007D14E9 /* SVG.txt */, ); name = docs; path = ../docs; @@ -1624,6 +1455,7 @@ 29B97315FDCFA39411CA2CEA /* Tux Paint Sources */ = { isa = PBXGroup; children = ( + 078E0CE717E292F800D9AE98 /* onscreen_keyboard.c */, 225FCE110ADF277300466C53 /* cursor.c */, 225FCE120ADF277300466C53 /* cursor.h */, 225FCE130ADF277300466C53 /* debug.h */, @@ -2739,6 +2571,7 @@ 22D5D2A80738498300B67229 /* Copy Frameworks */, 22ECE5730CF0D6F000D390B3 /* Copy Magic Plugins */, 2217B7D50CD6F6C400DC1DA3 /* Update Library Install Paths */, + 07F673B1182205EA001A514D /* Make Optional Customization */, ); buildRules = ( 225FD5360934EF5600F0B02F /* PBXBuildRule */, @@ -2800,8 +2633,14 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = 224A35FB09339642005A3695 /* Build configuration list for PBXProject "TuxPaint" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* TuxPaint */; productRefGroup = 2248FCDC0CE2C999004BC461 /* Products */; projectDirPath = ""; @@ -2865,30 +2704,32 @@ 22C005D40736650D008555A2 /* tuxpaint.icns in Resources */, 2286F34F0740B3FC001164FE /* SDLMain.nib in Resources */, 22D0201207434FD200494AE0 /* locale in Resources */, - 225FEDBA093ACC0A00F0B02F /* html in Resources */, - 22710EE50AE5DEAD00FC7FCF /* AUTHORS.txt in Resources */, - 22710F030AE5DEAD00FC7FCF /* CHANGES.txt in Resources */, - 22710F040AE5DEAD00FC7FCF /* COPYING.txt in Resources */, - 22710F3B0AE5DEAD00FC7FCF /* EXTENDING.txt in Resources */, - 22710F3C0AE5DEAD00FC7FCF /* FAQ.txt in Resources */, - 22710FD40AE5DEAD00FC7FCF /* INSTALL.txt in Resources */, - 2271100F0AE5DEAD00FC7FCF /* OPTIONS.txt in Resources */, - 227110170AE5DEAD00FC7FCF /* PNG.txt in Resources */, 227111800AE5EC6E00FC7FCF /* fonts in Resources */, 22153A600C94C0EE00CDCB3B /* images in Resources */, 22153A610C94C0EE00CDCB3B /* sounds in Resources */, 22578CE10CFE6CCC002EE819 /* fonts.conf in Resources */, 22578CE20CFE6CCC002EE819 /* fonts.dtd in Resources */, - 2214087F0D0D17F0009534C6 /* Info.plist in Resources */, 221408D00D0D1DC7009534C6 /* credits.txt in Resources */, - 22E554DB0D18CC5D007D14E9 /* magic-docs in Resources */, - 22E554DE0D18CD69007D14E9 /* SVG.txt in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 07F673B1182205EA001A514D /* Make Optional Customization */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Make Optional Customization"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# added in version 0.9.22 //EP\n# By placing an optional script in the custom folder it is possible to customize the target\n# If the script is found it is called otherwise there is no customization\n\nexport PATH=\"${BUILT_PRODUCTS_DIR}/../../../custom\"\nexport SCRIPT=\"./macosx.sh\"\n\nDONE=0\nif [ -d $PATH ];\nthen\n\tcd $PATH\n\tif [ -f $SCRIPT ];\n\tthen\n\t\techo Custom script \"$SCRIPT\" found\n\t\t\"$SCRIPT\"\n\t\techo \"Customization done\"\n\t\tDONE=1\n\tfi\nfi\n\nif [ $DONE != 1 ]\nthen\n\techo \"No customization requested\"\nfi\n\n"; + }; 2217B7D50CD6F6C400DC1DA3 /* Update Library Install Paths */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2901,7 +2742,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#EXECFILE=${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\n#LIBPATH=${BUILT_PRODUCTS_DIR}/${SHARED_SUPPORT_FOLDER_PATH}\n#NEWLIBPATH=\"@executable_path/../SharedSupport\"\n\n# space separated list of libraries\n#TARGETS=`ls -1 \"${LIBPATH}\"` \n#for TARGET in ${TARGETS} ; do\n#\tLIBFILE=${LIBPATH}/${TARGET}\n#\tTARGETID=`otool -DX \"${LIBPATH}/$TARGET\"`\n#\tNEWTARGETID=${NEWLIBPATH}/${TARGET}\n#\tinstall_name_tool -id ${NEWTARGETID} \"${LIBFILE}\"\n#\techo \"install_name_tool -id ${NEWTARGETID} ${LIBFILE}\"\n#\tinstall_name_tool -change ${TARGETID} ${NEWTARGETID} \"${EXECFILE}\"\n#\techo \"install_name_tool -change ${TARGETID} ${NEWTARGETID} ${EXECFILE}\"\n# for TARGET2 in ${TARGETS}; do\n#\t\tLIBFILE2=${LIBPATH}/${TARGET2}\n#\t\tinstall_name_tool -change ${TARGETID} ${NEWTARGETID} \"${LIBFILE2}\"\n#\tdone\n#done"; + shellScript = "# added in version 0.9.22 //EP\nexport APP=\"${BUILT_PRODUCTS_DIR}/${TARGET_NAME}.app\"\nexport EXE=\"$APP/Contents/MacOS/${TARGET_NAME}\"\nexport DST=\"$APP/Contents/Frameworks\"\n\nupdate_framework()\n{\nFRM=$1\nFRMFILE=$FRM.framework/Versions/A/$FRM\nFRMSRC=/Library/Frameworks/$FRMFILE\ncp -p \"$FRMSRC\" \"$DST\"\n#install_name_tool -id \"@executable_path/../Frameworks/$FRM\" \"$DST/$FRMFILE\"\ninstall_name_tool -change \"@rpath/$FRMFILE\" \"@executable_path/../Frameworks/$FRM\" \"$EXE\"\necho Updated framework $FRM\n}\n\nupdate_sibling_framework()\n{\nFRM=$1\nFRMFILE=$FRM.framework/Versions/A/$FRM\nFRMSRC=/Library/Frameworks/$FRMFILE\nmkdir -p \"`dirname \"$DST/$FRMFILE\"`\"\ncp -p \"$FRMSRC\" \"`dirname \"$DST/$FRMFILE\"`\"\necho Updated sibling framework $FRM\n}\n\nupdate_embedded_framework()\n{\nFRM=$1\nFRMFILE=$FRM.framework/Versions/A/$FRM\nFRMSRC=/Library/Frameworks/$FRMFILE\nSUB=$2\nSUBFILE=$SUB.framework/Versions/A/$SUB\nSUBSRC=\"`dirname \"$FRMSRC\"`/Frameworks/$SUBFILE\"\nmkdir -p \"`dirname \"$DST/$SUBFILE\"`\"\ncp -p \"$SUBSRC\" \"`dirname \"$DST/$SUBFILE\"`\"\necho Updated embedded framework $FRM/$SUB\n}\n\necho Embedding frameworks into $APP\necho Executable is $EXE\necho Frameworks folder is $DST\n\nupdate_sibling_framework SDL\n\n#update_framework SDL_image\nupdate_sibling_framework SDL_image\nupdate_embedded_framework SDL_image webp\n\nupdate_sibling_framework SDL_mixer\nupdate_embedded_framework SDL_mixer mikmod\nupdate_embedded_framework SDL_mixer smpeg\nupdate_embedded_framework SDL_mixer Ogg\nupdate_embedded_framework SDL_mixer Vorbis\nupdate_embedded_framework SDL_mixer FLAC\n\nupdate_sibling_framework SDL_ttf\nupdate_embedded_framework SDL_ttf FreeType\n\nexit\n\n# previous version that came with Tux Paint (everything below was commented)\n# space separated list of libraries\nEXECFILE=${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\n#LIBPATH=${BUILT_PRODUCTS_DIR}/${SHARED_SUPPORT_FOLDER_PATH}\n#NEWLIBPATH=\"@executable_path/../SharedSupport\"\nTARGETS=`ls -1 \"${LIBPATH}\"` \nfor TARGET in ${TARGETS} ; do\n\tLIBFILE=${LIBPATH}/${TARGET}\n\tTARGETID=`otool -DX \"${LIBPATH}/$TARGET\"`\n\tNEWTARGETID=${NEWLIBPATH}/${TARGET}\n#\tinstall_name_tool -id ${NEWTARGETID} \"${LIBFILE}\"\n\techo \"install_name_tool -id ${NEWTARGETID} ${LIBFILE}\"\n#\tinstall_name_tool -change ${TARGETID} ${NEWTARGETID} \"${EXECFILE}\"\n\techo \"install_name_tool -change ${TARGETID} ${NEWTARGETID} ${EXECFILE}\"\n for TARGET2 in ${TARGETS}; do\n\t\tLIBFILE2=${LIBPATH}/${TARGET2}\n#\t\tinstall_name_tool -change ${TARGETID} ${NEWTARGETID} \"${LIBFILE2}\"\n\techo \"install_name_tool -change ${TARGETID} ${NEWTARGETID} ${LIBFILE2}\"\n\tdone\ndone"; }; 2248FB460CDE56D0004BC461 /* Remove Bundled Libraries */ = { isa = PBXShellScriptBuildPhase; @@ -3344,6 +3185,8 @@ 22140ABE0D110600009534C6 /* TransparentTextView.m in Sources */, 22140B9D0D1252E5009534C6 /* speech.m in Sources */, 22BA872312C9643F004C23C6 /* parse.c in Sources */, + 078E0CE817E292F800D9AE98 /* onscreen_keyboard.c in Sources */, + 07D48B7618020EB400795B98 /* patch.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3602,7 +3445,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -3619,8 +3462,7 @@ 2248FC760CE2C3A4004BC461 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3641,7 +3483,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -3676,7 +3518,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -3693,16 +3535,17 @@ 224A35F809339642005A3695 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ppc; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; FRAMEWORK_SEARCH_PATHS = "/Library/Frameworks/**"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( - OLD_SVG, + NEW_SVG, "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", @@ -3726,10 +3569,15 @@ GCC_PREPROCESSOR_DEFINITIONS_QUOTED_7 = "MAGIC_PREFIX=\\\"Tux\\ Paint.app/Contents/Resources/plugins/\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_8 = "IMDIR=\\\"Tux\\ Paint.app/Contents/Resources/im/\\\""; HEADER_SEARCH_PATHS = ( + "/Users/Shared/tuxpaint/include/**", "include/**", - /Users/Shared/tuxpaint/include, - /opt/local/include/cairo, /opt/local/include, + /opt/local/include/cairo, + "/opt/local/lib/glib-2.0/include", + "/opt/local/include/glib-2.0", + "/opt/local/include/gdk-pixbuf-2.0", + "/opt/local/include/gtk-2.0", + "/opt/local/include/librsvg-2.0", /Library/Frameworks/SDL.framework/Headers, /Library/Frameworks/SDL_image.framework/Headers/, /Library/Frameworks/SDL_mixer.framework/Headers/, @@ -3738,36 +3586,66 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - /Users/Shared/tuxpaint/lib, "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "\"$(SRCROOT)/../../lib\"", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ""; OTHER_CPLUSPLUSFLAGS = ""; OTHER_LDFLAGS = ( - "-lz", - "-lxml2", - "-liconv", + "-lgcc", + "-lresolv", + /Users/Shared/tuxpaint/lib/libbz2.a, + /Users/Shared/tuxpaint/lib/libcairo.a, + "/Users/Shared/tuxpaint/lib/libcroco-0.6.a", + /Users/Shared/tuxpaint/lib/libexpat.a, + /Users/Shared/tuxpaint/lib/libffi.a, + /Users/Shared/tuxpaint/lib/libfontconfig.a, + /Users/Shared/tuxpaint/lib/libfreetype.a, + /Users/Shared/tuxpaint/lib/libfribidi.a, + "/Users/Shared/tuxpaint/lib/libgdk_pixbuf-2.0.a", + "/Users/Shared/tuxpaint/lib/libgio-2.0.a", + "/Users/Shared/tuxpaint/lib/libglib-2.0.a", + "/Users/Shared/tuxpaint/lib/libgmodule-2.0.a", + "/Users/Shared/tuxpaint/lib/libgobject-2.0.a", + /Users/Shared/tuxpaint/lib/libharfbuzz.a, + /Users/Shared/tuxpaint/lib/libiconv.a, + /Users/Shared/tuxpaint/lib/libintl.a, + /Users/Shared/tuxpaint/lib/liblzma.a, + "/Users/Shared/tuxpaint/lib/libpango-1.0.a", + "/Users/Shared/tuxpaint/lib/libpangocairo-1.0.a", + "/Users/Shared/tuxpaint/lib/libpangoft2-1.0.a", + "/Users/Shared/tuxpaint/lib/libpixman-1.a", + /Users/Shared/tuxpaint/lib/libpng.a, + "/Users/Shared/tuxpaint/lib/librsvg-2.a", + /Users/Shared/tuxpaint/lib/libSDL_Pango.a, + /Users/Shared/tuxpaint/lib/libxml2.a, + /Users/Shared/tuxpaint/lib/libz.a, ); PREPROCESSOR_MACROS_i386 = LITTLE_ENDIAN_ARCH; PREPROCESSOR_MACROS_ppc = BIG_ENDIAN_ARCH; PRODUCT_NAME = "Tux Paint"; + SDKROOT = macosx10.6; + VALID_ARCHS = "ppc i386 ppc64 ppc7400 ppc970 x86_64"; WRAPPER_EXTENSION = app; + ZERO_LINK = NO; }; name = Development; }; 224A35F909339642005A3695 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = "/Library/Frameworks/**"; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; @@ -3796,10 +3674,10 @@ GCC_PREPROCESSOR_DEFINITIONS_QUOTED_7 = "MAGIC_PREFIX=\\\"Tux\\ Paint.app/Contents/Resources/plugins/\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_8 = "IMDIR=\\\"Tux\\ Paint.app/Contents/Resources/im/\\\""; HEADER_SEARCH_PATHS = ( + "/Users/Shared/tuxpaint/include/**", "include/**", - /Users/Shared/tuxpaint/include, - /opt/local/include/cairo, /opt/local/include, + /opt/local/include/cairo, /Library/Frameworks/SDL.framework/Headers, /Library/Frameworks/SDL_image.framework/Headers/, /Library/Frameworks/SDL_mixer.framework/Headers/, @@ -3808,23 +3686,32 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - /Users/Shared/tuxpaint/lib, "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "\"$(SRCROOT)/../../lib\"", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ""; OTHER_CPLUSPLUSFLAGS = ""; OTHER_LDFLAGS = ( - "-lz", - "-lxml2", - "-liconv", + "-lgcc", + /Users/Shared/tuxpaint/lib/libbz2.a, + /Users/Shared/tuxpaint/lib/libexpat.a, + /Users/Shared/tuxpaint/lib/libffi.a, + /Users/Shared/tuxpaint/lib/libiconv.a, + /Users/Shared/tuxpaint/lib/liblzma.a, + /Users/Shared/tuxpaint/lib/libxml2.a, + /Users/Shared/tuxpaint/lib/libz.a, ); PREPROCESSOR_MACROS_i386 = LITTLE_ENDIAN_ARCH; PREPROCESSOR_MACROS_ppc = BIG_ENDIAN_ARCH; PRODUCT_NAME = "Tux Paint"; + SDKROOT = macosx10.6; + VALID_ARCHS = "ppc i386 ppc64 ppc7400 ppc970 x86_64"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; @@ -3833,12 +3720,10 @@ 224A35FA09339642005A3695 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; FRAMEWORK_SEARCH_PATHS = "/Library/Frameworks/**"; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; @@ -3867,10 +3752,10 @@ GCC_PREPROCESSOR_DEFINITIONS_QUOTED_7 = "MAGIC_PREFIX=\\\"Tux\\ Paint.app/Contents/Resources/plugins/\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_8 = "IMDIR=\\\"Tux\\ Paint.app/Contents/Resources/im/\\\""; HEADER_SEARCH_PATHS = ( + "/Users/Shared/tuxpaint/include/**", "include/**", - /Users/Shared/tuxpaint/include, - /opt/local/include/cairo, /opt/local/include, + /opt/local/include/cairo, /Library/Frameworks/SDL.framework/Headers, /Library/Frameworks/SDL_image.framework/Headers/, /Library/Frameworks/SDL_mixer.framework/Headers/, @@ -3879,52 +3764,103 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - /Users/Shared/tuxpaint/lib, "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "\"$(SRCROOT)/../../lib\"", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ""; OTHER_CPLUSPLUSFLAGS = ""; OTHER_LDFLAGS = ( - "-lz", - "-lxml2", - "-liconv", + "-lgcc", + /Users/Shared/tuxpaint/lib/libbz2.a, + /Users/Shared/tuxpaint/lib/libexpat.a, + /Users/Shared/tuxpaint/lib/libffi.a, + /Users/Shared/tuxpaint/lib/libiconv.a, + /Users/Shared/tuxpaint/lib/liblzma.a, + /Users/Shared/tuxpaint/lib/libxml2.a, + /Users/Shared/tuxpaint/lib/libz.a, ); PREPROCESSOR_MACROS_i386 = LITTLE_ENDIAN_ARCH; PREPROCESSOR_MACROS_ppc = BIG_ENDIAN_ARCH; PRODUCT_NAME = "Tux Paint"; + SDKROOT = macosx10.6; + VALID_ARCHS = "ppc i386 ppc64 ppc7400 ppc970 x86_64"; WRAPPER_EXTENSION = app; + ZERO_LINK = NO; }; name = Default; }; 224A35FC09339642005A3695 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = include; - LIBRARY_SEARCH_PATHS = lib; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; + HEADER_SEARCH_PATHS = ( + "include/**", + "/Users/Shared/tuxpaint/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks @loader_path/../Frameworks"; + LIBRARY_SEARCH_PATHS = ( + /Users/Shared/tuxpaint/lib, + lib, + ); + MACOSX_DEPLOYMENT_TARGET = 10.5; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PATH = "$PATH :/opt/local/bin"; + PKG_CONFIG_PATH = "/Users/Shared/tuxpaint/lib/pkgconfig:/usr/lib/pkgconfig:/opt/local/lib/pkgconfig"; + SDKROOT = macosx10.6; }; name = Development; }; 224A35FD09339642005A3695 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = include; - LIBRARY_SEARCH_PATHS = lib; - MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; + HEADER_SEARCH_PATHS = ( + "include/**", + "/Users/Shared/tuxpaint/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks @loader_path/../Frameworks"; + LIBRARY_SEARCH_PATHS = ( + /Users/Shared/tuxpaint/lib, + lib, + ); + MACOSX_DEPLOYMENT_TARGET = 10.5; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PATH = "$PATH :/opt/local/bin"; + PKG_CONFIG_PATH = "/Users/Shared/tuxpaint/lib/pkgconfig:/usr/lib/pkgconfig:/opt/local/lib/pkgconfig"; + SDKROOT = macosx10.6; }; name = Deployment; }; 224A35FE09339642005A3695 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = include; - LIBRARY_SEARCH_PATHS = lib; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; + HEADER_SEARCH_PATHS = ( + "include/**", + "/Users/Shared/tuxpaint/include/**", + ); + LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks @loader_path/../Frameworks"; + LIBRARY_SEARCH_PATHS = ( + /Users/Shared/tuxpaint/lib, + lib, + ); + MACOSX_DEPLOYMENT_TARGET = 10.5; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PATH = "$PATH :/opt/local/bin"; + PKG_CONFIG_PATH = "/Users/Shared/tuxpaint/lib/pkgconfig:/usr/lib/pkgconfig:/opt/local/lib/pkgconfig"; + SDKROOT = macosx10.6; }; name = Default; }; @@ -3953,7 +3889,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -3970,8 +3906,7 @@ 226E96DC0FFB999A00A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3992,7 +3927,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4027,7 +3962,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4066,7 +4001,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4083,8 +4018,7 @@ 226E96F10FFB9B3200A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -4105,7 +4039,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4140,7 +4074,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4179,7 +4113,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4196,8 +4130,7 @@ 226E970E0FFB9BBD00A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -4218,7 +4151,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4253,7 +4186,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4292,7 +4225,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4309,8 +4242,7 @@ 226E97240FFB9C4E00A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -4331,7 +4263,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4366,7 +4298,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4405,7 +4337,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4422,8 +4354,7 @@ 226E97380FFB9CB500A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -4444,7 +4375,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4479,7 +4410,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4518,7 +4449,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4535,8 +4466,7 @@ 226E97520FFB9D3300A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -4557,7 +4487,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4592,7 +4522,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4631,7 +4561,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4648,8 +4578,7 @@ 226E97680FFB9D9100A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -4670,7 +4599,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4705,7 +4634,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4744,7 +4673,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4761,8 +4690,7 @@ 226E97780FFB9DD600A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -4783,7 +4711,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4818,7 +4746,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4857,7 +4785,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4874,8 +4802,7 @@ 226E978B0FFB9E4000A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -4896,7 +4823,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4931,7 +4858,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4970,7 +4897,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -4987,8 +4914,7 @@ 226E979D0FFB9E9600A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -5009,7 +4935,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5044,7 +4970,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5083,7 +5009,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5100,8 +5026,7 @@ 226E97AF0FFB9EEF00A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -5122,7 +5047,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5157,7 +5082,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5196,7 +5121,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5213,8 +5138,7 @@ 226E97C10FFB9F4200A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -5235,7 +5159,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5270,7 +5194,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5309,7 +5233,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5326,8 +5250,7 @@ 226E97D40FFB9F8E00A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -5348,7 +5271,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5383,7 +5306,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5422,7 +5345,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5439,8 +5362,7 @@ 226E97E80FFB9FEE00A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -5461,7 +5383,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5496,7 +5418,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5535,7 +5457,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5552,8 +5474,7 @@ 226E97FC0FFBA04000A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -5574,7 +5495,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5609,7 +5530,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5648,7 +5569,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5665,8 +5586,7 @@ 226E98110FFBA08F00A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -5687,7 +5607,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5722,7 +5642,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5761,7 +5681,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5778,8 +5698,7 @@ 226E98200FFBA10500A9A38E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -5800,7 +5719,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5835,7 +5754,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5874,7 +5793,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5891,8 +5810,7 @@ 22ECE2B50CEFE00900D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -5913,7 +5831,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5948,7 +5866,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -5987,7 +5905,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6004,8 +5922,7 @@ 22ECE31B0CF0BC9B00D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -6026,7 +5943,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6061,7 +5978,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6100,7 +6017,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6117,8 +6034,7 @@ 22ECE3430CF0C4F100D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -6139,7 +6055,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6174,7 +6090,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6213,7 +6129,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6230,8 +6146,7 @@ 22ECE35A0CF0C7EF00D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -6252,7 +6167,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6287,7 +6202,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6326,7 +6241,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6343,8 +6258,7 @@ 22ECE36D0CF0C81E00D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -6365,7 +6279,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6400,7 +6314,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6439,7 +6353,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6456,8 +6370,7 @@ 22ECE37F0CF0C89300D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -6478,7 +6391,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6513,7 +6426,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6552,7 +6465,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6569,8 +6482,7 @@ 22ECE3940CF0C8E600D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -6591,7 +6503,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6626,7 +6538,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6665,7 +6577,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6682,8 +6594,7 @@ 22ECE3A70CF0C90600D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -6704,7 +6615,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6739,7 +6650,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6778,7 +6689,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6795,8 +6706,7 @@ 22ECE3BA0CF0C9A300D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -6817,7 +6727,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6852,7 +6762,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6891,7 +6801,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6908,8 +6818,7 @@ 22ECE3F10CF0CBDC00D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -6930,7 +6839,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6965,7 +6874,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7004,7 +6913,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7021,8 +6930,7 @@ 22ECE4030CF0CC0100D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -7043,7 +6951,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7078,7 +6986,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7117,7 +7025,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7134,8 +7042,7 @@ 22ECE4150CF0CC2500D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -7156,7 +7063,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7191,7 +7098,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7230,7 +7137,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7247,8 +7154,7 @@ 22ECE4270CF0CC4C00D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -7269,7 +7175,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7304,7 +7210,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7343,7 +7249,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7360,8 +7266,7 @@ 22ECE4390CF0CC6B00D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -7382,7 +7287,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7417,7 +7322,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7456,7 +7361,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7473,8 +7378,7 @@ 22ECE44B0CF0CCB400D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -7495,7 +7399,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7530,7 +7434,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7569,7 +7473,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7586,8 +7490,7 @@ 22ECE45D0CF0CCDB00D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -7608,7 +7511,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7643,7 +7546,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7682,7 +7585,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7699,8 +7602,7 @@ 22ECE46F0CF0CD1500D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -7721,7 +7623,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7756,7 +7658,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7795,7 +7697,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7812,8 +7714,7 @@ 22ECE4810CF0CD4000D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -7834,7 +7735,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7869,7 +7770,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7908,7 +7809,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7925,8 +7826,7 @@ 22ECE4930CF0CD6400D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -7947,7 +7847,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7982,7 +7882,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8021,7 +7921,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8038,8 +7938,7 @@ 22ECE4A50CF0CD8600D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -8060,7 +7959,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8095,7 +7994,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8134,7 +8033,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8151,8 +8050,7 @@ 22ECE4B70CF0CDA500D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -8173,7 +8071,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8208,7 +8106,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8247,7 +8145,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8264,8 +8162,7 @@ 22ECE4C90CF0CDE200D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -8286,7 +8183,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8321,7 +8218,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8360,7 +8257,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8377,8 +8274,7 @@ 22ECE4DB0CF0CE4A00D390B3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -8399,7 +8295,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8434,7 +8330,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../../../Shared/tuxpaint/lib\""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ( "-framework", Foundation, diff --git a/macosx/fonts.conf b/macosx/fonts.conf index d8c8b758f..b31570e94 100644 --- a/macosx/fonts.conf +++ b/macosx/fonts.conf @@ -19,20 +19,30 @@ --> + + /Library/Fonts + /Network/Library/Fonts + + /usr/X11R6/lib/X11/fonts/Type1 + /usr/X11R6/lib/X11/fonts/TTF + /usr/share/fonts + ~/Library/Fonts + ~/.fonts - /Library/Fonts - /Network/Library/Fonts - /System/Library/Fonts - /usr/X11R6/lib/X11/fonts/Type1 - /usr/X11R6/lib/X11/fonts/TTF - /usr/share/fonts - ~/Library/Fonts - ~/.fonts - - ~/.fontconfig + + ~/.fontconfig + - - Times - Times New Roman - Nimbus Roman No9 L - Luxi Serif - Kochi Mincho - AR PL SungtiL GB - AR PL Mingti2L Big5 - Baekmuk Batang - serif - + + + Times + serif + + + Times New Roman + serif + + + Nimbus Roman No9 L + serif + + + Luxi Serif + serif + + + Kochi Mincho + serif + + + AR PL SungtiL GB + serif + + + AR PL Mingti2L Big5 + serif + + + Baekmuk Batang + serif + + - - Lucida Grande - Geneva - Helvetica - Arial - Verdana - Nimbus Sans L - Luxi Sans - Osaka - Kochi Gothic - AR PL KaitiM GB - AR PL KaitiM Big5 - Baekmuk Dotum - SimSun - sans-serif - + + + Lucida Grande + sans-serif + + + Geneva + sans-serif + + + Helvetica + sans-serif + + + Arial + sans-serif + + + Verdana + sans-serif + + + Nimbus Sans L + sans-serif + + + Luxi Sans + sans-serif + + + Osaka + sans-serif + + + Kochi Gothic + sans-serif + + + AR PL KaitiM GB + sans-serif + + + AR PL KaitiM Big5 + sans-serif + + + Baekmuk Dotum + sans-serif + + + SimSun + sans-serif + + - - Monaco - Courier - Courier New - Andale Mono - Luxi Mono - Nimbus Mono L - NSimSun - monospace - + + + Monaco + monospace + + + Courier + monospace + + + Courier New + monospace + + + Andale Mono + monospace + + + Luxi Mono + monospace + + + Nimbus Mono L + monospace + + + NSimSun + monospace + + diff --git a/magic/src/alien.c b/magic/src/alien.c index 2c844e429..6dcac1bef 100644 --- a/magic/src/alien.c +++ b/magic/src/alien.c @@ -140,11 +140,16 @@ static void do_alien_pixel(void * ptr, int which ATTRIBUTE_UNUSED, double temp2[3]; int k; - SDL_GetRGB(api->getpixel(canvas,x, y), canvas->format, &temp[0], &temp[1], &temp[2]); + SDL_GetRGB(api->getpixel(canvas,x, y), canvas->format, &temp[0], &temp[1], &temp[2]); for (k =0;k<3;k++){ - temp2[k] = clamp(0,127.5 * (1.0 + sin (((temp[k] / 127.5 - 1.0) * alien_FREQUENCY[k] + alien_ANGLE[k] / 180.0) * M_PI)),255); +//EP temp2[k] = clamp(0,127.5 * (1.0 + sin (((temp[k] / 127.5 - 1.0) * alien_FREQUENCY[k] + alien_ANGLE[k] / 180.0) * M_PI)),255); + temp2[k] = clamp(0.0, + 127.5 * ( + 1.0 + sin (((temp[k] / 127.5 - 1.0) * alien_FREQUENCY[k] + alien_ANGLE[k] / 180.0) * M_PI) + ), + 255.0); } - api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, temp2[0], temp2[1], temp2[2])); + api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, temp2[0], temp2[1], temp2[2])); } diff --git a/src/dirwalk.c b/src/dirwalk.c index 5080e1c69..9964efd56 100644 --- a/src/dirwalk.c +++ b/src/dirwalk.c @@ -107,13 +107,13 @@ void loadfont_callback(SDL_Surface * screen, const char *restrict const dir, char fname[512]; TuxPaint_Font *font; snprintf(fname, sizeof fname, "%s/%s", dir, files[i].str); -/* printf("Loading font: %s (locale is: %s)\n", fname, (locale ? locale : "NULL")); */ +/* */printf("Loading font: %s (locale is: %s)\n", fname, (locale ? locale : "NULL")); /**/ //EP if (locale && strstr(fname, "locale") && !all_locale_fonts) { char fname_check[512]; /* We're (probably) loading from our locale fonts folder; ONLY load our locale's font */ snprintf(fname_check, sizeof fname_check, "%s/%s.ttf", dir, locale); -/* printf("checking vs \"%s\" vs \"%s\"\n", fname_check, fname); */ +/* */printf("checking vs \"%s\" vs \"%s\"\n", fname_check, fname); /**/ //EP if (strcmp(fname, fname_check) == 0) font = TuxPaint_Font_OpenFont("", fname, text_sizes[text_size]); else @@ -136,7 +136,7 @@ void loadfont_callback(SDL_Surface * screen, const char *restrict const dir, family, style); printf("success: tpf: 0x%x tpf->ttf_font: 0x%x\n", - (unsigned int) font, (unsigned int) font->ttf_font); + (unsigned int)(intptr_t) font, (unsigned int)(intptr_t) font->ttf_font); //EP added (intptr_t) to avoid warning on x64 #endif // These fonts crash Tux Paint via a library bug. diff --git a/src/fonts.c b/src/fonts.c index 058d2ba89..75b9ad709 100644 --- a/src/fonts.c +++ b/src/fonts.c @@ -259,15 +259,24 @@ TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size) void TuxPaint_Font_CloseFont(TuxPaint_Font * tpf) { + printf("TuxPaint_Font_CloseFont step 1 (%p)\n", tpf); //EP + if (!tpf) return; //EP + #ifndef NO_SDLPANGO + printf("TuxPaint_Font_CloseFont step 2 (%p, %d)\n", tpf->pango_context, tpf->typ); //EP if (tpf->typ == FONT_TYPE_PANGO) + if (tpf->pango_context) //EP { - SDLPango_FreeContext(tpf->pango_context); - tpf->pango_context = NULL; +#ifndef __APPLE__ //EP added ifdef because SDLPango_FreeContext sometimes crashed with "pointer being freed was not allocated" + SDLPango_FreeContext(tpf->pango_context); +#endif + tpf->pango_context = NULL; } #endif + printf("TuxPaint_Font_CloseFont step 3 (%p, %d)\n", tpf->ttf_font, tpf->typ); //EP if (tpf->typ == FONT_TYPE_TTF) + if (tpf->ttf_font) //EP { TTF_CloseFont(tpf->ttf_font); tpf->ttf_font = NULL; @@ -956,6 +965,8 @@ static void loadfonts(SDL_Surface * screen, const char *const dir) status_t result; result = find_directory(B_SYSTEM_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); loadfonts(screen, buffer); + result = find_directory(B_COMMON_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); + loadfonts(screen, buffer); result = find_directory(B_USER_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); loadfonts(screen, buffer); #elif defined(__APPLE__) @@ -1286,7 +1297,7 @@ TuxPaint_Font *getfonthandle(int desire) } else { -#ifdef DBEUG +#ifdef DEBUG //EP fixed typo: replaced DBEUG with DEBUG printf("fi->filename is NULL\n"); fflush(stdout); #endif @@ -1297,7 +1308,8 @@ TuxPaint_Font *getfonthandle(int desire) if (fi->handle) { #ifdef DEBUG - printf("fi->handle was set (0x%x)\n", (int) fi->handle); + printf("fi->handle was set (0x%x)\n", (int)(intptr_t) fi->handle); //EP added (intptr_t) to avoid warning on x64 + fflush(stdout); #endif return fi->handle; diff --git a/src/i18n.c b/src/i18n.c index fa71654a8..ebb1b5ef7 100644 --- a/src/i18n.c +++ b/src/i18n.c @@ -481,7 +481,7 @@ static void show_lang_usage(int exitcode) /* xh */ " xhosa\n" /* zam */" zapotec miahuatlan-zapotec\n" /* zu */ " zulu\n" - "\n", prg); + "\n", prg); exit(exitcode); } @@ -500,15 +500,15 @@ static void show_locale_usage(FILE * f, const char *const prg) " af_ZA (Afrikaans)\n" " ak_GH (Akan Twi-Fante)\n" " am_ET (Amharic)\n" - " ar_SA (Arabic)\n" + " ar_SA (Arabic)\n" " an_ES (Aragones)\n" " hy_AM (Armenian)\n" - " ast_ES (Asturian)\n" - " az_AZ (Azerbaijani)\n" - " bm_ML (Bambara)\n" - " eu_ES (Basque Euskara)\n" - " be_BY (Belarusian Bielaruskaja)\n" - " nb_NO (Bokmal)\n" + " ast_ES (Asturian)\n" + " az_AZ (Azerbaijani)\n" + " bm_ML (Bambara)\n" + " eu_ES (Basque Euskara)\n" + " be_BY (Belarusian Bielaruskaja)\n" + " nb_NO (Bokmal)\n" " pt_BR (Brazilian Brazilian Portuguese Portugues Brazilian)\n" " br_FR (Breton Brezhoneg)\n" " en_AU (Australian English)\n" @@ -546,19 +546,19 @@ static void show_locale_usage(FILE * f, const char *const prg) " id_ID (Indonesian Bahasa Indonesia)\n" " it_IT (Italian Italiano)\n" " iu_CA (Inuktitut)\n" - " ja_JP (Japanese)\n" - " ka_GE (Georgian)\n" - " km_KH (Khmer)\n" - " ko_KR (Korean)\n" - " ku_TR (Kurdish)\n" - " ms_MY (Malay)\n" + " ja_JP (Japanese)\n" + " ka_GE (Georgian)\n" + " km_KH (Khmer)\n" + " ko_KR (Korean)\n" + " ku_TR (Kurdish)\n" + " ms_MY (Malay)\n" " ml_IN (Malayalam)\n" " lg_UG (Luganda)\n" " lb_LU (Luxembourgish Letzebuergesch)\n" - " lv_LV (Latvian)\n" - " lt_LT (Lithuanian Lietuviu)\n" - " mk_MK (Macedonian)\n" - " mn_MN (Mongolian)\n" + " lv_LV (Latvian)\n" + " lt_LT (Lithuanian Lietuviu)\n" + " mk_MK (Macedonian)\n" + " mn_MN (Mongolian)\n" " mr_IN (Marathi)\n" " nr_ZA (Ndebele)\n" " nso_ZA (Northern Sotho Sotho sa Leboa)\n" @@ -576,31 +576,31 @@ static void show_locale_usage(FILE * f, const char *const prg) " sl_SI (Slovenian)\n" " son (Songhay)\n" " sq_AL (Albanian)\n" - " sr_YU (Serbian (cyrillic))\n" + " sr_YU (Serbian (cyrillic))\n" " sr_RS@latin (Serbian (latin))\n" - " es_ES (Spanish Espanol)\n" + " es_ES (Spanish Espanol)\n" " su_ID (Sundanese)\n" - " es_MX (Mexican Mexican Spanish Espanol Mejicano)\n" - " sw_TZ (Swahili)\n" - " sv_SE (Swedish Svenska)\n" + " es_MX (Mexican Mexican Spanish Espanol Mejicano)\n" + " sw_TZ (Swahili)\n" + " sv_SE (Swedish Svenska)\n" " ta_IN (Tamil)\n" " te_IN (Telugu)\n" " tl_PH (Tagalog)\n" " bo_CN (Tibetan)\n" " th_TH (Thai)\n" " tr_TR (Turkish)\n" - " twi_GH (Twi)\n" - " uk_UA (Ukrainian)\n" - " ve_ZA (Venda)\n" - " vec (Venetian)\n" - " vi_VN (Vietnamese)\n" - " wa_BE (Walloon)\n" - " wo_SN (Wolof)\n" - " cy_GB (Welsh Cymraeg)\n" - " xh_ZA (Xhosa)\n" - " zam (Zapoteco-Miahuatlan)\n" + " twi_GH (Twi)\n" + " uk_UA (Ukrainian)\n" + " ve_ZA (Venda)\n" + " vec (Venetian)\n" + " vi_VN (Vietnamese)\n" + " wa_BE (Walloon)\n" + " wo_SN (Wolof)\n" + " cy_GB (Welsh Cymraeg)\n" + " xh_ZA (Xhosa)\n" + " zam (Zapoteco-Miahuatlan)\n" " zu_ZA (Zulu)\n" - "\n", prg); + "\n", prg); } @@ -730,9 +730,12 @@ static int set_current_language(const char *restrict loc) /* First set the locale according to the environment, then try to overwrite with loc, after that, ctype_utf8() call will test the compatibility with utf8 and try to load a different locale if the resulting one is not compatible. */ +printf ("Locale BEFORE is: %s\n", setlocale(LC_ALL,NULL));//EP setlocale(LC_ALL, ""); setlocale(LC_ALL, loc); ctype_utf8(); +printf ("Locale AFTER is: %s\n", setlocale(LC_ALL,NULL));//EP + bindtextdomain("tuxpaint", LOCALEDIR); /* Old version of glibc does not have bind_textdomain_codeset() */ @@ -841,7 +844,7 @@ int setup_i18n(const char *restrict lang, const char *restrict locale) if(lang) locale = language_to_locale(lang); - + patch_i18n(locale); //EP return set_current_language(locale); } diff --git a/src/im.c b/src/im.c index 7c772a120..ba942660c 100644 --- a/src/im.c +++ b/src/im.c @@ -484,7 +484,7 @@ static int charmap_add(CHARMAP* cm, int section, char* seq, const wchar_t* unico /* For now, we only utilize one-character flags */ if(strlen(flag) > 1) { - fprintf(stderr, "%04X: Multi-character flag, truncated.\n", (int)unicode); + fprintf(stderr, "%04X: Multi-character flag, truncated.\n", (int)(intptr_t)unicode); //EP added (intptr_t) to avoid warning on x64 } return sm_add(&cm->sections[section], seq, unicode, flag[0]); diff --git a/src/macosx_print.m b/src/macosx_print.m index af98c9e45..cb7f178eb 100644 --- a/src/macosx_print.m +++ b/src/macosx_print.m @@ -305,10 +305,10 @@ const char* SurfacePrint( SDL_Surface *surface, int showDialog ) [ image setSize:imageSize ]; [ printView setImage:image ]; - + // run printing printOperation = [ NSPrintOperation printOperationWithView:printView printInfo:printInfo ]; - [ printOperation setShowPanels:showDialog ]; + [ printOperation setShowsPrintPanel:showDialog ]; //EP replaced setShowPanels by setShowsPrintPanel macosx.cocoaKeystrokes = 1; delegate = [ [ [ ModalDelegate alloc ] init ] autorelease ]; diff --git a/src/onscreen_keyboard.c b/src/onscreen_keyboard.c index 072cb2b53..f90ff64f1 100644 --- a/src/onscreen_keyboard.c +++ b/src/onscreen_keyboard.c @@ -1,3 +1,4 @@ +#include "patch.h" //EP #include "onscreen_keyboard.h" //#define DEBUG_OSK_COMPOSEMAP diff --git a/src/parse.gperf b/src/parse.gperf index 29a051d64..d9ac1bcc7 100644 --- a/src/parse.gperf +++ b/src/parse.gperf @@ -13,6 +13,7 @@ #include #include #include "../src/parse.h" +#include "debug.h" const char PARSE_YES[] = "yes"; const char PARSE_NO[] = "no"; @@ -188,8 +189,10 @@ void parse_one_option(struct cfginfo *restrict tmpcfg, const char *str, const ch unsigned offset; char *dupecheck; const struct cfg *cfg; - - //printf("parsing: <%s> <%s>\n",str,arg); + +#ifdef DEBUG + printf("parsing %s: <%s> <%s>\n", src, str, opt); +#endif if(isdigit(*str)) { diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 52dc887a0..f42afdb80 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -181,6 +181,7 @@ static scaleparams scaletable[] = { #include #include #include +#include //EP added this include for basename() /* On Linux, we can use 'wordexp()' to expand env. vars. in settings pulled from config. files */ @@ -255,6 +256,7 @@ char *strcasestr(const char *haystack, const char *needle) #endif #ifdef DEBUG +#undef gettext //EP to avoid warning on following line #define gettext(String) debug_gettext(String) #endif @@ -448,7 +450,7 @@ static void mtw(wchar_t * wtok, char * tok) #else #include -#include +//#include //EP to avoid warning "Including directly is deprecated." /* #include "rsvg.h" */ /* #include "rsvg-cairo.h" */ #if !defined(RSVG_H) || !defined(RSVG_CAIRO_H) @@ -463,6 +465,7 @@ static void mtw(wchar_t * wtok, char * tok) #endif +#include //EP added for PNG upgrade from 1.2 to 1.5 #define PNG_INTERNAL #include #define FNAME_EXTENSION ".png" @@ -507,6 +510,8 @@ static void mtw(wchar_t * wtok, char * tok) #include "compiler.h" +//EP added #ifndef __APPLE__ because macros are buggy (shifted by 1 byte), plus the function exists in SDL +#ifndef __APPLE__ #if VIDEO_BPP==32 #ifdef __GNUC__ #define SDL_GetRGBA(p,f,rp,gp,bp,ap) ({ \ @@ -540,6 +545,7 @@ static void mtw(wchar_t * wtok, char * tok) (((b) & 0xffu) << 0) \ ) #endif +#endif //#define fmemopen_alternative */ /* Uncomment this to test the fmemopen alternative in systems were fmemopen exists */ @@ -4674,17 +4680,17 @@ static void mainloop(void) /* Time to replace "Great!" with old tip text: */ if (event.user.data1 != NULL) - { - if (((unsigned char *) event.user.data1)[0] == '=') - { - draw_tux_text_ex(TUX_GREAT, (char *) event.user.data1 + 1, 1, (int)event.user.data2); - } - else - { - draw_tux_text_ex(TUX_GREAT, (char *) event.user.data1, 0, (int)event.user.data2); - } - } - else + { + if (((unsigned char *) event.user.data1)[0] == '=') + { + draw_tux_text_ex(TUX_GREAT, (char *) event.user.data1 + 1, 1, (int)(intptr_t)event.user.data2); //EP added (intptr_t) to avoid warning on x64 + } + else + { + draw_tux_text_ex(TUX_GREAT, (char *) event.user.data1, 0, (int)(intptr_t)event.user.data2); //EP added (intptr_t) to avoid warning on x64 + } + } + else draw_tux_text(TUX_GREAT, "", 1); } else if (event.user.code == USEREVENT_PLAYDESCSOUND) @@ -4698,15 +4704,15 @@ static void mainloop(void) #ifndef NOSOUND Mix_ChannelFinished(NULL); /* Kill the callback, so we don't get stuck in a loop! */ - if (event.user.data1 != NULL) - { - if ((int) event.user.data1 == cur_stamp[stamp_group]) /* Don't play old stamp's sound... */ - { - if (!mute && stamp_data[stamp_group][(int) event.user.data1]->sdesc != NULL) - Mix_PlayChannel(2, stamp_data[stamp_group][(int) event.user.data1]->sdesc, - 0); - } - } + if (event.user.data1 != NULL) + { + if ((int)(intptr_t) event.user.data1 == cur_stamp[stamp_group]) /* Don't play old stamp's sound... */ //EP added (intptr_t) to avoid warning on x64 + { + if (!mute && stamp_data[stamp_group][(int)(intptr_t) event.user.data1]->sdesc != NULL) //EP added (intptr_t) to avoid warning on x64 + Mix_PlayChannel(2, stamp_data[stamp_group][(int)(intptr_t) event.user.data1]->sdesc, //EP added (intptr_t) to avoid warning on x64 + 0); + } + } #endif } } @@ -5974,10 +5980,10 @@ static void tint_surface(SDL_Surface * tmp_surf, SDL_Surface * surf_ptr) #endif key_color_ptr = find_most_saturated(initial_hue, work, - width * height, &hue_range); + width * height, &hue_range); #ifdef DEBUG - printf("key_color_ptr = %d\n", (int) key_color_ptr); + printf("key_color_ptr = %d\n", (int)(intptr_t) key_color_ptr); //EP added (intptr_t) to avoid warning on x64 #endif if (key_color_ptr) @@ -8049,7 +8055,7 @@ static unsigned draw_colors(unsigned action) SDL_Rect dest; static unsigned old_color; unsigned old_colors_state; - + old_colors_state = colors_state; if (action == COLORSEL_CLOBBER || action == COLORSEL_CLOBBER_WIPE) @@ -9309,14 +9315,31 @@ static SDL_Surface *zoom(SDL_Surface * src, int new_w, int new_h) one_minus_y = 1.0 - fraction_y; #if VIDEO_BPP==32 + { //EP added local block to avoid warning "Passing arg 3 from incompatible pointer type" of section below block + Uint8 r, g, b, a; SDL_GetRGBA(getpixel(src, floor_x, floor_y), src->format, - &r1, &g1, &b1, &a1); + &r, &g, &b, &a); + r1 = (float)r; g1=(float)g; b1 = (float)b; a1 = (float)a; SDL_GetRGBA(getpixel(src, ceil_x, floor_y), src->format, - &r2, &g2, &b2, &a2); + &r, &g, &b, &a); + r2 = (float)r; g2=(float)g; b2 = (float)b; a2 = (float)a; SDL_GetRGBA(getpixel(src, floor_x, ceil_y), src->format, - &r3, &g3, &b3, &a3); + &r, &g, &b, &a); + r3 = (float)r; g3=(float)g; b3 = (float)b; a3 = (float)a; SDL_GetRGBA(getpixel(src, ceil_x, ceil_y), src->format, - &r4, &g4, &b4, &a4); + &r, &g, &b, &a); + r4 = (float)r; g4=(float)g; b4 = (float)b; a4 = (float)a; + } + /* + SDL_GetRGBA(getpixel(src, floor_x, floor_y), src->format, + &r1, &g1, &b1, &a1); + SDL_GetRGBA(getpixel(src, ceil_x, floor_y), src->format, + &r2, &g2, &b2, &a2); + SDL_GetRGBA(getpixel(src, floor_x, ceil_y), src->format, + &r3, &g3, &b3, &a3); + SDL_GetRGBA(getpixel(src, ceil_x, ceil_y), src->format, + &r4, &g4, &b4, &a4); + */ #else { Uint8 r, g, b, a; @@ -10517,7 +10540,7 @@ static void playstampdesc(int chan) playsound_event.type = SDL_USEREVENT; playsound_event.user.code = USEREVENT_PLAYDESCSOUND; - playsound_event.user.data1 = (void *) cur_stamp[stamp_group]; + playsound_event.user.data1 = (void *)(intptr_t) cur_stamp[stamp_group]; //EP added (intptr_t) to avoid warning on x64 SDL_PushEvent(&playsound_event); } @@ -11324,7 +11347,7 @@ static void load_template(char *img_id) #ifndef NOSVG /* (Failed? Try SVG next) */ - if (tmp_surf == NULL) + if (tmp_surf == NULL) { snprintf(fname, sizeof(fname), "%s/%s", dirname, img_id); tmp_surf = load_starter_helper(fname, "svg", &load_svg); @@ -11332,7 +11355,7 @@ static void load_template(char *img_id) #endif /* (JPEG) */ - if (tmp_surf == NULL) + if (tmp_surf == NULL) { snprintf(fname, sizeof(fname), "%s/%s", dirname, img_id); tmp_surf = load_starter_helper(fname, "jpeg", &IMG_Load); @@ -11421,16 +11444,17 @@ static void load_current(void) if (file_id[0] != '\0') { - start_label_node=NULL; - current_label_node=NULL; - first_label_node_in_redo_stack=NULL; - highlighted_label_node = NULL; - label_node_to_edit = NULL; - have_to_rec_label_node = FALSE; - snprintf(ftmp, sizeof(ftmp), "saved/%s%s", - file_id, FNAME_EXTENSION); - fname = get_fname(ftmp, DIR_SAVE); + start_label_node=NULL; + current_label_node=NULL; + first_label_node_in_redo_stack=NULL; + highlighted_label_node = NULL; + label_node_to_edit = NULL; + have_to_rec_label_node = FALSE; + + snprintf(ftmp, sizeof(ftmp), "saved/%s%s", + file_id, FNAME_EXTENSION); + fname = get_fname(ftmp, DIR_SAVE); tmp = myIMG_Load_RWops(fname); @@ -12173,18 +12197,21 @@ static void cleanup(void) if (medium_font != NULL) { + printf("cleanup: medium font\n"); //EP TuxPaint_Font_CloseFont(medium_font); medium_font = NULL; } if (small_font != NULL) { + printf("cleanup: small font\n"); //EP TuxPaint_Font_CloseFont(small_font); small_font = NULL; } if (large_font != NULL) { + printf("cleanup: large font\n"); //EP TuxPaint_Font_CloseFont(large_font); large_font = NULL; } @@ -12313,22 +12340,26 @@ static void cleanup(void) SDL_Quit(); /* Call this once only, at exit */ +//EP now deprecated +/* #if !defined(NOSVG) && !defined(OLD_SVG) #ifdef DEBUG printf("rsvg_term()\n"); fflush(stdout); #endif rsvg_term(); #endif +*/ } static void free_surface(SDL_Surface ** surface_array) { - if (*surface_array) - { - SDL_FreeSurface(*surface_array); - *surface_array = NULL; - } + if (surface_array) //EP added this line to avoid app crash + if (*surface_array) + { + SDL_FreeSurface(*surface_array); + *surface_array = NULL; + } } @@ -12336,10 +12367,11 @@ static void free_surface_array(SDL_Surface * surface_array[], int count) { int i; - for (i = 0; i < count; ++i) - { - free_surface(&surface_array[i]); - } + if (surface_array) //EP added this line to avoid app crash + for (i = 0; i < count; ++i) + { + free_surface(&surface_array[i]); + } } @@ -12962,7 +12994,7 @@ static void do_png_embed_data(png_structp png_ptr) /* Starter foreground */ if (img_starter) { - printf("Saving starter... %d\n", (int) img_starter); + printf("Saving starter... %d\n", (int)(intptr_t) img_starter); //EP added (intptr_t) to avoid warning on x64 sbk_pixs = malloc(img_starter->h * img_starter->w * 4); compressedLen = compressBound(img_starter->h * img_starter->w * 4); @@ -14523,8 +14555,8 @@ static int do_open(void) snprintf(fname, sizeof(fname), "%s/%s%s", dirname[d_places[which]], d_names[which], d_exts[which]); fi = fopen(fname, "r"); - if (fi == NULL) - { + if (fi == NULL) + { fprintf(stderr, "\nWarning: Couldn't load the saved image! (1)\n" "%s\n" @@ -14759,20 +14791,20 @@ static int do_slideshow(void) || strcasestr(f->d_name, ".bmp") != NULL ) { - strcpy(fname, f->d_name); - if (strcasestr(fname, FNAME_EXTENSION) != NULL) - { - d_exts[num_files] = strdup(strcasestr(fname, FNAME_EXTENSION)); - strcpy((char *) strcasestr(fname, FNAME_EXTENSION), ""); - } + strcpy(fname, f->d_name); + if (strcasestr(fname, FNAME_EXTENSION) != NULL) + { + d_exts[num_files] = strdup(strcasestr(fname, FNAME_EXTENSION)); + strcpy((char *) strcasestr(fname, FNAME_EXTENSION), ""); + } - if (strcasestr(fname, ".bmp") != NULL) - { - d_exts[num_files] = strdup(strcasestr(fname, ".bmp")); - strcpy((char *) strcasestr(fname, ".bmp"), ""); - } + if (strcasestr(fname, ".bmp") != NULL) + { + d_exts[num_files] = strdup(strcasestr(fname, ".bmp")); + strcpy((char *) strcasestr(fname, ".bmp"), ""); + } - d_names[num_files] = strdup(fname); + d_names[num_files] = strdup(fname); /* FIXME: Try to center list on whatever was selected @@ -16145,7 +16177,8 @@ static void do_render_cur_text(int do_blit) { #if defined(_FRIBIDI_H) || defined(FRIBIDI_H) //FriBidiCharType baseDir = FRIBIDI_TYPE_LTR; - FriBidiCharType baseDir = FRIBIDI_TYPE_WL; /* Per: Shai Ayal , 2009-01-14 */ + //FriBidiCharType baseDir = FRIBIDI_TYPE_WL; /* Per: Shai Ayal , 2009-01-14 */ + FriBidiParType baseDir = FRIBIDI_TYPE_WL; //EP to avoid warning on types in now commented line above FriBidiChar *unicodeIn, *unicodeOut; unsigned int i; @@ -16500,7 +16533,7 @@ static void control_drawtext_timer(Uint32 interval, const char *const text, Uint drawtext_event.type = SDL_USEREVENT; drawtext_event.user.code = USEREVENT_TEXT_UPDATE; drawtext_event.user.data1 = (void *) text; - drawtext_event.user.data2 = (void *) ((int) locale_text); + drawtext_event.user.data2 = (void *) (intptr_t)((int) locale_text); //EP added (intptr_t) to avoid warning on x64 /* Add new timer */ @@ -17623,7 +17656,7 @@ static SDL_Surface * myIMG_Load(char * file) #endif } else { return(myIMG_Load_RWops(file)); - } +} } static SDL_Surface * load_kpx(char * file) @@ -17828,42 +17861,43 @@ static void load_magic_plugins(void) snprintf(funcname, sizeof(funcname), "%s_%s", objname, "switchout"); magic_funcs[num_plugin_files].switchout = - SDL_LoadFunction(magic_handle[num_plugin_files], funcname); + SDL_LoadFunction(magic_handle[num_plugin_files], funcname); #ifdef DEBUG - printf("get_tool_count = 0x%x\n", - (int) magic_funcs[num_plugin_files].get_tool_count); - printf("get_name = 0x%x\n", - (int) magic_funcs[num_plugin_files].get_name); - printf("get_icon = 0x%x\n", - (int) magic_funcs[num_plugin_files].get_icon); - printf("get_description = 0x%x\n", - (int) magic_funcs[num_plugin_files].get_description); - printf("requires_colors = 0x%x\n", - (int) magic_funcs[num_plugin_files].requires_colors); - printf("modes = 0x%x\n", - (int) magic_funcs[num_plugin_files].modes); - printf("set_color = 0x%x\n", - (int) magic_funcs[num_plugin_files].set_color); - printf("init = 0x%x\n", - (int) magic_funcs[num_plugin_files].init); - printf("api_version = 0x%x\n", - (int) magic_funcs[num_plugin_files].api_version); - printf("shutdown = 0x%x\n", - (int) magic_funcs[num_plugin_files].shutdown); - printf("click = 0x%x\n", - (int) magic_funcs[num_plugin_files].click); - printf("drag = 0x%x\n", - (int) magic_funcs[num_plugin_files].drag); - printf("release = 0x%x\n", - (int) magic_funcs[num_plugin_files].release); - printf("switchin = 0x%x\n", - (int) magic_funcs[num_plugin_files].switchin); - printf("switchout = 0x%x\n", - (int) magic_funcs[num_plugin_files].switchout); + //EP added (intptr_t) to avoid warning on x64 on all lines below + printf("get_tool_count = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].get_tool_count); + printf("get_name = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].get_name); + printf("get_icon = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].get_icon); + printf("get_description = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].get_description); + printf("requires_colors = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].requires_colors); + printf("modes = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].modes); + printf("set_color = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].set_color); + printf("init = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].init); + printf("api_version = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].api_version); + printf("shutdown = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].shutdown); + printf("click = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].click); + printf("drag = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].drag); + printf("release = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].release); + printf("switchin = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].switchin); + printf("switchout = 0x%x\n", + (int)(intptr_t) magic_funcs[num_plugin_files].switchout); #endif - err = 0; + err = 0; if (magic_funcs[num_plugin_files].get_tool_count == NULL) { @@ -18567,101 +18601,101 @@ static int do_new_dialog(void) if (skip) { free(d_exts[num_files]); } else { - d_names[num_files] = strdup(fname); - d_places[num_files] = place; - - - /* Try to load thumbnail first: */ - - snprintf(fname, sizeof(fname), "%s/.thumbs/%s-t.png", + d_names[num_files] = strdup(fname); + d_places[num_files] = place; + + + /* Try to load thumbnail first: */ + + snprintf(fname, sizeof(fname), "%s/.thumbs/%s-t.png", + dirname[d_places[num_files]], d_names[num_files]); + debug(fname); + img = IMG_Load(fname); + + if (img == NULL) + { + /* No thumbnail in the new location ("saved/.thumbs"), + try the old location ("saved/"): */ + + snprintf(fname, sizeof(fname), "%s/%s-t.png", dirname[d_places[num_files]], d_names[num_files]); debug(fname); + img = IMG_Load(fname); - - if (img == NULL) + } + + if (img != NULL) + { + /* Loaded the thumbnail from one or the other location */ + show_progress_bar(screen); + + img1 = SDL_DisplayFormat(img); + SDL_FreeSurface(img); + + /* if too big, or too small in both dimensions, rescale it + (for now: using old thumbnail as source for high speed, + low quality) */ + if (img1->w > THUMB_W - 20 || img1->h > THUMB_H - 20 + || (img1->w < THUMB_W - 20 && img1->h < THUMB_H - 20)) { - /* No thumbnail in the new location ("saved/.thumbs"), - try the old location ("saved/"): */ - - snprintf(fname, sizeof(fname), "%s/%s-t.png", - dirname[d_places[num_files]], d_names[num_files]); - debug(fname); - - img = IMG_Load(fname); + img2 = thumbnail(img1, THUMB_W - 20, THUMB_H - 20, 0); + SDL_FreeSurface(img1); + img1 = img2; } - - if (img != NULL) + + thumbs[num_files] = img1; + + if (thumbs[num_files] == NULL) { - /* Loaded the thumbnail from one or the other location */ - show_progress_bar(screen); - - img1 = SDL_DisplayFormat(img); - SDL_FreeSurface(img); - - /* if too big, or too small in both dimensions, rescale it - (for now: using old thumbnail as source for high speed, - low quality) */ - if (img1->w > THUMB_W - 20 || img1->h > THUMB_H - 20 - || (img1->w < THUMB_W - 20 && img1->h < THUMB_H - 20)) - { - img2 = thumbnail(img1, THUMB_W - 20, THUMB_H - 20, 0); - SDL_FreeSurface(img1); - img1 = img2; - } - - thumbs[num_files] = img1; - - if (thumbs[num_files] == NULL) - { - fprintf(stderr, - "\nError: Couldn't create a thumbnail of " - "saved image!\n" "%s\n", fname); - } - - num_files++; + fprintf(stderr, + "\nError: Couldn't create a thumbnail of " + "saved image!\n" "%s\n", fname); } - else + + num_files++; + } + else + { + /* No thumbnail - load original: */ + + /* Make sure we have a ~/.tuxpaint/saved directory: */ + if (make_directory("saved", "Can't create user data directory")) { - /* No thumbnail - load original: */ - - /* Make sure we have a ~/.tuxpaint/saved directory: */ - if (make_directory("saved", "Can't create user data directory")) - { - /* (Make sure we have a .../saved/.thumbs/ directory:) */ - make_directory("saved/.thumbs", "Can't create user data thumbnail directory"); - } - - img = NULL; - - if (d_places[num_files] == PLACE_STARTERS_DIR || - d_places[num_files] == PLACE_PERSONAL_STARTERS_DIR) - { - /* Try to load a starter's background image, first! - If it exists, it should give a better idea of what the - starter looks like, compared to the overlay image... */ - - /* FIXME: Add .jpg support -bjk 2007.03.22 */ - - /* (Try JPEG first) */ + /* (Make sure we have a .../saved/.thumbs/ directory:) */ + make_directory("saved/.thumbs", "Can't create user data thumbnail directory"); + } + + img = NULL; + + if (d_places[num_files] == PLACE_STARTERS_DIR || + d_places[num_files] == PLACE_PERSONAL_STARTERS_DIR) + { + /* Try to load a starter's background image, first! + If it exists, it should give a better idea of what the + starter looks like, compared to the overlay image... */ + + /* FIXME: Add .jpg support -bjk 2007.03.22 */ + + /* (Try JPEG first) */ snprintf(fname, sizeof(fname), "%s/%s-back", - dirname[d_places[num_files]], d_names[num_files]); + dirname[d_places[num_files]], d_names[num_files]); img = load_starter_helper(fname, "jpeg", &IMG_Load); - if (img == NULL) - { + if (img == NULL) + { snprintf(fname, sizeof(fname), "%s/%s-back", dirname[d_places[num_files]], d_names[num_files]); img = load_starter_helper(fname, "jpg", &IMG_Load); - } - - #ifndef NOSVG - if (img == NULL) - { - /* (Try SVG next) */ - snprintf(fname, sizeof(fname), "%s/%s-back", - dirname[d_places[num_files]], d_names[num_files]); - img = load_starter_helper(fname, "svg", &load_svg); - } - #endif + } + +#ifndef NOSVG + if (img == NULL) + { + /* (Try SVG next) */ + snprintf(fname, sizeof(fname), "%s/%s-back", + dirname[d_places[num_files]], d_names[num_files]); + img = load_starter_helper(fname, "svg", &load_svg); + } +#endif if (img == NULL) { @@ -18670,102 +18704,102 @@ static int do_new_dialog(void) dirname[d_places[num_files]], d_names[num_files]); img = load_starter_helper(fname, "png", &IMG_Load); } - } - - if (img == NULL) - { - /* Didn't load a starter background (or didn't try!), - try loading the actual image... */ - - snprintf(fname, sizeof(fname), "%s/%s", - dirname[d_places[num_files]], f->d_name); - debug(fname); - img = myIMG_Load(fname); - } - - + } + + if (img == NULL) + { + /* Didn't load a starter background (or didn't try!), + try loading the actual image... */ + + snprintf(fname, sizeof(fname), "%s/%s", + dirname[d_places[num_files]], f->d_name); + debug(fname); + img = myIMG_Load(fname); + } + + + show_progress_bar(screen); + + if (img == NULL) + { + fprintf(stderr, + "\nWarning: I can't open one of the saved files!\n" + "%s\n" + "The Simple DirectMedia Layer error that " + "occurred was:\n" "%s\n\n", fname, SDL_GetError()); + + free(d_names[num_files]); + free(d_exts[num_files]); + } + else + { + /* Turn it into a thumbnail: */ + + img1 = SDL_DisplayFormatAlpha(img); + img2 = thumbnail2(img1, THUMB_W - 20, THUMB_H - 20, 0, 0); + SDL_FreeSurface(img1); + show_progress_bar(screen); - - if (img == NULL) + + thumbs[num_files] = SDL_DisplayFormat(img2); + SDL_FreeSurface(img2); + if (thumbs[num_files] == NULL) { fprintf(stderr, - "\nWarning: I can't open one of the saved files!\n" - "%s\n" - "The Simple DirectMedia Layer error that " - "occurred was:\n" "%s\n\n", fname, SDL_GetError()); - - free(d_names[num_files]); - free(d_exts[num_files]); + "\nError: Couldn't create a thumbnail of " + "saved image!\n" "%s\n", fname); } - else + + SDL_FreeSurface(img); + + show_progress_bar(screen); + + + /* Let's save this thumbnail, so we don't have to + create it again next time 'Open' is called: */ + /* if (d_places[num_files] == PLACE_SAVED_DIR) */ /* <-- FIXME: This test should probably go...? -bjk 2009.10.15 */ + + if (d_places[num_files] == PLACE_PERSONAL_STARTERS_DIR || /* We must check to not try to write to system wide dirs Pere 2010.3.25 */ + d_places[num_files] == PLACE_PERSONAL_TEMPLATES_DIR) { - /* Turn it into a thumbnail: */ - - img1 = SDL_DisplayFormatAlpha(img); - img2 = thumbnail2(img1, THUMB_W - 20, THUMB_H - 20, 0, 0); - SDL_FreeSurface(img1); - - show_progress_bar(screen); - - thumbs[num_files] = SDL_DisplayFormat(img2); - SDL_FreeSurface(img2); - if (thumbs[num_files] == NULL) + debug("Saving thumbnail for this one!"); + + snprintf(fname, sizeof(fname), "%s/.thumbs/%s-t.png", + dirname[d_places[num_files]], d_names[num_files]); + + if (!make_directory("starters", "Can't create user data directory") || + !make_directory("templates", "Can't create user data directory") || + !make_directory("starters/.thumbs", "Can't create user data directory") || + !make_directory("templates/.thumbs", "Can't create user data directory")) + fprintf(stderr, "Cannot save any pictures! SORRY!\n\n"); + else { - fprintf(stderr, - "\nError: Couldn't create a thumbnail of " - "saved image!\n" "%s\n", fname); - } - - SDL_FreeSurface(img); - - show_progress_bar(screen); - - - /* Let's save this thumbnail, so we don't have to - create it again next time 'Open' is called: */ - /* if (d_places[num_files] == PLACE_SAVED_DIR) */ /* <-- FIXME: This test should probably go...? -bjk 2009.10.15 */ - - if (d_places[num_files] == PLACE_PERSONAL_STARTERS_DIR || /* We must check to not try to write to system wide dirs Pere 2010.3.25 */ - d_places[num_files] == PLACE_PERSONAL_TEMPLATES_DIR) - { - debug("Saving thumbnail for this one!"); - - snprintf(fname, sizeof(fname), "%s/.thumbs/%s-t.png", - dirname[d_places[num_files]], d_names[num_files]); - - if (!make_directory("starters", "Can't create user data directory") || - !make_directory("templates", "Can't create user data directory") || - !make_directory("starters/.thumbs", "Can't create user data directory") || - !make_directory("templates/.thumbs", "Can't create user data directory")) - fprintf(stderr, "Cannot save any pictures! SORRY!\n\n"); + fi = fopen(fname, "wb"); + if (fi == NULL) + { + fprintf(stderr, + "\nError: Couldn't save thumbnail of " + "saved image!\n" + "%s\n" + "The error that occurred was:\n" + "%s\n\n", fname, strerror(errno)); + } else { - fi = fopen(fname, "wb"); - if (fi == NULL) - { - fprintf(stderr, - "\nError: Couldn't save thumbnail of " - "saved image!\n" - "%s\n" - "The error that occurred was:\n" - "%s\n\n", fname, strerror(errno)); - } - else - { - do_png_save(fi, fname, thumbs[num_files], 0); - } + do_png_save(fi, fname, thumbs[num_files], 0); } - - show_progress_bar(screen); } - - - num_files++; + + show_progress_bar(screen); } + + + num_files++; } } } } + } else { /* It was a thumbnail file ("...-t.png") or immutable scene starter's @@ -20983,7 +21017,7 @@ Bytef *get_chunk_data(FILE * fp, char *fname, png_structp png_ptr, int f, count, comp, unc_err; char *control, *softwr; Bytef *comp_buff, *unc_buff; - + z_streamp zstp; control = malloc(50); @@ -21594,7 +21628,15 @@ static void setup_config(char *argv[]) parse_argv_options(&tmpcfg_cmd, argv); - /* Set default options: */ +#if defined(__APPLE__) //EP added this conditional section for Mac to allow for a config in the current directory, that supersedes sys and user configs + /* Mac OS X: Use a "tuxpaint.cfg" file in the current folder */ + struct cfginfo tmpcfg_curdir; + memset(&tmpcfg_curdir, '\0', sizeof tmpcfg_curdir); + parse_file_options(&tmpcfg_curdir, "./tuxpaint.cfg"); + tmpcfg_merge(&tmpcfg_curdir, &tmpcfg_cmd); +#endif + + /* Set default options: */ #ifndef _WIN32 if(!home) @@ -21648,7 +21690,11 @@ static void setup_config(char *argv[]) - tmpcfg_merge(&tmpcfg_usr, &tmpcfg_cmd); +#if defined(__APPLE__) //EP added this conditional section for Mac + tmpcfg_merge(&tmpcfg_usr, &tmpcfg_curdir); +#else + tmpcfg_merge(&tmpcfg_usr, &tmpcfg_cmd); +#endif if (tmpcfg_usr.parsertmp_sysconfig != PARSE_NO) { @@ -21657,6 +21703,10 @@ static void setup_config(char *argv[]) #ifdef _WIN32 // global config file in the application directory parse_file_options(&tmpcfg_sys, "tuxpaint.cfg"); +#elif defined(__APPLE__) //EP added this conditional section for Mac to fix folder&extension inconsistency with Tux Paint Config application) + /* Mac OS X: Use a "tuxpaint.cfg" file in the *global* Tux Paint application support folder */ + snprintf(str, sizeof(str), "%s/tuxpaint.cfg", macosx.globalPreferencesPath); + parse_file_options(&tmpcfg_sys, str); #else // normally /etc/tuxpaint/tuxpaint.conf parse_file_options(&tmpcfg_sys, CONFDIR "tuxpaint.conf"); @@ -21664,8 +21714,8 @@ static void setup_config(char *argv[]) tmpcfg_merge(&tmpcfg, &tmpcfg_sys); } tmpcfg_merge(&tmpcfg, &tmpcfg_usr); - - if(tmpcfg.savedir) + + if(tmpcfg.savedir) { free((char*)savedir); savedir = tmpcfg.savedir; @@ -22029,7 +22079,11 @@ static void setup_config(char *argv[]) static void chdir_to_binary(char *argv0) { -#if defined(__BEOS__) || defined(WIN32) + char curdir[256]; //EP added this block to print out of current directory + getcwd(curdir, sizeof(curdir)); + printf("Binary Path: %s\nCurrent directory at launchtime: %s\n", argv0, curdir); + +#if defined(__BEOS__) || defined(WIN32) || defined(__APPLE__) //EP added __APPLE__ /* if run from gui, like OpenTracker in BeOS or Explorer in Windows, find path from which binary was run and change dir to it so all files will be local :) */ @@ -22044,16 +22098,28 @@ static void chdir_to_binary(char *argv0) char *app_path = strdup(argv0); char *slash = strrchr(app_path, '/'); - if (!slash) +#if defined(__APPLE__) //EP added to fix 10.9 issue of current directory set by Finder to something else than folder where app bundle resides + // typical path of app's binary on Mac OS : /Applications/Tux Paint.app/Contents/MacOS/Tux Paint + int levels = 3; // we need to back up 3 levels + while ((levels-- > 0) && (slash)) + { + *slash = '\0'; // this overwrites the \0 at end of string + slash = strrchr(app_path, '/'); // so we can carry on our back-pedaling... + } +#endif + + if (!slash) { slash = strrchr(app_path, '\\'); } if (slash) { - *(slash + 1) = '\0'; + *(slash + 1) = '\0'; chdir(app_path); } free(app_path); + getcwd(curdir, sizeof(curdir)); + printf("New current directory for runtime: %s\n", curdir); } #else (void)argv0; @@ -23265,12 +23331,15 @@ static void setup(void) #endif /* Call this once */ +//EP now deprecated +/* #if !defined(NOSVG) && !defined(OLD_SVG) #ifdef DEBUG printf("rsvg_init()\n"); fflush(stdout); #endif rsvg_init(); #endif +*/ } @@ -23394,6 +23463,19 @@ int main(int argc, char *argv[]) // do not add code (slowness) here unless required for scanning fonts progname = argv[0]; + +#if defined(DEBUG) && defined(__APPLE__) //EP added block to log messages + freopen("/tmp/tuxpaint.log", "w", stdout); // redirect stdout to a file + dup2(fileno(stdout), fileno(stderr)); // redirect stderr to stdout + setvbuf(stdout, NULL, _IONBF, 0); // we don't want buffering to avoid de-sync'ing stdout and stderr + setvbuf(stderr, NULL, _IONBF, 0); // we don't want buffering to avoid de-sync'ing stdout and stderr + char logTime[100]; + time_t t = time(NULL); + strftime(logTime, sizeof(logTime), "%A %d/%m/%Y %H:%M:%S", localtime(&t)); + printf("Tux Paint log - %s\n", logTime); + +#endif + chdir_to_binary(argv[0]); setup_config(argv); @@ -23490,6 +23572,8 @@ static int trash(char * path) { debug("Can't get basename! Deleting instead."); return(unlink(path)); } + + printf("trash: basename=%s", basename(path)); //EP strcpy(fname, basename(path)); if (!file_exists(path)) {