1.1 --- a/istereo.xcodeproj/project.pbxproj	Wed Sep 23 05:44:58 2015 +0300
     1.2 +++ b/istereo.xcodeproj/project.pbxproj	Thu Sep 24 06:49:25 2015 +0300
     1.3 @@ -22,6 +22,14 @@
     1.4  		060ECAF31BB2441600CE9B80 /* color.p.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 060ECAF21BB2441600CE9B80 /* color.p.glsl */; settings = {ASSET_TAGS = (); }; };
     1.5  		060ECAF61BB2496100CE9B80 /* ui.p.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 060ECAF41BB2496100CE9B80 /* ui.p.glsl */; settings = {ASSET_TAGS = (); }; };
     1.6  		060ECAF71BB2496100CE9B80 /* ui.v.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 060ECAF51BB2496100CE9B80 /* ui.v.glsl */; settings = {ASSET_TAGS = (); }; };
     1.7 +		060ECAFE1BB2BD5C00CE9B80 /* drawgl.c in Sources */ = {isa = PBXBuildFile; fileRef = 060ECAF91BB2BD5C00CE9B80 /* drawgl.c */; settings = {ASSET_TAGS = (); }; };
     1.8 +		060ECAFF1BB2BD5C00CE9B80 /* font.c in Sources */ = {isa = PBXBuildFile; fileRef = 060ECAFC1BB2BD5C00CE9B80 /* font.c */; settings = {ASSET_TAGS = (); }; };
     1.9 +		060ECB001BB2BD5C00CE9B80 /* utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = 060ECAFD1BB2BD5C00CE9B80 /* utf8.c */; settings = {ASSET_TAGS = (); }; };
    1.10 +		060ECB031BB361C300CE9B80 /* assman.c in Sources */ = {isa = PBXBuildFile; fileRef = 060ECB011BB361C300CE9B80 /* assman.c */; settings = {ASSET_TAGS = (); }; };
    1.11 +		060ECB051BB361D900CE9B80 /* assman.c in Sources */ = {isa = PBXBuildFile; fileRef = 060ECB041BB361D900CE9B80 /* assman.c */; settings = {ASSET_TAGS = (); }; };
    1.12 +		060ECB071BB36FD800CE9B80 /* linux-libertine_s24.glyphmap in Resources */ = {isa = PBXBuildFile; fileRef = 060ECB061BB36FD800CE9B80 /* linux-libertine_s24.glyphmap */; settings = {ASSET_TAGS = (); }; };
    1.13 +		060ECB091BB3989500CE9B80 /* uitheme.cc in Sources */ = {isa = PBXBuildFile; fileRef = 060ECB081BB3989500CE9B80 /* uitheme.cc */; settings = {ASSET_TAGS = (); }; };
    1.14 +		060ECB0B1BB3A8DB00CE9B80 /* font.p.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 060ECB0A1BB3A8DB00CE9B80 /* font.p.glsl */; settings = {ASSET_TAGS = (); }; };
    1.15  		0669D67F1BA85DDE00611CFA /* app_delegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0669D67B1BA85DDE00611CFA /* app_delegate.m */; };
    1.16  		0669D6801BA85DDE00611CFA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0669D67C1BA85DDE00611CFA /* main.m */; };
    1.17  		0669D6811BA85DDE00611CFA /* viewctl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0669D67E1BA85DDE00611CFA /* viewctl.m */; };
    1.18 @@ -161,6 +169,17 @@
    1.19  		060ECAF21BB2441600CE9B80 /* color.p.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = color.p.glsl; path = sdr/color.p.glsl; sourceTree = "<group>"; };
    1.20  		060ECAF41BB2496100CE9B80 /* ui.p.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ui.p.glsl; path = sdr/ui.p.glsl; sourceTree = "<group>"; };
    1.21  		060ECAF51BB2496100CE9B80 /* ui.v.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ui.v.glsl; path = sdr/ui.v.glsl; sourceTree = "<group>"; };
    1.22 +		060ECAF91BB2BD5C00CE9B80 /* drawgl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = drawgl.c; path = libs/drawtext/drawgl.c; sourceTree = "<group>"; };
    1.23 +		060ECAFA1BB2BD5C00CE9B80 /* drawtext_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = drawtext_impl.h; path = libs/drawtext/drawtext_impl.h; sourceTree = "<group>"; };
    1.24 +		060ECAFB1BB2BD5C00CE9B80 /* drawtext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = drawtext.h; path = libs/drawtext/drawtext.h; sourceTree = "<group>"; };
    1.25 +		060ECAFC1BB2BD5C00CE9B80 /* font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = font.c; path = libs/drawtext/font.c; sourceTree = "<group>"; };
    1.26 +		060ECAFD1BB2BD5C00CE9B80 /* utf8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = utf8.c; path = libs/drawtext/utf8.c; sourceTree = "<group>"; };
    1.27 +		060ECB011BB361C300CE9B80 /* assman.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = assman.c; path = src/assman.c; sourceTree = "<group>"; };
    1.28 +		060ECB021BB361C300CE9B80 /* assman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = assman.h; path = src/assman.h; sourceTree = "<group>"; };
    1.29 +		060ECB041BB361D900CE9B80 /* assman.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = assman.c; path = src/ios/assman.c; sourceTree = "<group>"; };
    1.30 +		060ECB061BB36FD800CE9B80 /* linux-libertine_s24.glyphmap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linux-libertine_s24.glyphmap"; path = "data/linux-libertine_s24.glyphmap"; sourceTree = "<group>"; };
    1.31 +		060ECB081BB3989500CE9B80 /* uitheme.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = uitheme.cc; path = src/uitheme.cc; sourceTree = "<group>"; };
    1.32 +		060ECB0A1BB3A8DB00CE9B80 /* font.p.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = font.p.glsl; path = sdr/font.p.glsl; sourceTree = "<group>"; };
    1.33  		0669D6471BA851BE00611CFA /* istereo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = istereo.app; sourceTree = BUILT_PRODUCTS_DIR; };
    1.34  		0669D6741BA858BF00611CFA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ios/Info.plist; sourceTree = "<group>"; };
    1.35  		0669D67A1BA85DDE00611CFA /* app_delegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = app_delegate.h; path = src/ios/app_delegate.h; sourceTree = "<group>"; };
    1.36 @@ -364,6 +383,18 @@
    1.37  			name = goatkit;
    1.38  			sourceTree = "<group>";
    1.39  		};
    1.40 +		060ECAF81BB2BD4B00CE9B80 /* drawtext */ = {
    1.41 +			isa = PBXGroup;
    1.42 +			children = (
    1.43 +				060ECAF91BB2BD5C00CE9B80 /* drawgl.c */,
    1.44 +				060ECAFA1BB2BD5C00CE9B80 /* drawtext_impl.h */,
    1.45 +				060ECAFB1BB2BD5C00CE9B80 /* drawtext.h */,
    1.46 +				060ECAFC1BB2BD5C00CE9B80 /* font.c */,
    1.47 +				060ECAFD1BB2BD5C00CE9B80 /* utf8.c */,
    1.48 +			);
    1.49 +			name = drawtext;
    1.50 +			sourceTree = "<group>";
    1.51 +		};
    1.52  		0669D63E1BA851BE00611CFA = {
    1.53  			isa = PBXGroup;
    1.54  			children = (
    1.55 @@ -388,7 +419,10 @@
    1.56  		0669D6761BA858D600611CFA /* src */ = {
    1.57  			isa = PBXGroup;
    1.58  			children = (
    1.59 +				060ECB011BB361C300CE9B80 /* assman.c */,
    1.60 +				060ECB021BB361C300CE9B80 /* assman.h */,
    1.61  				060ECAED1BB22A4400CE9B80 /* ui.cc */,
    1.62 +				060ECB081BB3989500CE9B80 /* uitheme.cc */,
    1.63  				060ECAEE1BB22A4400CE9B80 /* ui.h */,
    1.64  				0669D6821BACDF6C00611CFA /* cam.c */,
    1.65  				0669D6831BACDF6C00611CFA /* cam.h */,
    1.66 @@ -412,6 +446,7 @@
    1.67  		0669D6791BA85DCC00611CFA /* ios */ = {
    1.68  			isa = PBXGroup;
    1.69  			children = (
    1.70 +				060ECB041BB361D900CE9B80 /* assman.c */,
    1.71  				0669D67A1BA85DDE00611CFA /* app_delegate.h */,
    1.72  				0669D67B1BA85DDE00611CFA /* app_delegate.m */,
    1.73  				0669D67C1BA85DDE00611CFA /* main.m */,
    1.74 @@ -424,6 +459,7 @@
    1.75  		0669D6971BAD01C200611CFA /* libs */ = {
    1.76  			isa = PBXGroup;
    1.77  			children = (
    1.78 +				060ECAF81BB2BD4B00CE9B80 /* drawtext */,
    1.79  				060ECAC81BB1A9BA00CE9B80 /* goatkit */,
    1.80  				0669D69C1BAD01EA00611CFA /* vmath */,
    1.81  				0669D69B1BAD01E300611CFA /* imago2 */,
    1.82 @@ -601,6 +637,7 @@
    1.83  		0669D77B1BAD028300611CFA /* sdr */ = {
    1.84  			isa = PBXGroup;
    1.85  			children = (
    1.86 +				060ECB0A1BB3A8DB00CE9B80 /* font.p.glsl */,
    1.87  				060ECAF41BB2496100CE9B80 /* ui.p.glsl */,
    1.88  				060ECAF51BB2496100CE9B80 /* ui.v.glsl */,
    1.89  				0669D77C1BAD02A200611CFA /* test.p.glsl */,
    1.90 @@ -618,6 +655,7 @@
    1.91  		0669D7881BAD02B000611CFA /* data */ = {
    1.92  			isa = PBXGroup;
    1.93  			children = (
    1.94 +				060ECB061BB36FD800CE9B80 /* linux-libertine_s24.glyphmap */,
    1.95  				0669D7891BAD02DC00611CFA /* stonewall_normal.jpg */,
    1.96  				0669D78A1BAD02DC00611CFA /* stonewall.jpg */,
    1.97  				0669D78B1BAD02DC00611CFA /* text.png */,
    1.98 @@ -697,8 +735,10 @@
    1.99  				0669D7901BAD02DC00611CFA /* tiles.jpg in Resources */,
   1.100  				0669D7871BAD02A200611CFA /* tunnel.v.glsl in Resources */,
   1.101  				0669D78F1BAD02DC00611CFA /* text.png in Resources */,
   1.102 +				060ECB0B1BB3A8DB00CE9B80 /* font.p.glsl in Resources */,
   1.103  				0669D7851BAD02A200611CFA /* text.v.glsl in Resources */,
   1.104  				0669D7831BAD02A200611CFA /* test.v.glsl in Resources */,
   1.105 +				060ECB071BB36FD800CE9B80 /* linux-libertine_s24.glyphmap in Resources */,
   1.106  			);
   1.107  			runOnlyForDeploymentPostprocessing = 0;
   1.108  		};
   1.109 @@ -709,6 +749,7 @@
   1.110  			isa = PBXSourcesBuildPhase;
   1.111  			buildActionMask = 2147483647;
   1.112  			files = (
   1.113 +				060ECB001BB2BD5C00CE9B80 /* utf8.c in Sources */,
   1.114  				0669D7121BAD024700611CFA /* jcparam.c in Sources */,
   1.115  				0669D7551BAD025B00611CFA /* pngwio.c in Sources */,
   1.116  				0669D70F1BAD024700611CFA /* jcmarker.c in Sources */,
   1.117 @@ -729,6 +770,7 @@
   1.118  				0669D6B81BAD020B00611CFA /* ray_c.c in Sources */,
   1.119  				0669D71D1BAD024700611CFA /* jddctmgr.c in Sources */,
   1.120  				0669D7571BAD025B00611CFA /* pngwtran.c in Sources */,
   1.121 +				060ECB051BB361D900CE9B80 /* assman.c in Sources */,
   1.122  				0669D7081BAD024700611CFA /* jcapistd.c in Sources */,
   1.123  				0669D72C1BAD024700611CFA /* jidctflt.c in Sources */,
   1.124  				060ECADB1BB1A9CC00CE9B80 /* textbox.cc in Sources */,
   1.125 @@ -739,6 +781,7 @@
   1.126  				0669D7281BAD024700611CFA /* jerror.c in Sources */,
   1.127  				0669D7221BAD024700611CFA /* jdmaster.c in Sources */,
   1.128  				0669D76F1BAD027000611CFA /* adler32.c in Sources */,
   1.129 +				060ECAFF1BB2BD5C00CE9B80 /* font.c in Sources */,
   1.130  				0669D7541BAD025B00611CFA /* pngvcrd.c in Sources */,
   1.131  				0669D72A1BAD024700611CFA /* jfdctfst.c in Sources */,
   1.132  				0669D7791BAD027000611CFA /* uncompr.c in Sources */,
   1.133 @@ -765,7 +808,9 @@
   1.134  				0669D71F1BAD024700611CFA /* jdinput.c in Sources */,
   1.135  				0669D7581BAD025B00611CFA /* pngwutil.c in Sources */,
   1.136  				0669D7261BAD024700611CFA /* jdsample.c in Sources */,
   1.137 +				060ECAFE1BB2BD5C00CE9B80 /* drawgl.c in Sources */,
   1.138  				0669D7701BAD027000611CFA /* compress.c in Sources */,
   1.139 +				060ECB031BB361C300CE9B80 /* assman.c in Sources */,
   1.140  				0669D7111BAD024700611CFA /* jcomapi.c in Sources */,
   1.141  				0669D71A1BAD024700611CFA /* jdatasrc.c in Sources */,
   1.142  				060ECADC1BB1A9CC00CE9B80 /* theme.cc in Sources */,
   1.143 @@ -803,6 +848,7 @@
   1.144  				0669D7751BAD027000611CFA /* inffast.c in Sources */,
   1.145  				0669D7491BAD025B00611CFA /* pngerror.c in Sources */,
   1.146  				0669D7171BAD024700611CFA /* jdapimin.c in Sources */,
   1.147 +				060ECB091BB3989500CE9B80 /* uitheme.cc in Sources */,
   1.148  				0669D7331BAD024700611CFA /* jquant2.c in Sources */,
   1.149  				0669D74D1BAD025B00611CFA /* pngpread.c in Sources */,
   1.150  				0669D7071BAD024700611CFA /* jcapimin.c in Sources */,
   1.151 @@ -915,6 +961,8 @@
   1.152  				GCC_PREPROCESSOR_DEFINITIONS = (
   1.153  					"DEBUG=1",
   1.154  					HAVE_OPENGL_H,
   1.155 +					HAVE_CONFIG_H,
   1.156 +					NO_FREETYPE,
   1.157  				);
   1.158  				HEADER_SEARCH_PATHS = libs;
   1.159  				INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
   1.160 @@ -931,7 +979,11 @@
   1.161  				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
   1.162  				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
   1.163  				CODE_SIGN_IDENTITY = "iPhone Developer";
   1.164 -				GCC_PREPROCESSOR_DEFINITIONS = HAVE_OPENGL_H;
   1.165 +				GCC_PREPROCESSOR_DEFINITIONS = (
   1.166 +					HAVE_OPENGL_H,
   1.167 +					HAVE_CONFIG_H,
   1.168 +					NO_FREETYPE,
   1.169 +				);
   1.170  				HEADER_SEARCH_PATHS = libs;
   1.171  				INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
   1.172  				IPHONEOS_DEPLOYMENT_TARGET = 6.0;