Skip to content

Commit e43d5ed

Browse files
committed
fixed libexif static link in OS X, 0.5.7 ready for all systems
1 parent 7c338f3 commit e43d5ed

4 files changed

Lines changed: 15 additions & 10 deletions

File tree

Telegram/Prepare.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
Prepare.exe -path Telegram.exe -path Updater.exe
1+
cd ..\Win32\Deploy
2+
Prepare.exe -path Telegram.exe -path Updater.exe
3+
cd ..\..\Telegram

Telegram/Prepare.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ if [ ! -f "./../Mac/Release/Telegram.app/Contents/Frameworks/Updater" ]; then
3131
exit 1
3232
fi
3333

34-
if [ ! -f "./../Mac/Release/Telegram.dmg" ]; then
35-
echo "Telegram.dmg not found!"
34+
if [ ! -f "./../Mac/Release/Telegram.app.dmg" ]; then
35+
echo "Telegram.app.dmg not found!"
3636
exit 1
3737
fi
3838

@@ -46,8 +46,10 @@ fi
4646
echo "Copying Telegram.app and tmacupd$AppVersion to deploy/$AppVersionStr..";
4747
mkdir "./../Mac/Release/deploy/$AppVersionStr"
4848
mkdir "./../Mac/Release/deploy/$AppVersionStr/Telegram"
49-
mv ./../Mac/Release/Telegram.app ./../Mac/Release/deploy/$AppVersionStr/Telegram/
49+
cp -r ./../Mac/Release/Telegram.app ./../Mac/Release/deploy/$AppVersionStr/Telegram/
50+
rm ./../Mac/Release/Telegram.app/Contents/MacOS/Telegram
51+
rm ./../Mac/Release/Telegram.app/Contents/Frameworks/Updater
5052
mv ./../Mac/Release/tmacupd$AppVersion ./../Mac/Release/deploy/$AppVersionStr/
51-
mv ./../Mac/Release/Telegram.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg
53+
mv ./../Mac/Release/Telegram.app.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg
5254
echo "Version $AppVersionStr prepared!";
5355

Telegram/Telegram.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140
B3C3392253201C328D9C6736 /* qtaudio_coreaudio in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 3BBB805F6180E363BF89151A /* qtaudio_coreaudio */; };
141141
B3CD52E504409DC1B560024F /* countrycodeinput.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 751C8D0E0BE6D16937B77A2C /* countrycodeinput.cpp */; settings = {ATTRIBUTES = (); }; };
142142
B460F624007324313696BE86 /* QuartzCore.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 7EC00404ACD5AB0E97726B0E /* QuartzCore.framework */; };
143-
B58956C9C026BD3A7FD9ECDF /* libexif.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 4AF15B5A0A43EB62D6DAF211 /* libexif.a */; };
144143
B6346B66B0A2228A91D8A5D9 /* mtpDC.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 315C7FACB4A9E18AA95486CA /* mtpDC.cpp */; settings = {ATTRIBUTES = (); }; };
145144
B6F50D5FBFAEB16DD0E5B1C3 /* moc_countrycodeinput.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = A1F48DF3E5D0D7C741C1EAC4 /* moc_countrycodeinput.cpp */; settings = {ATTRIBUTES = (); }; };
146145
B780F9E21269259B90A1F32A /* moc_mtpDC.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 2C540BAEABD7F9B5FA11008E /* moc_mtpDC.cpp */; settings = {ATTRIBUTES = (); }; };
@@ -608,7 +607,6 @@
608607
files = (
609608
07055CC4194EE85B0008DEF6 /* libcrypto.a in Link Binary With Libraries */,
610609
1BB705CDB741E2B7450201A5 /* Cocoa.framework in Link Binary With Libraries */,
611-
B58956C9C026BD3A7FD9ECDF /* libexif.a in Link Binary With Libraries */,
612610
328FD74542F6E2C873EE4D4B /* ApplicationServices.framework in Link Binary With Libraries */,
613611
668DDDA0C55405E7FCFD6CA5 /* CoreServices.framework in Link Binary With Libraries */,
614612
F8B465CE34D8DF87AAE95913 /* CoreFoundation.framework in Link Binary With Libraries */,
@@ -1602,6 +1600,7 @@
16021600
"-lz",
16031601
"-lm",
16041602
/usr/local/lib/liblzma.a,
1603+
/usr/local/lib/libexif.a,
16051604
);
16061605
PRODUCT_NAME = Telegram;
16071606
QT_LIBRARY_SUFFIX = "";
@@ -1726,6 +1725,7 @@
17261725
"-lz",
17271726
"-lm",
17281727
/usr/local/lib/liblzma.a,
1728+
/usr/local/lib/libexif.a,
17291729
);
17301730
PRODUCT_NAME = Telegram;
17311731
QT_LIBRARY_SUFFIX = _debug;

Telegram/Telegram.xcodeproj/qt_preprocess.mak

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ GeneratedFiles/qrc_telegram.cpp: SourceFiles/telegram.qrc \
7070
SourceFiles/art/bg_200x.png \
7171
SourceFiles/art/emoji_125x.png \
7272
SourceFiles/art/bg_125x.png \
73-
SourceFiles/art/OpenSans-Regular.ttf \
74-
SourceFiles/art/OpenSans-Bold.ttf \
75-
SourceFiles/art/OpenSans-Semibold.ttf \
73+
SourceFiles/art/fonts/DejaVuSans.ttf \
74+
SourceFiles/art/fonts/OpenSans-Regular.ttf \
75+
SourceFiles/art/fonts/OpenSans-Bold.ttf \
76+
SourceFiles/art/fonts/OpenSans-Semibold.ttf \
7677
SourceFiles/qmime/freedesktop.org.xml \
7778
SourceFiles/art/usercolor4.png \
7879
SourceFiles/art/chatcolor1.png \

0 commit comments

Comments
 (0)