Skip to content
This repository was archived by the owner on May 10, 2019. It is now read-only.

Commit 55a52b3

Browse files
vmagaziyvmagaziy
committed
Fix issues with defining submodules and add the missed 'pop' submodule.
Add MtProtoKit as a submodule to avoid a dependency on its location one level up. Add reference to configuration file: config.h to project file Add linking with libsqlite instead of 3rd party library.
1 parent 0410605 commit 55a52b3

File tree

4 files changed

+95
-20
lines changed

4 files changed

+95
-20
lines changed

‎.gitmodules‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33
url = https://github.com/skywinder/ActionSheetPicker-3.0.git
44
[submodule "thirdparty/SSignalKit"]
55
path = thirdparty/SSignalKit
6-
url=git@github.com:peter-iakovlev/Signals.git
6+
url = https://github.com/peter-iakovlev/Signals.git
77
[submodule "thirdparty/sqlcipher"]
88
path = thirdparty/sqlcipher
99
url = https://github.com/sqlcipher/sqlcipher.git
1010
[submodule "Share/submodules/lmdb"]
1111
path = Share/submodules/lmdb
12-
url=https://github.com/LMDB/lmdb.git
12+
url = https://github.com/LMDB/lmdb.git
1313
[submodule "submodules/elements"]
1414
path = submodules/elements
1515
url = [email protected]:iakovlevpeterp/elements.git
16+
[submodule "thirdparty/pop"]
17+
path = thirdparty/pop
18+
url = https://github.com/facebook/pop.git
19+
[submodule "submodules/MtProtoKit"]
20+
path = submodules/MtProtoKit
21+
url = https://github.com/peter-iakovlev/MtProtoKit.git

‎Telegraph.xcodeproj/project.pbxproj‎

