Refactoring FTContour
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183
diff --git a/mac/FTGL.pbproj/henry.pbxuser b/mac/FTGL.pbproj/henry.pbxuser
index 18e62f0..e3594fd 100644
--- a/mac/FTGL.pbproj/henry.pbxuser
+++ b/mac/FTGL.pbproj/henry.pbxuser
@@ -2,7 +2,7 @@
{
66BA088A01C46338000ABFD4 = {
activeBuildStyle = 66BA088D01C46338000ABFD4;
- activeExecutable = F597CC9302C5420F01F03BCF;
+ activeExecutable = 66BA08EF01C4657A000ABFD4;
activeTarget = 66BA089001C4635F000ABFD4;
addToTargets = (
66BA089001C4635F000ABFD4,
@@ -14,7 +14,7 @@
F597CC9302C5420F01F03BCF,
);
perUserDictionary = {
- PBXPerProjectTemplateStateSaveDate = 61592117;
+ PBXPerProjectTemplateStateSaveDate = 61685642;
"PBXTemplateGeometry-F5314676015831810DCA290F" = {
ContentSize = "{685, 434}";
LeftSlideOut = {
@@ -141,7 +141,133 @@
StatusViewVisible = YES;
Template = F5314676015831810DCA290F;
ToolbarVisible = YES;
- WindowLocation = "{7, 352}";
+ WindowLocation = "{27, 462}";
+ };
+ "PBXTemplateGeometry-F5CA7ECB015C094F0DCA290F" = {
+ ContentSize = "{668, 621}";
+ LeftSlideOut = {
+ Collapsed = NO;
+ Frame = "{{0, 0}, {668, 621}}";
+ Split0 = {
+ Collapsed = NO;
+ Frame = "{{0, 0}, {668, 621}}";
+ Split0 = {
+ Frame = "{{0, 0}, {668, 621}}";
+ };
+ SplitCount = 1;
+ Tab0 = {
+ Frame = "{{0, 0}, {484, 208}}";
+ };
+ Tab1 = {
+ Debugger = {
+ Collapsed = NO;
+ Frame = "{{0, 0}, {664, 208}}";
+ Split0 = {
+ Frame = "{{0, 24}, {664, 184}}";
+ Split0 = {
+ Frame = "{{0, 0}, {325, 184}}";
+ };
+ Split1 = {
+ DebugVariablesTableConfiguration = (
+ Name,
+ 123,
+ Value,
+ 85,
+ Summary,
+ 96.123,
+ );
+ Frame = "{{334, 0}, {330, 184}}";
+ };
+ SplitCount = 2;
+ };
+ SplitCount = 1;
+ Tab0 = {
+ Frame = "{{0, 0}, {100, 50}}";
+ };
+ Tab1 = {
+ Frame = "{{0, 0}, {100, 50}}";
+ };
+ TabCount = 2;
+ TabsVisible = YES;
+ };
+ Frame = "{{0, 0}, {664, 208}}";
+ LauncherConfigVersion = 7;
+ };
+ Tab2 = {
+ Frame = "{{0, 0}, {664, 50}}";
+ LauncherConfigVersion = 3;
+ Runner = {
+ Frame = "{{0, 0}, {664, 50}}";
+ };
+ };
+ Tab3 = {
+ BuildMessageFrame = "{{0, 0}, {614, 262}}";
+ BuildTranscriptFrame = "{{0, 271}, {614, 2}}";
+ BuildTranscriptFrameExpanded = YES;
+ Frame = "{{0, 0}, {612, 295}}";
+ };
+ Tab4 = {
+ Frame = "{{0, 0}, {612, 295}}";
+ };
+ TabCount = 5;
+ TabsVisible = NO;
+ };
+ SplitCount = 1;
+ Tab0 = {
+ Frame = "{{0, 0}, {313, 531}}";
+ GroupTreeTableConfiguration = (
+ TargetStatusColumn,
+ 18,
+ MainColumn,
+ 280,
+ );
+ };
+ Tab1 = {
+ ClassesFrame = "{{0, 0}, {280, 398}}";
+ ClassesTreeTableConfiguration = (
+ PBXBookColumnIdentifier,
+ 20,
+ PBXClassColumnIdentifier,
+ 237,
+ );
+ Frame = "{{0, 0}, {278, 659}}";
+ MembersFrame = "{{0, 407}, {280, 252}}";
+ MembersTreeTableConfiguration = (
+ PBXBookColumnIdentifier,
+ 20,
+ PBXMethodColumnIdentifier,
+ 236,
+ );
+ };
+ Tab2 = {
+ Frame = "{{0, 0}, {200, 100}}";
+ };
+ Tab3 = {
+ Frame = "{{0, 0}, {200, 557}}";
+ TargetTableConfiguration = (
+ ActiveObject,
+ 16,
+ ObjectNames,
+ 202.296,
+ );
+ };
+ Tab4 = {
+ BreakpointsTreeTableConfiguration = (
+ breakpointColumn,
+ 197,
+ enabledColumn,
+ 31,
+ );
+ Frame = "{{0, 0}, {250, 100}}";
+ };
+ TabCount = 5;
+ TabsVisible = NO;
+ };
+ NavBarShownByDefault = YES;
+ StatusViewVisible = NO;
+ Template = F5CA7ECB015C094F0DCA290F;
+ ToolbarVisible = NO;
+ WindowLocation = "{48, 349}";
};
PBXWorkspaceContents = (
{
@@ -310,10 +436,10 @@
StatusViewVisible = YES;
Template = F5E465990156DFB90DCA290F;
ToolbarVisible = YES;
- WindowLocation = "{574, 216}";
+ WindowLocation = "{856, 356}";
},
);
- PBXWorkspaceStateSaveDate = 61592117;
+ PBXWorkspaceStateSaveDate = 61685642;
};
projectwideBuildSettings = {
};
diff --git a/mac/FTGL.pbproj/project.pbxproj b/mac/FTGL.pbproj/project.pbxproj
index 0af3eef..b6be10d 100644
--- a/mac/FTGL.pbproj/project.pbxproj
+++ b/mac/FTGL.pbproj/project.pbxproj
@@ -1081,7 +1081,7 @@
F597CC9202C5420F01F03BCF,
);
buildSettings = {
- HEADER_SEARCH_PATHS = "/usr/local/include/freetype2 /usr/local/include";
+ HEADER_SEARCH_PATHS = /Users/henry/Development/PROJECTS/iSpot/includes;
LIBRARY_SEARCH_PATHS = /Users/henry/Development/PROJECTS/iSpot/libraries;
OPTIMIZATION_CFLAGS = "-O1";
OTHER_CFLAGS = "";