diff --git a/Grafx2.xcodeproj/project.pbxproj b/Grafx2.xcodeproj/project.pbxproj index c6737b66..698f9175 100644 --- a/Grafx2.xcodeproj/project.pbxproj +++ b/Grafx2.xcodeproj/project.pbxproj @@ -17,7 +17,14 @@ F51CBD300EC8A3E1005C06AC /* Tuffy.ttf in Copy fonts */ = {isa = PBXBuildFile; fileRef = F51CBD2D0EC8A3E1005C06AC /* Tuffy.ttf */; }; F5A33E6A0EC893F800F8052D /* 8pxfont.png in Copy fonts */ = {isa = PBXBuildFile; fileRef = F5A33E690EC893F800F8052D /* 8pxfont.png */; }; F5AD4B1F0EA8CCF0009CCAC4 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AD4B1E0EA8CCF0009CCAC4 /* version.c */; }; + F5AE6F990EDA119D000CE0EF /* GrafX2_Classic.gif in Copy fonts */ = {isa = PBXBuildFile; fileRef = F5AE6F980EDA119D000CE0EF /* GrafX2_Classic.gif */; }; F5AE83FD0ECF8FD300200704 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */; }; + F5AFA00D0EFAC7D300663B43 /* brush.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA0070EFAC7D300663B43 /* brush.c */; }; + F5AFA00E0EFAC7D300663B43 /* pxsimple.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA0080EFAC7D300663B43 /* pxsimple.c */; }; + F5AFA00F0EFAC7D300663B43 /* pxtall.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA0090EFAC7D300663B43 /* pxtall.c */; }; + F5AFA0100EFAC7D300663B43 /* pxwide.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA00A0EFAC7D300663B43 /* pxwide.c */; }; + F5AFA0110EFAC7D300663B43 /* setup.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA00B0EFAC7D300663B43 /* setup.c */; }; + F5AFA0120EFAC7D300663B43 /* windows.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA00C0EFAC7D300663B43 /* windows.c */; }; F5B138940EB71977000B83CC /* texte.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B138930EB71977000B83CC /* texte.c */; }; F5B138C30EB71D28000B83CC /* SDL_ttf in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138C20EB71D28000B83CC /* SDL_ttf */; }; F5B19B8D0EA4BE3E003F4BA4 /* aide.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B750EA4BE3E003F4BA4 /* aide.c */; }; @@ -91,6 +98,7 @@ dstPath = fonts; dstSubfolderSpec = 7; files = ( + F5AE6F990EDA119D000CE0EF /* GrafX2_Classic.gif in Copy fonts */, F51CBD300EC8A3E1005C06AC /* Tuffy.ttf in Copy fonts */, F51CBD2F0EC8A3E1005C06AC /* colorfont.pcx in Copy fonts */, F51CBD2E0EC8A3E1005C06AC /* 5pxtinyfont.png in Copy fonts */, @@ -118,7 +126,14 @@ F51CBD2D0EC8A3E1005C06AC /* Tuffy.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Tuffy.ttf; path = fonts/Tuffy.ttf; sourceTree = ""; }; F5A33E690EC893F800F8052D /* 8pxfont.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 8pxfont.png; path = fonts/8pxfont.png; sourceTree = ""; }; F5AD4B1E0EA8CCF0009CCAC4 /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = ""; }; + F5AE6F980EDA119D000CE0EF /* GrafX2_Classic.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = GrafX2_Classic.gif; path = fonts/GrafX2_Classic.gif; sourceTree = ""; }; F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; + F5AFA0070EFAC7D300663B43 /* brush.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = brush.c; sourceTree = ""; }; + F5AFA0080EFAC7D300663B43 /* pxsimple.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pxsimple.c; sourceTree = ""; }; + F5AFA0090EFAC7D300663B43 /* pxtall.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pxtall.c; sourceTree = ""; }; + F5AFA00A0EFAC7D300663B43 /* pxwide.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pxwide.c; sourceTree = ""; }; + F5AFA00B0EFAC7D300663B43 /* setup.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = setup.c; sourceTree = ""; }; + F5AFA00C0EFAC7D300663B43 /* windows.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = windows.c; sourceTree = ""; }; F5B138930EB71977000B83CC /* texte.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = texte.c; sourceTree = ""; }; F5B138C20EB71D28000B83CC /* SDL_ttf */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL_ttf; path = /Library/Frameworks/SDL_ttf.framework/SDL_ttf; sourceTree = ""; }; F5B19B6C0EA4BDA8003F4BA4 /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = ""; }; @@ -210,6 +225,13 @@ 29B97314FDCFA39411CA2CEA /* Grafx2 */ = { isa = PBXGroup; children = ( + F5AFA0070EFAC7D300663B43 /* brush.c */, + F5AFA0080EFAC7D300663B43 /* pxsimple.c */, + F5AFA0090EFAC7D300663B43 /* pxtall.c */, + F5AFA00A0EFAC7D300663B43 /* pxwide.c */, + F5AFA00B0EFAC7D300663B43 /* setup.c */, + F5AFA00C0EFAC7D300663B43 /* windows.c */, + F5AE6F980EDA119D000CE0EF /* GrafX2_Classic.gif */, F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */, F51CBD2B0EC8A3E1005C06AC /* 5pxtinyfont.png */, F51CBD2C0EC8A3E1005C06AC /* colorfont.pcx */, @@ -368,6 +390,12 @@ F5B19BA40EA4BE3E003F4BA4 /* special.c in Sources */, F5AD4B1F0EA8CCF0009CCAC4 /* version.c in Sources */, F5B138940EB71977000B83CC /* texte.c in Sources */, + F5AFA00D0EFAC7D300663B43 /* brush.c in Sources */, + F5AFA00E0EFAC7D300663B43 /* pxsimple.c in Sources */, + F5AFA00F0EFAC7D300663B43 /* pxtall.c in Sources */, + F5AFA0100EFAC7D300663B43 /* pxwide.c in Sources */, + F5AFA0110EFAC7D300663B43 /* setup.c in Sources */, + F5AFA0120EFAC7D300663B43 /* windows.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser index b414d2ee..c768b8ed 100644 --- a/Grafx2.xcodeproj/xx.pbxuser +++ b/Grafx2.xcodeproj/xx.pbxuser @@ -77,7 +77,7 @@ 43, 20, 79, - 121, + 71, ); PBXFileTableDataSourceColumnsKey = ( PBXFileDataSource_FiletypeID, @@ -165,8 +165,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 248478999; - PBXWorkspaceStateSaveDate = 248478999; + PBXPerProjectTemplateStateSaveDate = 251316027; + PBXWorkspaceStateSaveDate = 251316027; }; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; userBuildSettings = { diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective index 1a443b47..2db4ef72 100644 --- a/Grafx2.xcodeproj/xx.perspective +++ b/Grafx2.xcodeproj/xx.perspective @@ -3,7 +3,7 @@ ActivePerspectiveName - Build + Project AllowedModules @@ -188,9 +188,9 @@ PerspectiveWidths - 1003 - 1003 - 1003 + 953 + 953 + 953 Perspectives @@ -260,20 +260,20 @@ 29B97314FDCFA39411CA2CEA F5AE83FC0ECF8FD300200704 - F5AE84000ECF8FD300200704 1C37FBAC04509CD000000102 - F5AE85220ECF9FBE00200704 + F5AE6EC90EDA116A000CE0EF + F5AE6FA80EDA1557000CE0EF + F5AE6FA90EDA1557000CE0EF 1C08E77C0454961000C914BD PBXSmartGroupTreeModuleOutlineStateSelectionKey - 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {305, 560}} + {{0, 778}, {305, 536}} PBXTopSmartGroupGIDs @@ -283,12 +283,14 @@ GeometryConfiguration Frame - {{0, 0}, {322, 578}} + {{0, 0}, {322, 554}} GroupTreeTableConfiguration MainColumn 305 + RubberWindowFrame + 81 61 953 595 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -325,7 +327,9 @@ GeometryConfiguration Frame - {{0, 0}, {676, 0}} + {{0, 0}, {626, 0}} + RubberWindowFrame + 81 61 953 595 0 0 1024 746 Module PBXNavigatorGroup @@ -334,10 +338,12 @@ Proportion - 573pt + 549pt Tabs + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -348,7 +354,9 @@ GeometryConfiguration Frame - {{10, 27}, {676, 546}} + {{10, 27}, {626, 522}} + RubberWindowFrame + 81 61 953 595 0 0 1024 746 Module XCDetailModule @@ -389,7 +397,7 @@ Proportion - 676pt + 626pt Name @@ -407,11 +415,11 @@ TableOfContents - F5AE83EB0ECF87BC00200704 + F5AE6FAA0EDA1557000CE0EF 1CA23ED40692098700951B8B - F5AE83EC0ECF87BC00200704 + F5AE6FAB0EDA1557000CE0EF F5A33EBD0EC89C3000F8052D - F5AE83ED0ECF87BC00200704 + F5AE6FAC0EDA1557000CE0EF 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -445,8 +453,6 @@ Layout - BecomeActive - ContentConfiguration PBXBottomSmartGroupGIDs @@ -495,8 +501,6 @@ MainColumn 123 - RubberWindowFrame - 26 67 953 595 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -534,8 +538,6 @@ Frame {{0, 0}, {808, 0}} - RubberWindowFrame - 26 67 953 595 0 0 1024 746 Module PBXNavigatorGroup @@ -563,8 +565,6 @@ Frame {{10, 27}, {808, 522}} - RubberWindowFrame - 26 67 953 595 0 0 1024 746 Module PBXBuildResultsModule @@ -644,14 +644,14 @@ TableOfContents - F5AE83EE0ECF87BC00200704 + F5AE6FAD0EDA1557000CE0EF 1CA23EE50692099D00951B8B - F5AE83EF0ECF87BC00200704 + F5AE6FAE0EDA1557000CE0EF F5A33EC20EC89C3000F8052D - F5AE83F00ECF87BC00200704 + F5AE6FAF0EDA1557000CE0EF XCMainBuildResultsModuleGUID 1CA23EE80692099D00951B8B - F5AE83F10ECF87BC00200704 + F5AE6FB00EDA1557000CE0EF ToolbarConfiguration xcode.toolbar.config.buildAndRun @@ -825,7 +825,7 @@ /Users/xx/Grafx2/Grafx2.xcodeproj WindowString - 26 67 953 595 0 0 1024 746 + 81 61 953 595 0 0 1024 746 WindowTools diff --git a/tables_aide.h b/tables_aide.h index f4a73407..820c39ab 100644 --- a/tables_aide.h +++ b/tables_aide.h @@ -419,7 +419,7 @@ static const T_TABLEAIDE TableAideCredits[] = AIDE_TEXTE("") AIDE_BOLD (" MAC OS X PORT") // AIDE_TEXTE("") // - AIDE_TEXTE(" hitchhikr") // + AIDE_TEXTE(" Franck Charlet (hitchhikr@australia.edu)") // AIDE_TEXTE("") AIDE_BOLD (" HAIKU OS AND BEOS PORT") // AIDE_TEXTE("") //