Lines changed: 85 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,8 +1134,8 @@
11341134
D00C71B3193F482E0005349C /* ModernBubbleIncomingFullHighlightedPad.png in Resources */ = {isa = PBXBuildFile; fileRef = D00C71AB193F482E0005349C /* ModernBubbleIncomingFullHighlightedPad.png */; };
11351135
D00C71B4193F482E0005349C /* ModernBubbleIncomingPartialPad.png in Resources */ = {isa = PBXBuildFile; fileRef = D00C71AC193F482E0005349C /* ModernBubbleIncomingPartialPad.png */; };
11361136
D00C71B5193F482E0005349C /* ModernBubbleIncomingFullPad.png in Resources */ = {isa = PBXBuildFile; fileRef = D00C71AD193F482E0005349C /* ModernBubbleIncomingFullPad.png */; };
1137-
D00C79211BBCA4CA00F979C8 /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00C791D1BBCA4CA00F979C8 /* HockeySDK.framework */; settings = {ASSET_TAGS = (); }; };
1138-
D00C79231BBCA4CA00F979C8 /* HockeySDKResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D00C79201BBCA4CA00F979C8 /* HockeySDKResources.bundle */; settings = {ASSET_TAGS = (); }; };
1137+
D00C79211BBCA4CA00F979C8 /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00C791D1BBCA4CA00F979C8 /* HockeySDK.framework */; };
1138+
D00C79231BBCA4CA00F979C8 /* HockeySDKResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D00C79201BBCA4CA00F979C8 /* HockeySDKResources.bundle */; };
11391139
D010E4D71AB5C627000A1742 /* TGMentionPanelCell.h in Headers */ = {isa = PBXBuildFile; fileRef = D010E4D51AB5C627000A1742 /* TGMentionPanelCell.h */; };
11401140
D010E4D81AB5C627000A1742 /* TGMentionPanelCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D010E4D61AB5C627000A1742 /* TGMentionPanelCell.m */; };
11411141
D01526CF18FB2E4900656312 /* TGImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D01526CE18FB2E4900656312 /* TGImageView.m */; };
@@ -2767,7 +2767,6 @@
27672767
D0C80D3B1A9561D600D5DF8A /* TGDialogListTitleContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C80D371A9561D600D5DF8A /* TGDialogListTitleContainer.m */; };
27682768
D0C80D3C1A9561D600D5DF8A /* TGLockIconView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C80D381A9561D600D5DF8A /* TGLockIconView.h */; };
27692769
D0C80D3D1A9561D600D5DF8A /* TGLockIconView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C80D391A9561D600D5DF8A /* TGLockIconView.m */; };
2770-
D0C80D421A95624600D5DF8A /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = D0C80D3F1A95624600D5DF8A /* sqlite3.c */; settings = {COMPILER_FLAGS = "-w"; }; };
27712770
D0C80D431A95624600D5DF8A /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C80D401A95624600D5DF8A /* sqlite3.h */; };
27722771
D0C80D441A95624600D5DF8A /* sqlite3ext.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C80D411A95624600D5DF8A /* sqlite3ext.h */; };
27732772
D0C80D661A960B2A00D5DF8A /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = D0C80D621A960B2A00D5DF8A /* [email protected] */; };
@@ -3233,6 +3232,34 @@
32333232
remoteGlobalIDString = 68744C0C1BB1A9F700FE6542;
32343233
remoteInfo = watchkitapp;
32353234
};
3235+
9499182A1C04487E0060BDD8 /* PBXContainerItemProxy */ = {
3236+
isa = PBXContainerItemProxy;
3237+
containerPortal = D0A3F2F4195CA9EB009E0ACD /* pop.xcodeproj */;
3238+
proxyType = 2;
3239+
remoteGlobalIDString = 0755AE4F1BEA15950094AB41;
3240+
remoteInfo = "pop-tvos-framework";
3241+
};
3242+
9499182C1C04487E0060BDD8 /* PBXContainerItemProxy */ = {
3243+
isa = PBXContainerItemProxy;
3244+
containerPortal = D0A3F2F4195CA9EB009E0ACD /* pop.xcodeproj */;
3245+
proxyType = 2;
3246+
remoteGlobalIDString = ECF01ED318C92B7F009E0AD1;
3247+
remoteInfo = "pop-tests-ios";
3248+
};
3249+
9499182E1C04487E0060BDD8 /* PBXContainerItemProxy */ = {
3250+
isa = PBXContainerItemProxy;
3251+
containerPortal = D0A3F2F4195CA9EB009E0ACD /* pop.xcodeproj */;
3252+
proxyType = 2;
3253+
remoteGlobalIDString = EC7E319918C93D6500B38170;
3254+
remoteInfo = "pop-tests-osx";
3255+
};
3256+
949918301C04487E0060BDD8 /* PBXContainerItemProxy */ = {
3257+
isa = PBXContainerItemProxy;
3258+
containerPortal = D0A3F2F4195CA9EB009E0ACD /* pop.xcodeproj */;
3259+
proxyType = 2;
3260+
remoteGlobalIDString = 0755AE8C1BEA19580094AB41;
3261+
remoteInfo = "pop-tests-tvos";
3262+
};
32363263
D00C79121BBCA2FE00F979C8 /* PBXContainerItemProxy */ = {
32373264
isa = PBXContainerItemProxy;
32383265
containerPortal = D0A3F2F4195CA9EB009E0ACD /* pop.xcodeproj */;
@@ -5006,6 +5033,7 @@
50065033
93F6940516932F8700691086 /* TGBlockListRequestActor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TGBlockListRequestActor.mm; sourceTree = "<group>"; };
50075034
93FF24E416FE2431008F6AA8 /* TGLoginWelcomeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGLoginWelcomeController.h; sourceTree = "<group>"; };
50085035
93FF24E516FE2431008F6AA8 /* TGLoginWelcomeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TGLoginWelcomeController.m; sourceTree = "<group>"; };
5036+
949918781C071D220060BDD8 /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
50095037
D00040A315BCD2EA00AF9EBF /* TGMessage+Telegraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TGMessage+Telegraph.h"; sourceTree = "<group>"; };
50105038
D00040A415BCD2EA00AF9EBF /* TGMessage+Telegraph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TGMessage+Telegraph.m"; sourceTree = "<group>"; };
50115039
D00040AA15BCD53900AF9EBF /* TGImageInfo+Telegraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TGImageInfo+Telegraph.h"; sourceTree = "<group>"; };
@@ -7768,8 +7796,8 @@
77687796
D0E0B93F1ADFFE6800435821 /* TGGeometry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TGGeometry.m; sourceTree = "<group>"; };
77697797
D0E0B9411AE01C2600435821 /* TGColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGColor.h; sourceTree = "<group>"; };
77707798
D0E0B9421AE01C2600435821 /* TGColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TGColor.m; sourceTree = "<group>"; };
7771-
D0E26F571A83F27D009ECB56 /* MtProtoKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MtProtoKit.xcodeproj; path = ../MtProtoKit/MtProtoKit.xcodeproj; sourceTree = "<group>"; };
7772-
D0E2ABD618AFAB65008EDB82 /* libMtProtoKit_Legacy.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMtProtoKit_Legacy.a; path = "../MtProtoKit/build/Debug-iphoneos/libMtProtoKit_Legacy.a"; sourceTree = "<group>"; };
7799+
D0E26F571A83F27D009ECB56 /* MtProtoKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MtProtoKit.xcodeproj; path = submodules/MtProtoKit/MtProtoKit.xcodeproj; sourceTree = "<group>"; };
7800+
D0E2ABD618AFAB65008EDB82 /* libMtProtoKit_Legacy.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMtProtoKit_Legacy.a; path = "submodules/MtProtoKit/build/Debug-iphoneos/libMtProtoKit_Legacy.a"; sourceTree = "<group>"; };
77737801
D0E3C61B196361E400B133E0 /* BroadcastAvatarIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BroadcastAvatarIcon.png; path = Resources/BroadcastAvatarIcon.png; sourceTree = "<group>"; };
77747802
D0E3C61C196361E400B133E0 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/[email protected]"; sourceTree = "<group>"; };
77757803
D0E49ACC156FE9D700655FFE /* TGContactsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGContactsController.h; sourceTree = "<group>"; };
@@ -13121,6 +13149,7 @@
1312113149
9315E4DD186AFC52008DD74D /* [email protected] */,
1312213150
93BB2236180D986600342583 /* [email protected] */,
1312313151
9321E53817B585D7005229AC /* Icon.png */,
13152+
949918781C071D220060BDD8 /* config.h */,
1312413153
93EFBF0E173DC6DA00F7B89E /* Config.xcconfig */,
1312513154
D054F5681927F675002952ED /* libphonenumber.framework */,
1312613155
933E6A3E170B300100651252 /* MediaPlayer.framework */,
@@ -15341,8 +15370,12 @@
1534115370
isa = PBXGroup;
1534215371
children = (
1534315372
D0A3F2FC195CA9EC009E0ACD /* libpop.a */,
15344-
D0A3F2FE195CA9EC009E0ACD /* pop.framework */,
1534515373
D00C79131BBCA2FE00F979C8 /* pop.framework */,
15374+
D0A3F2FE195CA9EC009E0ACD /* pop.framework */,
15375+
9499182B1C04487E0060BDD8 /* pop.framework */,
15376+
9499182D1C04487E0060BDD8 /* pop-tests.xctest */,
15377+
9499182F1C04487E0060BDD8 /* pop-tests.xctest */,
15378+
949918311C04487E0060BDD8 /* pop-tests.xctest */,
1534615379
);
1534715380
name = Products;
1534815381
sourceTree = "<group>";
@@ -15665,6 +15698,7 @@
1566515698
D0C80D411A95624600D5DF8A /* sqlite3ext.h */,
1566615699
);
1566715700
name = sqlcipher;
15701+
path = ..;
1566815702
sourceTree = "<group>";
1566915703
};
1567015704
D0C80D721A965D0700D5DF8A /* Tooltip */ = {
@@ -17556,6 +17590,34 @@
1755617590
/* End PBXProject section */
1755717591

1755817592
/* Begin PBXReferenceProxy section */
17593+
9499182B1C04487E0060BDD8 /* pop.framework */ = {
17594+
isa = PBXReferenceProxy;
17595+
fileType = wrapper.framework;
17596+
path = pop.framework;
17597+
remoteRef = 9499182A1C04487E0060BDD8 /* PBXContainerItemProxy */;
17598+
sourceTree = BUILT_PRODUCTS_DIR;
17599+
};
17600+
9499182D1C04487E0060BDD8 /* pop-tests.xctest */ = {
17601+
isa = PBXReferenceProxy;
17602+
fileType = wrapper.cfbundle;
17603+
path = "pop-tests.xctest";
17604+
remoteRef = 9499182C1C04487E0060BDD8 /* PBXContainerItemProxy */;
17605+
sourceTree = BUILT_PRODUCTS_DIR;
17606+
};
17607+
9499182F1C04487E0060BDD8 /* pop-tests.xctest */ = {
17608+
isa = PBXReferenceProxy;
17609+
fileType = wrapper.cfbundle;
17610+
path = "pop-tests.xctest";
17611+
remoteRef = 9499182E1C04487E0060BDD8 /* PBXContainerItemProxy */;
17612+
sourceTree = BUILT_PRODUCTS_DIR;
17613+
};
17614+
949918311C04487E0060BDD8 /* pop-tests.xctest */ = {
17615+
isa = PBXReferenceProxy;
17616+
fileType = wrapper.cfbundle;
17617+
path = "pop-tests.xctest";
17618+
remoteRef = 949918301C04487E0060BDD8 /* PBXContainerItemProxy */;
17619+
sourceTree = BUILT_PRODUCTS_DIR;
17620+
};
1755917621
D00C79131BBCA2FE00F979C8 /* pop.framework */ = {
1756017622
isa = PBXReferenceProxy;
1756117623
fileType = wrapper.framework;
@@ -19417,7 +19479,6 @@
1941719479
D061F2BD1A9290250031BCBE /* PGCameraVolumeButtonHandler.m in Sources */,
1941819480
D098417719CB9BE200CE5BB0 /* TLSchemeType.mm in Sources */,
1941919481
D02CD02E19490FA5007700A2 /* TGWallpaperItemsBackgroundDecorationView.m in Sources */,
19420-
D0C80D421A95624600D5DF8A /* sqlite3.c in Sources */,
1942119482
932E00EE184B8CC40001D109 /* TGPreparedForwardedMessage.m in Sources */,
1942219483
D061F2F01A9290420031BCBE /* TGCameraModeControl.m in Sources */,
1942319484
68B63B891BB2581C00205AC3 /* TGBridgeSubscription.m in Sources */,
@@ -20739,7 +20800,7 @@
2073920800
HEADER_SEARCH_PATHS = (
2074020801
"$(inherited)",
2074120802
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
20742-
../MtProtoKit,
20803+
$SRCROOT/submodules/MtProtoKit,
2074320804
);
2074420805
INFOPLIST_FILE = Share/Info.plist;
2074520806
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -20782,7 +20843,7 @@
2078220843
HEADER_SEARCH_PATHS = (
2078320844
"$(inherited)",
2078420845
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
20785-
../MtProtoKit,
20846+
$SRCROOT/submodules/MtProtoKit,
2078620847
);
2078720848
INFOPLIST_FILE = Share/Info.plist;
2078820849
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -20917,7 +20978,7 @@
2091720978
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
2091820979
GCC_WARN_UNUSED_PARAMETER = YES;
2091920980
HEADER_SEARCH_PATHS = (
20920-
../MtProtoKit,
20981+
$SRCROOT/submodules/MtProtoKit,
2092120982
Telegraph/thirdparty/ogg,
2092220983
thirdparty/libphonenumber.framework/Headers,
2092320984
"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/include",
@@ -20936,8 +20997,8 @@
2093620997
"$(PROJECT_DIR)/Telegraph/thirdparty/opus/lib",
2093720998
"$(PROJECT_DIR)/thirdparty/WebP.framework",
2093820999
"$(PROJECT_DIR)/thirdparty/libbpg",
20939-
"$(SRCROOT)/../MtProtoKit/openssl/iOS",
20940-
"$(SRCROOT)/../MtProtoKit/openssl/OSX",
21000+
"$(SRCROOT)/submodules/MtProtoKit/openssl/iOS",
21001+
"$(SRCROOT)/submodules/MtProtoKit/openssl/OSX",
2094121002
);
2094221003
OTHER_CFLAGS = "";
2094321004
"OTHER_CFLAGS[arch=*]" = (
@@ -20947,7 +21008,10 @@
2094721008
"-DSQLCIPHER_CRYPTO_CC=1",
2094821009
"-DSQLITE_ENABLE_FTS3",
2094921010
);
20950-
OTHER_LDFLAGS = "-ObjC";
21011+
OTHER_LDFLAGS = (
21012+
"-ObjC",
21013+
"-lsqlite3",
21014+
);
2095121015
PRODUCT_NAME = Telegram;
2095221016
PROVISIONING_PROFILE = "";
2095321017
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -20996,15 +21060,15 @@
2099621060
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
2099721061
GCC_WARN_UNUSED_PARAMETER = YES;
2099821062
HEADER_SEARCH_PATHS = (
20999-
../MtProtoKit,
21063+
$SRCROOT/submodules/MtProtoKit,
2100021064
Telegraph/thirdparty/ogg,
2100121065
thirdparty/libphonenumber.framework/Headers,
2100221066
"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/include",
2100321067
legacy/TelegraphKit,
2100421068
legacy/TL/TL,
2100521069
legacy/TL,
2100621070
thirdparty/pop,
21007-
"$(SRCROOT)/../MtProtoKit/thirdparty/openssl",
21071+
"$(SRCROOT)/submodules/MtProtoKit/thirdparty/openssl",
2100821072
thirdparty/SSignalKit,
2100921073
);
2101021074
INFOPLIST_FILE = "Telegraph/Telegraph-Info.plist";
@@ -21014,8 +21078,8 @@
2101421078
"$(PROJECT_DIR)/Telegraph/thirdparty/opus/lib",
2101521079
"$(PROJECT_DIR)/thirdparty/WebP.framework",
2101621080
"$(PROJECT_DIR)/thirdparty/libbpg",
21017-
"$(SRCROOT)/../MtProtoKit/openssl/iOS",
21018-
"$(SRCROOT)/../MtProtoKit/openssl/OSX",
21081+
"$(SRCROOT)/submodules/MtProtoKit/openssl/iOS",
21082+
"$(SRCROOT)/submodules/MtProtoKit/openssl/OSX",
2101921083
);
2102021084
OTHER_CFLAGS = "";
2102121085
"OTHER_CFLAGS[arch=*]" = (
@@ -21025,7 +21089,10 @@
2102521089
"-DSQLCIPHER_CRYPTO_CC=1",
2102621090
"-DSQLITE_ENABLE_FTS3",
2102721091
);
21028-
OTHER_LDFLAGS = "-ObjC";
21092+
OTHER_LDFLAGS = (
21093+
"-ObjC",
21094+
"-lsqlite3",
21095+
);
2102921096
PRODUCT_NAME = Telegram;
2103021097
PROVISIONING_PROFILE = "ce29274a-b180-40d3-a08a-e3a99e02624a";
2103121098
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "ce29274a-b180-40d3-a08a-e3a99e02624a";

‎submodules/MtProtoKit‎

Submodule MtProtoKit added at 1240885

‎thirdparty/pop‎

Submodule pop added at c0792fd

0 commit comments

Comments
 (0)