diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings index 2bef51bf0..9e05fd460 100644 Binary files a/macosx/English.lproj/InfoPlist.strings and b/macosx/English.lproj/InfoPlist.strings differ diff --git a/macosx/Info.plist b/macosx/Info.plist index ac03c0b13..5ebedcf70 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -17,7 +17,7 @@ CFBundleSignature TXPT CFBundleVersion - 2005-11-26 + 2006-10-18 NSMainNibFile SDLMain NSPrincipalClass diff --git a/macosx/Read Me.txt b/macosx/Read Me.txt index 8e5538990..5eb51cf23 100644 --- a/macosx/Read Me.txt +++ b/macosx/Read Me.txt @@ -1,9 +1,9 @@ -Tux Paint Xcode 2.2 Project +Tux Paint Xcode 2.4 Project notes by Martin Fuhrer -This Tux Paint project file is located in a folder titled "macosx", which should in turn be placed in the root folder of the Tux Paint source code distribution. The project will then be able to access all the source code files. +This Tux Paint project file is located in a folder titled "macosx", which should in turn be placed in the root folder of the Tux Paint source code distribution. The project will then be able to access all the source code files. You will require Mac OS X 10.4 and XCode 2.4 or later to build this project. -This XCode project assumes that you have certain libraries and files installed in particular locations under Mac OS X. This file indicates what you must install, and where these items go. Some of the libraries are installed via the Fink package manager, which can be downloaded from +This XCode project has been configured under the assumption that you have certain libraries and files installed in particular locations under Mac OS X. This file indicates what you must install, and where these items go. Some of the libraries are installed via the Fink package manager, which can be downloaded from -- SDL -- @@ -15,29 +15,26 @@ SDL_image.framework SDL_mixer.framework SDL_ttf.framework -These frameworks should ideally be the non-development versions (without the header files), as they will be copied into the Tux Paint bundle. You can obtain the frameworks from the SDL website - -So where does the project reference the SDL header files, if they are not in the frameworks? Via the Fink installation of SDL. So be sure to install all SDL-related packages in Fink. +You can obtain the frameworks from the SDL website These frameworks contain both header files and libraries, and are copied into the Resources directory of the Tux Paint application bundle. -- PNG, Internationalization, and Character Set Conversion Libraries -- -Install PNG (libpng.a), the GNU internationalization (libintl.a), and character set conversion (libiconv.la) via Fink. These libraries will be statically linked into the Tux Paint binary. +Install the PNG (libpng.a), GNU internationalization (libintl.a), and character set conversion (libiconv.dylib) libraries via Fink. By default, Fink will place the libraries in /sw/lib. These libraries will be statically linked into the Tux Paint binary. --- Translation Files -- +-- Universal and Cross Development -- -These are generated by the Makefile in the Tux Paint source distribution as follows: +Tux Paint can be built for PowerPC, Intel, or both (as a universal binary). Since Tux Paint depends on a number of libraries, these libraries must also be built for the same platform(s) for which you wish to build Tux Paint. The latest versions of the SDL frameworks are universal binary and work fine regardless what platform(s) you want to build for. On the other hand, when Fink installs the PNG, internationalization, and character set conversion libraries, they are built only for the platform you are currently using. If you want to build a universal binary of Tux Paint, you will need to manually compile these libraries as universal binaries (see http://developer.apple.com/documentation/Porting/Conceptual/PortingUnix/compiling/chapter_4_section_3.html for further information) and update the library paths (click on a library in Archives and choose File > Get Info). -make translations -make install-gettext +To set the target platform for your build: +1) Choose Project > Edit Active Target 'Tux Paint' +2) Click the Build tab. +3) Set Configuration to "All Configurations" and Collection to "Customized Settings" +4) Select the "Architectures" setting and click the Edit button. +5) Select PowerPC, Intel, or both. -This will generate translation files in /usr/local/share/locale. Move the locale folder into the root folder of the Tux Paint source distribution, and the Tux Paint XCode project will be able to bundle the files into the Tux Paint application. - - --- Cross Development -- - -In order to allow Tux Paint application to run on older versions of Mac OS X, this project compiles and links against an older version of the Mac OS X SDK (eg. Mac OS X 10.2.8) using an older version of gcc (eg. gcc 3.3). Various versions of the Mac OS X SDKs and gcc can be installed from the XCode Installation DVD. Note that any libraries Tux Paint links against (eg. libraries installed by Fink) should also be compiled and linked against the same SDK, using the same version of gcc. +In order to allow the Tux Paint application to run on older versions of Mac OS X, it is necessary to compile and link against an older version of the Mac OS X SDK (eg. Mac OS X 10.2.8) using an older version of gcc (eg. gcc 3.3). Various versions of the Mac OS X SDKs and gcc can be installed from the XCode Installation DVD or disk image. Note that any libraries Tux Paint links against (eg. libraries installed by Fink) should also be compiled and linked against the same SDK, using the same version of gcc. Universal binary and Intel applications must be compiled using gcc 4.0 and the Mac OS X 10.4u SDK. To set the desired Mac OS X SDK: 1) Choose Project > Edit Project Settings @@ -45,7 +42,7 @@ To set the desired Mac OS X SDK: 2) Choose the desired SDK from the "Cross-Develop Using Target SDK" menu. To set the desired compiler version: -1) Choose Project > Edit Active Target +1) Choose Project > Edit Active Target 'Tux Paint' 2) Click on the Rules tab. 3) Set the desired associations between file types (eg. C++ source files) and the compiler version (eg. GCC 3.3). diff --git a/macosx/TuxPaint.xcodeproj/mfuhrer.mode1 b/macosx/TuxPaint.xcodeproj/mfuhrer.mode1 index ad5e7c7b4..5f73e0eab 100644 --- a/macosx/TuxPaint.xcodeproj/mfuhrer.mode1 +++ b/macosx/TuxPaint.xcodeproj/mfuhrer.mode1 @@ -247,7 +247,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 186 + 245 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -259,18 +259,19 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 29B97314FDCFA39411CA2CEA - 29B97323FDCFA39411CA2CEA - 225FE714093AC50C00F0B02F - 1058C7A0FEA54F0111CA2CBB - 1058C7A2FEA54F0111CA2CBB - 19C28FACFE9D520D11CA2CBB 1C37FBAC04509CD000000102 + 225FD39D0AE0643C00466C53 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - + + + 1 + 0 + + PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 687}} + {{0, 0}, {245, 687}} PBXTopSmartGroupGIDs @@ -282,19 +283,19 @@ GeometryConfiguration Frame - {{0, 0}, {203, 705}} + {{0, 0}, {262, 705}} GroupTreeTableConfiguration MainColumn - 186 + 245 RubberWindowFrame - 82 121 1166 746 0 0 1440 878 + 187 115 1166 746 0 0 1440 878 Module PBXSmartGroupTreeModule Proportion - 203pt + 262pt Dock @@ -305,7 +306,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - SDLMain.m + Read Me.txt PBXSplitModuleInNavigatorKey Split0 @@ -313,27 +314,30 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - SDLMain.m + Read Me.txt _historyCapacity 0 bookmark - 225FF3E9093D578600F0B02F + 225FDB380AE0939900466C53 history 224A362E0933ADBB005A3695 224A36320933ADBB005A3695 - 224A36340933ADBB005A3695 224A36EA0933D085005A3695 - 225FD5640938CEA800F0B02F 225FDB07093949D400F0B02F - 225FDB8009397F5400F0B02F - 225FE71E093AC57C00F0B02F 225FEDCE093ADB6000F0B02F - 225FEDCF093ADB6000F0B02F 225FEF72093D527F00F0B02F - 225FF0E5093D552A00F0B02F - 225FF3E7093D578600F0B02F - 225FEF70093D527F00F0B02F + 22966115097A221B007A48C6 + 225FCC8D0ADF26D700466C53 + 225FD09A0ADF309C00466C53 + 225FD09B0ADF309C00466C53 + 225FD0BA0ADF3B8200466C53 + 225FD4C90AE06BB400466C53 + 225FD4CA0AE06BB400466C53 + 225FD4CB0AE06BB400466C53 + 225FDB320AE0939900466C53 + 225FDB330AE0939900466C53 + 225FDB340AE0939900466C53 prevStack @@ -351,7 +355,25 @@ 225FDB0F093949D400F0B02F 225FDB10093949D400F0B02F 225FDB12093949D400F0B02F - 225FF3E8093D578600F0B02F + 225FCC8E0ADF26D700466C53 + 225FD09F0ADF309C00466C53 + 225FD0A00ADF309C00466C53 + 225FD0A10ADF309C00466C53 + 225FD0A20ADF309C00466C53 + 225FD0A30ADF309C00466C53 + 225FD0AD0ADF375900466C53 + 225FD0BC0ADF3B8200466C53 + 225FD0BD0ADF3B8200466C53 + 225FD0BE0ADF3B8200466C53 + 225FD3A00AE0643C00466C53 + 225FD3A10AE0643C00466C53 + 225FD4CC0AE06BB400466C53 + 225FD4CD0AE06BB400466C53 + 225FD4CE0AE06BB400466C53 + 225FD4CF0AE06BB400466C53 + 225FDB350AE0939900466C53 + 225FDB360AE0939900466C53 + 225FDB370AE0939900466C53 SplitCount @@ -363,9 +385,9 @@ GeometryConfiguration Frame - {{0, 0}, {958, 522}} + {{0, 0}, {899, 522}} RubberWindowFrame - 82 121 1166 746 0 0 1440 878 + 187 115 1166 746 0 0 1440 878 Module PBXNavigatorGroup @@ -383,9 +405,9 @@ GeometryConfiguration Frame - {{0, 527}, {958, 178}} + {{0, 527}, {899, 178}} RubberWindowFrame - 82 121 1166 746 0 0 1440 878 + 187 115 1166 746 0 0 1440 878 Module XCDetailModule @@ -394,7 +416,7 @@ Proportion - 958pt + 899pt Name @@ -409,9 +431,9 @@ TableOfContents - 225FF3DE093D56BF00F0B02F + 225FCC900ADF26D700466C53 1CE0B1FE06471DED0097A5F4 - 225FF3DF093D56BF00F0B02F + 225FCC910ADF26D700466C53 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -545,12 +567,13 @@ 5 WindowOrderList - 224A360409339C40005A3695 + 1C530D57069F1CE1000CFCEE 1C0AD2B3069F1EA900FABCE6 + 224A360409339C40005A3695 /Users/mfuhrer/Projects/TuxPaint/tuxpaint-cvs/tuxpaint/macosx/TuxPaint.xcodeproj WindowString - 82 121 1166 746 0 0 1440 878 + 187 115 1166 746 0 0 1440 878 WindowTools @@ -571,27 +594,29 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + tuxpaint.c StatusBarVisibility GeometryConfiguration Frame - {{0, 0}, {884, 271}} + {{0, 0}, {884, 394}} RubberWindowFrame - 478 121 884 647 0 0 1440 878 + 405 83 884 647 0 0 1440 878 Module PBXNavigatorGroup Proportion - 271pt + 394pt + BecomeActive + ContentConfiguration PBXBuildLogShowsTranscriptDefaultKey - {{0, 5}, {884, 325}} + {{0, 92}, {884, 115}} PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel @@ -604,14 +629,14 @@ GeometryConfiguration Frame - {{0, 276}, {884, 330}} + {{0, 399}, {884, 207}} RubberWindowFrame - 478 121 884 647 0 0 1440 878 + 405 83 884 647 0 0 1440 878 Module PBXBuildResultsModule Proportion - 330pt + 207pt Proportion @@ -629,18 +654,18 @@ TableOfContents 224A360409339C40005A3695 - 225FF3E0093D56BF00F0B02F + 225FD0AF0ADF375900466C53 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID ToolbarConfiguration xcode.toolbar.config.build WindowString - 478 121 884 647 0 0 1440 878 + 405 83 884 647 0 0 1440 878 WindowToolGUID 224A360409339C40005A3695 WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -754,8 +779,12 @@ + FirstTimeWindowDisplayed + Identifier windowTool.find + IsVertical + Layout @@ -765,44 +794,34 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1CD0528D0623707200166675 - - SplitCount - 1 - + macosx_print.h StatusBarVisibility - 1 + GeometryConfiguration Frame - {{0, 0}, {781, 167}} + {{0, 0}, {804, 444}} RubberWindowFrame - 62 385 781 470 0 0 1440 878 + 238 139 804 702 0 0 1440 878 Module PBXNavigatorGroup Proportion - 781pt + 804pt Proportion - 50% + 444pt - BecomeActive - 1 ContentConfiguration PBXProjectModuleGUID @@ -813,18 +832,18 @@ GeometryConfiguration Frame - {{8, 0}, {773, 254}} + {{0, 449}, {804, 212}} RubberWindowFrame - 62 385 781 470 0 0 1440 878 + 238 139 804 702 0 0 1440 878 Module PBXProjectFindModule Proportion - 50% + 212pt Proportion - 428pt + 661pt Name @@ -834,23 +853,21 @@ PBXProjectFindModule StatusbarIsVisible - 1 + TableOfContents 1C530D57069F1CE1000CFCEE - 1C530D58069F1CE1000CFCEE - 1C530D59069F1CE1000CFCEE + 225FD4C00AE06BA200466C53 + 225FD4C10AE06BA200466C53 1CDD528C0622207200134675 - 1C530D5A069F1CE1000CFCEE - 1CE0B1FE06471DED0097A5F4 1CD0528E0623707200166675 WindowString - 62 385 781 470 0 0 1440 878 + 238 139 804 702 0 0 1440 878 WindowToolGUID 1C530D57069F1CE1000CFCEE WindowToolIsVisible - 0 + Identifier @@ -949,8 +966,8 @@ yes sizes - {{0, 0}, {367, 168}} - {{0, 173}, {367, 270}} + {{0, 0}, {491, 168}} + {{0, 173}, {491, 270}} VerticalSplitView @@ -999,9 +1016,9 @@ TableOfContents 1C0AD2B3069F1EA900FABCE6 - 225FF3E1093D56BF00F0B02F + 225FCC920ADF26D700466C53 1CD0528B0623707200166675 - 225FF3E2093D56BF00F0B02F + 225FCC930ADF26D700466C53 ToolbarConfiguration xcode.toolbar.config.run diff --git a/macosx/TuxPaint.xcodeproj/mfuhrer.pbxuser b/macosx/TuxPaint.xcodeproj/mfuhrer.pbxuser index cc2a97f2e..899f538f7 100644 --- a/macosx/TuxPaint.xcodeproj/mfuhrer.pbxuser +++ b/macosx/TuxPaint.xcodeproj/mfuhrer.pbxuser @@ -2,9 +2,9 @@ { 089C165DFE840E0CC02AAC07 /* English */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {917, 490}}"; - sepNavSelRange = "{302, 0}"; - sepNavVisRect = "{{0, 0}, {917, 490}}"; + sepNavIntBoundsRect = "{{0, 0}, {858, 490}}"; + sepNavSelRange = "{226, 0}"; + sepNavVisRect = "{{0, 0}, {858, 490}}"; }; }; 2202663B07AC657400C3AEAB /* macosx_speech.h */ = { @@ -20,7 +20,7 @@ fRef = 22581666074EE1A5005F774F /* Read Me.txt */; name = ""; rLen = 1; - rLoc = 704; + rLoc = 815; rType = 0; vrLen = 681; vrLoc = 305; @@ -45,16 +45,6 @@ vrLen = 414; vrLoc = 205; }; - 224A36340933ADBB005A3695 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 22C0EAAB0735B851008555A2 /* macosx_print.h */; - name = "const char* SurfacePrint (SDL_Surface *surface, int showDialog);"; - rLen = 64; - rLoc = 176; - rType = 0; - vrLen = 243; - vrLoc = 0; - }; 224A36370933ADBB005A3695 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 22C0EAAB0735B851008555A2 /* macosx_print.h */; @@ -109,38 +99,40 @@ isa = XCBreakpointsBucket; name = "Project Breakpoints"; objects = ( - 224A36C90933C1F8005A3695 /* tuxpaint.c:3329 */, - 224A36CB0933C1FA005A3695 /* tuxpaint.c:14837 */, - 225709F709341F94000DF954 /* tuxpaint.c:2468 */, + 224A36C90933C1F8005A3695 /* tuxpaint.c:3327 */, + 224A36CB0933C1FA005A3695 /* tuxpaint.c:14835 */, + 225709F709341F94000DF954 /* tuxpaint.c:2466 */, ); }; 224A36B70933B843005A3695 /* PBXBookmark */ = { isa = PBXBookmark; fRef = 22C005D30736650D008555A2 /* tuxpaint.icns */; }; - 224A36C90933C1F8005A3695 /* tuxpaint.c:3329 */ = { + 224A36C90933C1F8005A3695 /* tuxpaint.c:3327 */ = { isa = PBXFileBreakpoint; actions = ( ); + breakpointStyle = 0; continueAfterActions = 0; delayBeforeContinue = 0; fileReference = 22C0EAB30735B851008555A2 /* tuxpaint.c */; functionName = "mainloop()"; hitCount = 1; - lineNumber = 3329; - modificationTime = 154465916.751423; + lineNumber = 3327; + modificationTime = 182401844.172263; state = 1; }; - 224A36CB0933C1FA005A3695 /* tuxpaint.c:14837 */ = { + 224A36CB0933C1FA005A3695 /* tuxpaint.c:14835 */ = { isa = PBXFileBreakpoint; actions = ( ); + breakpointStyle = 0; continueAfterActions = 0; delayBeforeContinue = 0; fileReference = 22C0EAB30735B851008555A2 /* tuxpaint.c */; functionName = "do_print()"; hitCount = 1; - lineNumber = 14837; + lineNumber = 14835; modificationTime = 154465888.83422; state = 1; }; @@ -178,16 +170,17 @@ path = /usr/include/ppc/_types.h; sourceTree = ""; }; - 225709F709341F94000DF954 /* tuxpaint.c:2468 */ = { + 225709F709341F94000DF954 /* tuxpaint.c:2466 */ = { isa = PBXFileBreakpoint; actions = ( ); + breakpointStyle = 0; continueAfterActions = 0; delayBeforeContinue = 0; fileReference = 22C0EAB30735B851008555A2 /* tuxpaint.c */; functionName = "eat_sdl_events()"; hitCount = 1; - lineNumber = 2468; + lineNumber = 2466; modificationTime = 154465888.834229; state = 1; }; @@ -196,21 +189,21 @@ fRef = 22C0EAB30735B851008555A2 /* tuxpaint.c */; name = "tuxpaint.c: 3336"; rLen = 0; - rLoc = 87771; + rLoc = 87727; rType = 0; vrLen = 972; vrLoc = 87058; }; 22581666074EE1A5005F774F /* Read Me.txt */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {2954, 728}}"; - sepNavSelRange = "{1356, 0}"; - sepNavVisRect = "{{0, 224}, {917, 490}}"; + sepNavIntBoundsRect = "{{0, 0}, {858, 910}}"; + sepNavSelRange = "{968, 0}"; + sepNavVisRect = "{{0, 42}, {858, 505}}"; }; }; - 225FD5640938CEA800F0B02F /* PBXTextBookmark */ = { + 225FCC8D0ADF26D700466C53 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 224A387B0933EE9D005A3695 /* _types.h */; + fRef = 229664BC097AFA00007A48C6 /* _types.h */; name = "} __mbstate_t;"; rLen = 15; rLoc = 2859; @@ -218,6 +211,247 @@ vrLen = 1191; vrLoc = 2186; }; + 225FCC8E0ADF26D700466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 229664BC097AFA00007A48C6 /* _types.h */; + name = "} __mbstate_t;"; + rLen = 15; + rLoc = 2859; + rType = 0; + vrLen = 1191; + vrLoc = 2186; + }; + 225FCE180ADF277300466C53 /* fonts.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {843, 16436}}"; + sepNavSelRange = "{492, 0}"; + sepNavVisRect = "{{0, 168}, {843, 362}}"; + }; + }; + 225FCE1F0ADF277300466C53 /* progressbar.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {858, 1022}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 444}, {858, 490}}"; + }; + }; + 225FCE210ADF277300466C53 /* rgblinear.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {858, 644}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 0}, {858, 490}}"; + }; + }; + 225FD09A0ADF309C00466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C0EA9A0735B76F008555A2 /* SDLMain.h */; + name = "SDLMain.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 488; + vrLoc = 0; + }; + 225FD09B0ADF309C00466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 089C165DFE840E0CC02AAC07 /* English */; + name = "English: 6"; + rLen = 0; + rLoc = 226; + rType = 0; + vrLen = 304; + vrLoc = 0; + }; + 225FD09F0ADF309C00466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C0EA9A0735B76F008555A2 /* SDLMain.h */; + name = "SDLMain.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 488; + vrLoc = 0; + }; + 225FD0A00ADF309C00466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + name = "Info.plist: 20"; + rLen = 0; + rLoc = 662; + rType = 0; + vrLen = 802; + vrLoc = 0; + }; + 225FD0A10ADF309C00466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 089C165DFE840E0CC02AAC07 /* English */; + name = "English: 6"; + rLen = 0; + rLoc = 226; + rType = 0; + vrLen = 304; + vrLoc = 0; + }; + 225FD0A20ADF309C00466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + name = "Info.plist: 17"; + rLen = 0; + rLoc = 575; + rType = 0; + vrLen = 802; + vrLoc = 0; + }; + 225FD0A30ADF309C00466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22581666074EE1A5005F774F /* Read Me.txt */; + name = "Read Me.txt: 25"; + rLen = 0; + rLoc = 1294; + rType = 0; + vrLen = 1590; + vrLoc = 1175; + }; + 225FD0AD0ADF375900466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C0EAB30735B851008555A2 /* tuxpaint.c */; + name = "tuxpaint.c: 281"; + rLen = 0; + rLoc = 7506; + rType = 0; + vrLen = 640; + vrLoc = 7171; + }; + 225FD0BA0ADF3B8200466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 225FCE180ADF277300466C53 /* fonts.c */; + name = "fonts.c: 471"; + rLen = 0; + rLoc = 9480; + rType = 0; + vrLen = 1152; + vrLoc = 9269; + }; + 225FD0BC0ADF3B8200466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22581666074EE1A5005F774F /* Read Me.txt */; + name = "Read Me.txt: 32"; + rLen = 0; + rLoc = 2654; + rType = 0; + vrLen = 1868; + vrLoc = 1241; + }; + 225FD0BD0ADF3B8200466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 225FCE180ADF277300466C53 /* fonts.c */; + name = "fonts.c: 471"; + rLen = 0; + rLoc = 9480; + rType = 0; + vrLen = 1152; + vrLoc = 9269; + }; + 225FD0BE0ADF3B8200466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + name = "Info.plist: 17"; + rLen = 0; + rLoc = 575; + rType = 0; + vrLen = 802; + vrLoc = 0; + }; + 225FD3A00AE0643C00466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C0EAB30735B851008555A2 /* tuxpaint.c */; + name = "tuxpaint.c: 3329"; + rLen = 0; + rLoc = 83229; + rType = 0; + vrLen = 840; + vrLoc = 82494; + }; + 225FD3A10AE0643C00466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22581666074EE1A5005F774F /* Read Me.txt */; + name = "Read Me.txt: 28"; + rLen = 0; + rLoc = 2350; + rType = 0; + vrLen = 2499; + vrLoc = 889; + }; + 225FD4C90AE06BB400466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 225FCE1F0ADF277300466C53 /* progressbar.c */; + name = "progressbar.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 725; + vrLoc = 1037; + }; + 225FD4CA0AE06BB400466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 225FCE210ADF277300466C53 /* rgblinear.c */; + name = "rgblinear.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1131; + vrLoc = 0; + }; + 225FD4CB0AE06BB400466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C0EAB30735B851008555A2 /* tuxpaint.c */; + name = "tuxpaint.c: 280"; + rLen = 0; + rLoc = 7506; + rType = 0; + vrLen = 619; + vrLoc = 7111; + }; + 225FD4CC0AE06BB400466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C0EAB30735B851008555A2 /* tuxpaint.c */; + name = "tuxpaint.c: 65"; + rLen = 0; + rLoc = 2145; + rType = 0; + vrLen = 911; + vrLoc = 1839; + }; + 225FD4CD0AE06BB400466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 225FCE1F0ADF277300466C53 /* progressbar.c */; + name = "progressbar.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 725; + vrLoc = 1037; + }; + 225FD4CE0AE06BB400466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 225FCE210ADF277300466C53 /* rgblinear.c */; + name = "rgblinear.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1131; + vrLoc = 0; + }; + 225FD4CF0AE06BB400466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C0EAB30735B851008555A2 /* tuxpaint.c */; + name = "tuxpaint.c: 280"; + rLen = 0; + rLoc = 7506; + rType = 0; + vrLen = 619; + vrLoc = 7111; + }; 225FD5690938CEA800F0B02F /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 224A387B0933EE9D005A3695 /* _types.h */; @@ -278,26 +512,76 @@ vrLen = 431; vrLoc = 0; }; - 225FDB8009397F5400F0B02F /* PBXTextBookmark */ = { + 225FDB320AE0939900466C53 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 089C165DFE840E0CC02AAC07 /* English */; - name = "English: 6"; + fRef = 22C0EAAB0735B851008555A2 /* macosx_print.h */; + name = "macosx_print.h: 10"; rLen = 0; - rLoc = 302; + rLoc = 317; rType = 0; - vrLen = 304; + vrLen = 1055; vrLoc = 0; }; - 225FE71E093AC57C00F0B02F /* PBXTextBookmark */ = { + 225FDB330AE0939900466C53 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8D1107310486CEB800E47090 /* Info.plist */; - name = "Info.plist: 27"; + name = "Info.plist: 17"; rLen = 0; - rLoc = 802; + rLoc = 575; rType = 0; vrLen = 802; vrLoc = 0; }; + 225FDB340AE0939900466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22581666074EE1A5005F774F /* Read Me.txt */; + name = "Read Me.txt: 18"; + rLen = 0; + rLoc = 968; + rType = 0; + vrLen = 2270; + vrLoc = 81; + }; + 225FDB350AE0939900466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22C0EAAB0735B851008555A2 /* macosx_print.h */; + name = "macosx_print.h: 10"; + rLen = 0; + rLoc = 317; + rType = 0; + vrLen = 1055; + vrLoc = 0; + }; + 225FDB360AE0939900466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22581666074EE1A5005F774F /* Read Me.txt */; + name = "Read Me.txt: 18"; + rLen = 0; + rLoc = 968; + rType = 0; + vrLen = 2270; + vrLoc = 81; + }; + 225FDB370AE0939900466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + name = "Info.plist: 17"; + rLen = 0; + rLoc = 575; + rType = 0; + vrLen = 802; + vrLoc = 0; + }; + 225FDB380AE0939900466C53 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22581666074EE1A5005F774F /* Read Me.txt */; + name = "Read Me.txt: 18"; + rLen = 0; + rLoc = 968; + rType = 0; + vrLen = 2270; + vrLoc = 81; + }; 225FEDCE093ADB6000F0B02F /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 22C0EA9C0735B76F008555A2 /* wrapperdata.h */; @@ -308,69 +592,31 @@ vrLen = 665; vrLoc = 0; }; - 225FEDCF093ADB6000F0B02F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 22C0EA9A0735B76F008555A2 /* SDLMain.h */; - name = "SDLMain.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 431; - vrLoc = 0; - }; - 225FEF70093D527F00F0B02F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 22C0EA9B0735B76F008555A2 /* SDLMain.m */; - name = "SDLMain.m: 252"; - rLen = 0; - rLoc = 6949; - rType = 0; - vrLen = 1070; - vrLoc = 6482; - }; 225FEF72093D527F00F0B02F /* PBXBookmark */ = { isa = PBXBookmark; fRef = 22C005D30736650D008555A2 /* tuxpaint.icns */; }; - 225FF0E5093D552A00F0B02F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 22C0EAB30735B851008555A2 /* tuxpaint.c */; - name = "tuxpaint.c: 2549"; - rLen = 56; - rLoc = 68790; - rType = 0; - vrLen = 972; - vrLoc = 69574; - }; - 225FF3E7093D578600F0B02F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 22581666074EE1A5005F774F /* Read Me.txt */; - name = "Read Me.txt: 25"; - rLen = 0; - rLoc = 1356; - rType = 0; - vrLen = 1975; - vrLoc = 777; - }; - 225FF3E8093D578600F0B02F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 22581666074EE1A5005F774F /* Read Me.txt */; - name = "Read Me.txt: 25"; - rLen = 0; - rLoc = 1356; - rType = 0; - vrLen = 1975; - vrLoc = 777; - }; - 225FF3E9093D578600F0B02F /* PBXTextBookmark */ = { + 22966115097A221B007A48C6 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 22C0EA9B0735B76F008555A2 /* SDLMain.m */; name = "SDLMain.m: 256"; rLen = 0; rLoc = 7061; rType = 0; - vrLen = 1091; - vrLoc = 7263; + vrLen = 889; + vrLoc = 1198; + }; + 229664BC097AFA00007A48C6 /* _types.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = _types.h; + path = /usr/include/ppc/_types.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {858, 1610}}"; + sepNavSelRange = "{2859, 15}"; + sepNavVisRect = "{{0, 770}, {858, 490}}"; + }; }; 22AB8EB5076FDF270009BF7C /* Tux Paint */ = { isa = PBXExecutable; @@ -403,6 +649,8 @@ fallbackIsa = XCSourceControlManager; isSCMEnabled = 0; scmConfiguration = { + CVSToolPath = /usr/bin/ocvs; + CVSUseSSH = NO; }; scmType = ""; }; @@ -412,16 +660,16 @@ }; 22C0EA9A0735B76F008555A2 /* SDLMain.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {917, 490}}"; + sepNavIntBoundsRect = "{{0, 0}, {858, 490}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {917, 490}}"; + sepNavVisRect = "{{0, 0}, {858, 490}}"; }; }; 22C0EA9B0735B76F008555A2 /* SDLMain.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {917, 5712}}"; - sepNavSelRange = "{7061, 0}"; - sepNavVisRect = "{{0, 3644}, {917, 490}}"; + sepNavIntBoundsRect = "{{0, 0}, {860, 5712}}"; + sepNavSelRange = "{3306, 77}"; + sepNavVisRect = "{{0, 1442}, {843, 362}}"; }; }; 22C0EA9C0735B76F008555A2 /* wrapperdata.h */ = { @@ -448,9 +696,9 @@ }; 22C0EAAB0735B851008555A2 /* macosx_print.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {696, 442}}"; - sepNavSelRange = "{176, 64}"; - sepNavVisRect = "{{0, 0}, {696, 442}}"; + sepNavIntBoundsRect = "{{0, 0}, {858, 490}}"; + sepNavSelRange = "{317, 0}"; + sepNavVisRect = "{{0, 0}, {858, 490}}"; }; }; 22C0EAAC0735B851008555A2 /* macosx_print.m */ = { @@ -504,23 +752,22 @@ }; 22C0EAB30735B851008555A2 /* tuxpaint.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1214, 226310}}"; - sepNavSelRange = "{68790, 56}"; - sepNavVisRect = "{{0, 36400}, {917, 490}}"; + sepNavIntBoundsRect = "{{0, 0}, {1118, 216342}}"; + sepNavSelRange = "{337136, 13}"; + sepNavVisRect = "{{0, 200914}, {843, 362}}"; + sepNavWindowFrame = "{{181, 36}, {1091, 824}}"; }; }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeBuildConfigurationName = Deployment; - activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA /* Development */; activeExecutable = 22AB8EB5076FDF270009BF7C /* Tux Paint */; activeTarget = 8D1107260486CEB800E47090 /* Tux Paint */; addToTargets = ( 8D1107260486CEB800E47090 /* Tux Paint */, ); breakpoints = ( - 224A36C90933C1F8005A3695 /* tuxpaint.c:3329 */, - 224A36CB0933C1FA005A3695 /* tuxpaint.c:14837 */, - 225709F709341F94000DF954 /* tuxpaint.c:2468 */, + 224A36CB0933C1FA005A3695 /* tuxpaint.c:14835 */, + 225709F709341F94000DF954 /* tuxpaint.c:2466 */, ); breakpointsGroup = 224A365B0933AE0D005A3695 /* XCBreakpointsBucket */; codeSenseManager = 22C0E7650735B6C5008555A2 /* Code sense */; @@ -569,8 +816,8 @@ PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID; PBXFileTableDataSourceColumnWidthsKey = ( 22, - 537.7974, - 280.5835, + 537, + 310.5835, ); PBXFileTableDataSourceColumnsKey = ( PBXExecutablesDataSource_ActiveFlagID, @@ -583,7 +830,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 671, + 612, 20, 96, 43, @@ -658,7 +905,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 20, 450, - 141, + 180, 20, 98, 43, @@ -674,7 +921,7 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 155014820; + PBXPerProjectTemplateStateSaveDate = 182396578; PBXPrepackagedSmartGroups_v2 = ( { PBXTransientLocationAtTop = bottom; @@ -851,13 +1098,12 @@ }; }, ); - PBXWorkspaceStateSaveDate = 155014820; + PBXWorkspaceStateSaveDate = 182396578; }; perUserProjectItems = { 224A360209339C40005A3695 /* PBXTextBookmark */ = 224A360209339C40005A3695 /* PBXTextBookmark */; 224A362E0933ADBB005A3695 /* PBXTextBookmark */ = 224A362E0933ADBB005A3695 /* PBXTextBookmark */; 224A36320933ADBB005A3695 /* PBXTextBookmark */ = 224A36320933ADBB005A3695 /* PBXTextBookmark */; - 224A36340933ADBB005A3695 /* PBXTextBookmark */ = 224A36340933ADBB005A3695 /* PBXTextBookmark */; 224A36370933ADBB005A3695 /* PBXTextBookmark */ = 224A36370933ADBB005A3695 /* PBXTextBookmark */; 224A36380933ADBB005A3695 /* PBXTextBookmark */ = 224A36380933ADBB005A3695 /* PBXTextBookmark */; 224A363A0933ADBB005A3695 /* PBXTextBookmark */ = 224A363A0933ADBB005A3695 /* PBXTextBookmark */; @@ -867,23 +1113,45 @@ 224A36EA0933D085005A3695 /* PBXTextBookmark */ = 224A36EA0933D085005A3695 /* PBXTextBookmark */; 224A36EB0933D085005A3695 /* PBXTextBookmark */ = 224A36EB0933D085005A3695 /* PBXTextBookmark */; 22570A0509342E22000DF954 /* PBXTextBookmark */ = 22570A0509342E22000DF954 /* PBXTextBookmark */; - 225FD5640938CEA800F0B02F /* PBXTextBookmark */ = 225FD5640938CEA800F0B02F /* PBXTextBookmark */; + 225FCC8D0ADF26D700466C53 /* PBXTextBookmark */ = 225FCC8D0ADF26D700466C53 /* PBXTextBookmark */; + 225FCC8E0ADF26D700466C53 /* PBXTextBookmark */ = 225FCC8E0ADF26D700466C53 /* PBXTextBookmark */; + 225FD09A0ADF309C00466C53 /* PBXTextBookmark */ = 225FD09A0ADF309C00466C53 /* PBXTextBookmark */; + 225FD09B0ADF309C00466C53 /* PBXTextBookmark */ = 225FD09B0ADF309C00466C53 /* PBXTextBookmark */; + 225FD09F0ADF309C00466C53 /* PBXTextBookmark */ = 225FD09F0ADF309C00466C53 /* PBXTextBookmark */; + 225FD0A00ADF309C00466C53 /* PBXTextBookmark */ = 225FD0A00ADF309C00466C53 /* PBXTextBookmark */; + 225FD0A10ADF309C00466C53 /* PBXTextBookmark */ = 225FD0A10ADF309C00466C53 /* PBXTextBookmark */; + 225FD0A20ADF309C00466C53 /* PBXTextBookmark */ = 225FD0A20ADF309C00466C53 /* PBXTextBookmark */; + 225FD0A30ADF309C00466C53 /* PBXTextBookmark */ = 225FD0A30ADF309C00466C53 /* PBXTextBookmark */; + 225FD0AD0ADF375900466C53 /* PBXTextBookmark */ = 225FD0AD0ADF375900466C53 /* PBXTextBookmark */; + 225FD0BA0ADF3B8200466C53 /* PBXTextBookmark */ = 225FD0BA0ADF3B8200466C53 /* PBXTextBookmark */; + 225FD0BC0ADF3B8200466C53 /* PBXTextBookmark */ = 225FD0BC0ADF3B8200466C53 /* PBXTextBookmark */; + 225FD0BD0ADF3B8200466C53 /* PBXTextBookmark */ = 225FD0BD0ADF3B8200466C53 /* PBXTextBookmark */; + 225FD0BE0ADF3B8200466C53 /* PBXTextBookmark */ = 225FD0BE0ADF3B8200466C53 /* PBXTextBookmark */; + 225FD3A00AE0643C00466C53 /* PBXTextBookmark */ = 225FD3A00AE0643C00466C53 /* PBXTextBookmark */; + 225FD3A10AE0643C00466C53 /* PBXTextBookmark */ = 225FD3A10AE0643C00466C53 /* PBXTextBookmark */; + 225FD4C90AE06BB400466C53 /* PBXTextBookmark */ = 225FD4C90AE06BB400466C53 /* PBXTextBookmark */; + 225FD4CA0AE06BB400466C53 /* PBXTextBookmark */ = 225FD4CA0AE06BB400466C53 /* PBXTextBookmark */; + 225FD4CB0AE06BB400466C53 /* PBXTextBookmark */ = 225FD4CB0AE06BB400466C53 /* PBXTextBookmark */; + 225FD4CC0AE06BB400466C53 /* PBXTextBookmark */ = 225FD4CC0AE06BB400466C53 /* PBXTextBookmark */; + 225FD4CD0AE06BB400466C53 /* PBXTextBookmark */ = 225FD4CD0AE06BB400466C53 /* PBXTextBookmark */; + 225FD4CE0AE06BB400466C53 /* PBXTextBookmark */ = 225FD4CE0AE06BB400466C53 /* PBXTextBookmark */; + 225FD4CF0AE06BB400466C53 /* PBXTextBookmark */ = 225FD4CF0AE06BB400466C53 /* PBXTextBookmark */; 225FD5690938CEA800F0B02F /* PBXTextBookmark */ = 225FD5690938CEA800F0B02F /* PBXTextBookmark */; 225FDB07093949D400F0B02F /* PBXTextBookmark */ = 225FDB07093949D400F0B02F /* PBXTextBookmark */; 225FDB0D093949D400F0B02F /* PBXTextBookmark */ = 225FDB0D093949D400F0B02F /* PBXTextBookmark */; 225FDB0F093949D400F0B02F /* PBXTextBookmark */ = 225FDB0F093949D400F0B02F /* PBXTextBookmark */; 225FDB10093949D400F0B02F /* PBXTextBookmark */ = 225FDB10093949D400F0B02F /* PBXTextBookmark */; 225FDB12093949D400F0B02F /* PBXTextBookmark */ = 225FDB12093949D400F0B02F /* PBXTextBookmark */; - 225FDB8009397F5400F0B02F /* PBXTextBookmark */ = 225FDB8009397F5400F0B02F /* PBXTextBookmark */; - 225FE71E093AC57C00F0B02F /* PBXTextBookmark */ = 225FE71E093AC57C00F0B02F /* PBXTextBookmark */; + 225FDB320AE0939900466C53 /* PBXTextBookmark */ = 225FDB320AE0939900466C53 /* PBXTextBookmark */; + 225FDB330AE0939900466C53 /* PBXTextBookmark */ = 225FDB330AE0939900466C53 /* PBXTextBookmark */; + 225FDB340AE0939900466C53 /* PBXTextBookmark */ = 225FDB340AE0939900466C53 /* PBXTextBookmark */; + 225FDB350AE0939900466C53 /* PBXTextBookmark */ = 225FDB350AE0939900466C53 /* PBXTextBookmark */; + 225FDB360AE0939900466C53 /* PBXTextBookmark */ = 225FDB360AE0939900466C53 /* PBXTextBookmark */; + 225FDB370AE0939900466C53 /* PBXTextBookmark */ = 225FDB370AE0939900466C53 /* PBXTextBookmark */; + 225FDB380AE0939900466C53 /* PBXTextBookmark */ = 225FDB380AE0939900466C53 /* PBXTextBookmark */; 225FEDCE093ADB6000F0B02F /* PBXTextBookmark */ = 225FEDCE093ADB6000F0B02F /* PBXTextBookmark */; - 225FEDCF093ADB6000F0B02F /* PBXTextBookmark */ = 225FEDCF093ADB6000F0B02F /* PBXTextBookmark */; - 225FEF70093D527F00F0B02F /* PBXTextBookmark */ = 225FEF70093D527F00F0B02F /* PBXTextBookmark */; 225FEF72093D527F00F0B02F /* PBXBookmark */ = 225FEF72093D527F00F0B02F /* PBXBookmark */; - 225FF0E5093D552A00F0B02F /* PBXTextBookmark */ = 225FF0E5093D552A00F0B02F /* PBXTextBookmark */; - 225FF3E7093D578600F0B02F /* PBXTextBookmark */ = 225FF3E7093D578600F0B02F /* PBXTextBookmark */; - 225FF3E8093D578600F0B02F /* PBXTextBookmark */ = 225FF3E8093D578600F0B02F /* PBXTextBookmark */; - 225FF3E9093D578600F0B02F /* PBXTextBookmark */ = 225FF3E9093D578600F0B02F /* PBXTextBookmark */; + 22966115097A221B007A48C6 /* PBXTextBookmark */ = 22966115097A221B007A48C6 /* PBXTextBookmark */; }; sourceControlManager = 22C0E7640735B6C5008555A2 /* Source Control */; userBuildSettings = { @@ -897,9 +1165,9 @@ }; 8D1107310486CEB800E47090 /* Info.plist */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {917, 490}}"; - sepNavSelRange = "{802, 0}"; - sepNavVisRect = "{{0, 0}, {917, 490}}"; + sepNavIntBoundsRect = "{{0, 0}, {858, 490}}"; + sepNavSelRange = "{575, 0}"; + sepNavVisRect = "{{0, 0}, {858, 490}}"; }; }; } diff --git a/macosx/TuxPaint.xcodeproj/project.pbxproj b/macosx/TuxPaint.xcodeproj/project.pbxproj index 16b0ef646..62739fc91 100644 --- a/macosx/TuxPaint.xcodeproj/project.pbxproj +++ b/macosx/TuxPaint.xcodeproj/project.pbxproj @@ -11,6 +11,28 @@ 2202646707AC603500C3AEAB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2202646607AC603500C3AEAB /* CoreFoundation.framework */; }; 224A369B0933B741005A3695 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 224A368C0933B741005A3695 /* fonts */; }; 22581667074EE1A5005F774F /* Read Me.txt in Resources */ = {isa = PBXBuildFile; fileRef = 22581666074EE1A5005F774F /* Read Me.txt */; }; + 225FCE260ADF277300466C53 /* compiler.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE100ADF277300466C53 /* compiler.h */; }; + 225FCE270ADF277300466C53 /* cursor.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE110ADF277300466C53 /* cursor.c */; }; + 225FCE280ADF277300466C53 /* cursor.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE120ADF277300466C53 /* cursor.h */; }; + 225FCE290ADF277300466C53 /* debug.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE130ADF277300466C53 /* debug.h */; }; + 225FCE2A0ADF277300466C53 /* dirwalk.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE140ADF277300466C53 /* dirwalk.c */; }; + 225FCE2B0ADF277300466C53 /* dirwalk.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE150ADF277300466C53 /* dirwalk.h */; }; + 225FCE2C0ADF277300466C53 /* floodfill.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE160ADF277300466C53 /* floodfill.c */; }; + 225FCE2D0ADF277300466C53 /* floodfill.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE170ADF277300466C53 /* floodfill.h */; }; + 225FCE2E0ADF277300466C53 /* fonts.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE180ADF277300466C53 /* fonts.c */; }; + 225FCE2F0ADF277300466C53 /* get_fname.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE190ADF277300466C53 /* get_fname.c */; }; + 225FCE300ADF277300466C53 /* get_fname.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE1A0ADF277300466C53 /* get_fname.h */; }; + 225FCE310ADF277300466C53 /* pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE1B0ADF277300466C53 /* pixels.c */; }; + 225FCE320ADF277300466C53 /* pixels.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE1C0ADF277300466C53 /* pixels.h */; }; + 225FCE330ADF277300466C53 /* playsound.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE1D0ADF277300466C53 /* playsound.c */; }; + 225FCE340ADF277300466C53 /* playsound.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE1E0ADF277300466C53 /* playsound.h */; }; + 225FCE350ADF277300466C53 /* progressbar.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE1F0ADF277300466C53 /* progressbar.c */; }; + 225FCE360ADF277300466C53 /* progressbar.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE200ADF277300466C53 /* progressbar.h */; }; + 225FCE370ADF277300466C53 /* rgblinear.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE210ADF277300466C53 /* rgblinear.c */; }; + 225FCE380ADF277300466C53 /* rgblinear.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE220ADF277300466C53 /* rgblinear.h */; }; + 225FCE390ADF277300466C53 /* fonts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE230ADF277300466C53 /* fonts.h */; }; + 225FCE3A0ADF277300466C53 /* i18n.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 225FCE240ADF277300466C53 /* i18n.h */; }; + 225FCE3B0ADF277300466C53 /* i18n.c in Sources */ = {isa = PBXBuildFile; fileRef = 225FCE250ADF277300466C53 /* i18n.c */; }; 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 */; }; 225FD52A0934EC1A00F0B02F /* SDL_ttf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225FD5260934EC1A00F0B02F /* SDL_ttf.framework */; }; @@ -41,7 +63,7 @@ /* Begin PBXBuildRule section */ 224A386D0933E9C4005A3695 /* PBXBuildRule */ = { isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.3_3; + compilerSpec = com.apple.compilers.gcc.4_0; fileType = sourcecode.c; isEditable = 1; outputFiles = ( @@ -49,7 +71,7 @@ }; 224A386E0933E9EF005A3695 /* PBXBuildRule */ = { isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.3_3; + compilerSpec = com.apple.compilers.gcc.4_0; fileType = sourcecode.asm.asm; isEditable = 1; outputFiles = ( @@ -57,7 +79,7 @@ }; 225FD5360934EF5600F0B02F /* PBXBuildRule */ = { isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.3_3; + compilerSpec = com.apple.compilers.gcc.4_0; fileType = sourcecode.cpp; isEditable = 1; outputFiles = ( @@ -65,26 +87,6 @@ }; /* End PBXBuildRule section */ -/* Begin PBXBuildStyle section */ - 4A9504CCFFE6A4B311CA0CBA /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - }; - name = Development; - }; - 4A9504CDFFE6A4B311CA0CBA /* Deployment */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - ZERO_LINK = NO; - }; - name = Deployment; - }; -/* End PBXBuildStyle section */ - /* Begin PBXCopyFilesBuildPhase section */ 22D5D2A80738498300B67229 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -96,6 +98,18 @@ 225FE6F40939892300F0B02F /* SDL_mixer.framework in CopyFiles */, 225FE6F00939891500F0B02F /* SDL_image.framework in CopyFiles */, 225FE6D20939890800F0B02F /* SDL.framework in CopyFiles */, + 225FCE260ADF277300466C53 /* compiler.h in CopyFiles */, + 225FCE280ADF277300466C53 /* cursor.h in CopyFiles */, + 225FCE290ADF277300466C53 /* debug.h in CopyFiles */, + 225FCE2B0ADF277300466C53 /* dirwalk.h in CopyFiles */, + 225FCE2D0ADF277300466C53 /* floodfill.h in CopyFiles */, + 225FCE300ADF277300466C53 /* get_fname.h in CopyFiles */, + 225FCE320ADF277300466C53 /* pixels.h in CopyFiles */, + 225FCE340ADF277300466C53 /* playsound.h in CopyFiles */, + 225FCE360ADF277300466C53 /* progressbar.h in CopyFiles */, + 225FCE380ADF277300466C53 /* rgblinear.h in CopyFiles */, + 225FCE390ADF277300466C53 /* fonts.h in CopyFiles */, + 225FCE3A0ADF277300466C53 /* i18n.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -108,6 +122,28 @@ 2202646607AC603500C3AEAB /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; 224A368C0933B741005A3695 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../data/fonts; sourceTree = SOURCE_ROOT; }; 22581666074EE1A5005F774F /* Read Me.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Read Me.txt"; sourceTree = ""; wrapsLines = 1; }; + 225FCE100ADF277300466C53 /* compiler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = compiler.h; path = ../src/compiler.h; sourceTree = SOURCE_ROOT; }; + 225FCE110ADF277300466C53 /* cursor.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = cursor.c; path = ../src/cursor.c; sourceTree = SOURCE_ROOT; }; + 225FCE120ADF277300466C53 /* cursor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = cursor.h; path = ../src/cursor.h; sourceTree = SOURCE_ROOT; }; + 225FCE130ADF277300466C53 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = debug.h; path = ../src/debug.h; sourceTree = SOURCE_ROOT; }; + 225FCE140ADF277300466C53 /* dirwalk.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dirwalk.c; path = ../src/dirwalk.c; sourceTree = SOURCE_ROOT; }; + 225FCE150ADF277300466C53 /* dirwalk.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dirwalk.h; path = ../src/dirwalk.h; sourceTree = SOURCE_ROOT; }; + 225FCE160ADF277300466C53 /* floodfill.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = floodfill.c; path = ../src/floodfill.c; sourceTree = SOURCE_ROOT; }; + 225FCE170ADF277300466C53 /* floodfill.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = floodfill.h; path = ../src/floodfill.h; sourceTree = SOURCE_ROOT; }; + 225FCE180ADF277300466C53 /* fonts.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fonts.c; path = ../src/fonts.c; sourceTree = SOURCE_ROOT; }; + 225FCE190ADF277300466C53 /* get_fname.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = get_fname.c; path = ../src/get_fname.c; sourceTree = SOURCE_ROOT; }; + 225FCE1A0ADF277300466C53 /* get_fname.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = get_fname.h; path = ../src/get_fname.h; sourceTree = SOURCE_ROOT; }; + 225FCE1B0ADF277300466C53 /* pixels.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pixels.c; path = ../src/pixels.c; sourceTree = SOURCE_ROOT; }; + 225FCE1C0ADF277300466C53 /* pixels.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pixels.h; path = ../src/pixels.h; sourceTree = SOURCE_ROOT; }; + 225FCE1D0ADF277300466C53 /* playsound.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = playsound.c; path = ../src/playsound.c; sourceTree = SOURCE_ROOT; }; + 225FCE1E0ADF277300466C53 /* playsound.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = playsound.h; path = ../src/playsound.h; sourceTree = SOURCE_ROOT; }; + 225FCE1F0ADF277300466C53 /* progressbar.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = progressbar.c; path = ../src/progressbar.c; sourceTree = SOURCE_ROOT; }; + 225FCE200ADF277300466C53 /* progressbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = progressbar.h; path = ../src/progressbar.h; sourceTree = SOURCE_ROOT; }; + 225FCE210ADF277300466C53 /* rgblinear.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = rgblinear.c; path = ../src/rgblinear.c; sourceTree = SOURCE_ROOT; }; + 225FCE220ADF277300466C53 /* rgblinear.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = rgblinear.h; path = ../src/rgblinear.h; sourceTree = SOURCE_ROOT; }; + 225FCE230ADF277300466C53 /* fonts.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fonts.h; path = ../src/fonts.h; sourceTree = SOURCE_ROOT; }; + 225FCE240ADF277300466C53 /* i18n.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = i18n.h; path = ../src/i18n.h; sourceTree = SOURCE_ROOT; }; + 225FCE250ADF277300466C53 /* i18n.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = i18n.c; path = ../src/i18n.c; sourceTree = SOURCE_ROOT; }; 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 = ""; }; 225FD5260934EC1A00F0B02F /* SDL_ttf.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_ttf.framework; path = /Library/Frameworks/SDL_ttf.framework; sourceTree = ""; }; @@ -231,6 +267,28 @@ 29B97315FDCFA39411CA2CEA /* TuxPaint Sources */ = { isa = PBXGroup; children = ( + 225FCE100ADF277300466C53 /* compiler.h */, + 225FCE110ADF277300466C53 /* cursor.c */, + 225FCE120ADF277300466C53 /* cursor.h */, + 225FCE130ADF277300466C53 /* debug.h */, + 225FCE140ADF277300466C53 /* dirwalk.c */, + 225FCE150ADF277300466C53 /* dirwalk.h */, + 225FCE160ADF277300466C53 /* floodfill.c */, + 225FCE170ADF277300466C53 /* floodfill.h */, + 225FCE180ADF277300466C53 /* fonts.c */, + 225FCE190ADF277300466C53 /* get_fname.c */, + 225FCE1A0ADF277300466C53 /* get_fname.h */, + 225FCE1B0ADF277300466C53 /* pixels.c */, + 225FCE1C0ADF277300466C53 /* pixels.h */, + 225FCE1D0ADF277300466C53 /* playsound.c */, + 225FCE1E0ADF277300466C53 /* playsound.h */, + 225FCE1F0ADF277300466C53 /* progressbar.c */, + 225FCE200ADF277300466C53 /* progressbar.h */, + 225FCE210ADF277300466C53 /* rgblinear.c */, + 225FCE220ADF277300466C53 /* rgblinear.h */, + 225FCE230ADF277300466C53 /* fonts.h */, + 225FCE240ADF277300466C53 /* i18n.h */, + 225FCE250ADF277300466C53 /* i18n.c */, 22C0EAA30735B851008555A2 /* colors.h */, 22C0EAA40735B851008555A2 /* great.h */, 22C0EAAD0735B851008555A2 /* magic.h */, @@ -292,40 +350,6 @@ 224A386E0933E9EF005A3695 /* PBXBuildRule */, 224A386D0933E9C4005A3695 /* PBXBuildRule */, ); - buildSettings = { - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DATA_PREFIX=\"Tux Paint.app/Contents/Resources/\"", - "DOC_PREFIX=\"./share/doc/tuxpaint/\"", - "CONFDIR=\"$(HOME)/Library/Application Support/Tux Paint/\"", - "LOCALEDIR=\"Tux Paint.app/Contents/Resources/locale/\"", - "CURSOR_SHAPES=SMALL", - SMALL_CURSOR_SHAPES, - __APPLE__, - ); - HEADER_SEARCH_PATHS = ( - /sw/include/SDL, - /sw/include, - ../src/mouse/16x16/, - ); - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_STYLE = STATIC; - MACOSX_DEPLOYMENT_TARGET = 10.1; - OTHER_CFLAGS = ""; - OTHER_CPLUSPLUSFLAGS = ""; - OTHER_LDFLAGS = ( - /sw/lib/libpng.a, - /sw/lib/libintl.a, - "-lz", - "-liconv", - ); - PRODUCT_NAME = "Tux Paint"; - WRAPPER_EXTENSION = app; - }; dependencies = ( ); name = "Tux Paint"; @@ -340,12 +364,6 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = 224A35FB09339642005A3695 /* Build configuration list for PBXProject "TuxPaint" */; - buildSettings = { - }; - buildStyles = ( - 4A9504CCFFE6A4B311CA0CBA /* Development */, - 4A9504CDFFE6A4B311CA0CBA /* Deployment */, - ); hasScannedForEncodings = 1; mainGroup = 29B97314FDCFA39411CA2CEA /* TuxPaint */; projectDirPath = ""; @@ -402,6 +420,16 @@ 22C0EA9E0735B76F008555A2 /* SDLMain.m in Sources */, 22C0EABD0735B851008555A2 /* macosx_print.m in Sources */, 22C0EAC40735B851008555A2 /* tuxpaint.c in Sources */, + 225FCE270ADF277300466C53 /* cursor.c in Sources */, + 225FCE2A0ADF277300466C53 /* dirwalk.c in Sources */, + 225FCE2C0ADF277300466C53 /* floodfill.c in Sources */, + 225FCE2E0ADF277300466C53 /* fonts.c in Sources */, + 225FCE2F0ADF277300466C53 /* get_fname.c in Sources */, + 225FCE310ADF277300466C53 /* pixels.c in Sources */, + 225FCE330ADF277300466C53 /* playsound.c in Sources */, + 225FCE350ADF277300466C53 /* progressbar.c in Sources */, + 225FCE370ADF277300466C53 /* rgblinear.c in Sources */, + 225FCE3B0ADF277300466C53 /* i18n.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -430,6 +458,7 @@ 224A35F809339642005A3695 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ppc; FRAMEWORK_SEARCH_PATHS = "/Library/Frameworks/**"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; @@ -438,18 +467,28 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( - "VER_DATE=\"2005-11-26\"", - "DATA_PREFIX=\"Tux Paint.app/Contents/Resources/\"", - "DOC_PREFIX=\"./share/doc/tuxpaint/\"", - "CONFDIR=\"$(HOME)/Library/Application Support/Tux Paint/\"", - "LOCALEDIR=\"Tux Paint.app/Contents/Resources/locale/\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5)", "CURSOR_SHAPES=SMALL", SMALL_CURSOR_SHAPES, __APPLE__, - "VER_VERSION=\"0.9.15\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_6)", + HAVE_STRCASESTR, ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "VER_DATE=\\\"2005-11-26\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "DATA_PREFIX=\\\"Tux\\ Paint.app/Contents/Resources/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "DOC_PREFIX=\\\"./share/doc/tuxpaint/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "CONFDIR=\\\"$(HOME)/Library/Application\\ Support/Tux\\ Paint/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5 = "LOCALEDIR=\\\"Tux\\ Paint.app/Contents/Resources/locale/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_6 = "VER_VERSION=\\\"0.9.15\\\""; HEADER_SEARCH_PATHS = ( - /sw/include/SDL, + /Library/Frameworks/SDL.framework/Headers, + /Library/Frameworks/SDL_image.framework/Headers/, + /Library/Frameworks/SDL_mixer.framework/Headers/, + /Library/Frameworks/SDL_ttf.framework/Headers/, /sw/include, ../src/mouse/16x16/, ); @@ -471,6 +510,7 @@ 224A35F909339642005A3695 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ppc; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = "/Library/Frameworks/**"; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -479,18 +519,28 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( - "VER_DATE=\"2005-11-26\"", - "DATA_PREFIX=\"Tux Paint.app/Contents/Resources/\"", - "DOC_PREFIX=\"./share/doc/tuxpaint/\"", - "CONFDIR=\"$(HOME)/Library/Application Support/Tux Paint/\"", - "LOCALEDIR=\"Tux Paint.app/Contents/Resources/locale/\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5)", "CURSOR_SHAPES=SMALL", SMALL_CURSOR_SHAPES, __APPLE__, - "VER_VERSION=\"0.9.15\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_6)", + HAVE_STRCASESTR, ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "VER_DATE=\\\"2005-11-26\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "DATA_PREFIX=\\\"Tux\\ Paint.app/Contents/Resources/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "DOC_PREFIX=\\\"./share/doc/tuxpaint/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "CONFDIR=\\\"$(HOME)/Library/Application\\ Support/Tux\\ Paint/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5 = "LOCALEDIR=\\\"Tux\\ Paint.app/Contents/Resources/locale/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_6 = "VER_VERSION=\\\"0.9.15\\\""; HEADER_SEARCH_PATHS = ( - /sw/include/SDL, + /Library/Frameworks/SDL.framework/Headers, + /Library/Frameworks/SDL_image.framework/Headers/, + /Library/Frameworks/SDL_mixer.framework/Headers/, + /Library/Frameworks/SDL_ttf.framework/Headers/, /sw/include, ../src/mouse/16x16/, ); @@ -513,24 +563,35 @@ 224A35FA09339642005A3695 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ppc; FRAMEWORK_SEARCH_PATHS = "/Library/Frameworks/**"; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( - "VER_DATE=\"2005-11-26\"", - "DATA_PREFIX=\"Tux Paint.app/Contents/Resources/\"", - "DOC_PREFIX=\"./share/doc/tuxpaint/\"", - "CONFDIR=\"$(HOME)/Library/Application Support/Tux Paint/\"", - "LOCALEDIR=\"Tux Paint.app/Contents/Resources/locale/\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5)", "CURSOR_SHAPES=SMALL", SMALL_CURSOR_SHAPES, __APPLE__, - "VER_VERSION=\"0.9.15\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_6)", + HAVE_STRCASESTR, ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "VER_DATE=\\\"2005-11-26\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "DATA_PREFIX=\\\"Tux\\ Paint.app/Contents/Resources/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "DOC_PREFIX=\\\"./share/doc/tuxpaint/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "CONFDIR=\\\"$(HOME)/Library/Application\\ Support/Tux\\ Paint/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5 = "LOCALEDIR=\\\"Tux\\ Paint.app/Contents/Resources/locale/\\\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_6 = "VER_VERSION=\\\"0.9.15\\\""; HEADER_SEARCH_PATHS = ( - /sw/include/SDL, + /Library/Frameworks/SDL.framework/Headers, + /Library/Frameworks/SDL_image.framework/Headers/, + /Library/Frameworks/SDL_mixer.framework/Headers/, + /Library/Frameworks/SDL_ttf.framework/Headers/, /sw/include, ../src/mouse/16x16/, ); @@ -552,24 +613,18 @@ 224A35FC09339642005A3695 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk; }; name = Development; }; 224A35FD09339642005A3695 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk; }; name = Deployment; }; 224A35FE09339642005A3695 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk; }; name = Default; };