fixed libexif static link in OS X, 0.5.7 ready for all systems

telegramdesktop · Jul 15, 2014 · e43d5ed · e43d5ed
1 parent 7c338f3
commit e43d5ed
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/Telegram/Prepare.bat b/Telegram/Prepare.bat
@@ -1 +1,3 @@
-Prepare.exe -path Telegram.exe -path Updater.exe
+cd ..\Win32\Deploy
+Prepare.exe -path Telegram.exe -path Updater.exe
+cd ..\..\Telegram
diff --git a/Telegram/Prepare.sh b/Telegram/Prepare.sh
@@ -31,8 +31,8 @@ if [ ! -f "./../Mac/Release/Telegram.app/Contents/Frameworks/Updater" ]; then
   exit 1
 fi
 
-if [ ! -f "./../Mac/Release/Telegram.dmg" ]; then
-  echo "Telegram.dmg not found!"
+if [ ! -f "./../Mac/Release/Telegram.app.dmg" ]; then
+  echo "Telegram.app.dmg not found!"
   exit 1
 fi
 
@@ -46,8 +46,10 @@ fi
 echo "Copying Telegram.app and tmacupd$AppVersion to deploy/$AppVersionStr..";
 mkdir "./../Mac/Release/deploy/$AppVersionStr"
 mkdir "./../Mac/Release/deploy/$AppVersionStr/Telegram"
-mv ./../Mac/Release/Telegram.app ./../Mac/Release/deploy/$AppVersionStr/Telegram/
+cp -r ./../Mac/Release/Telegram.app ./../Mac/Release/deploy/$AppVersionStr/Telegram/
+rm ./../Mac/Release/Telegram.app/Contents/MacOS/Telegram
+rm ./../Mac/Release/Telegram.app/Contents/Frameworks/Updater
 mv ./../Mac/Release/tmacupd$AppVersion ./../Mac/Release/deploy/$AppVersionStr/
-mv ./../Mac/Release/Telegram.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg
+mv ./../Mac/Release/Telegram.app.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg
 echo "Version $AppVersionStr prepared!";
 
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -140,7 +140,6 @@
 		B3C3392253201C328D9C6736 /* qtaudio_coreaudio in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 3BBB805F6180E363BF89151A /* qtaudio_coreaudio */; };
 		B3CD52E504409DC1B560024F /* countrycodeinput.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 751C8D0E0BE6D16937B77A2C /* countrycodeinput.cpp */; settings = {ATTRIBUTES = (); }; };
 		B460F624007324313696BE86 /* QuartzCore.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 7EC00404ACD5AB0E97726B0E /* QuartzCore.framework */; };
-		B58956C9C026BD3A7FD9ECDF /* libexif.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 4AF15B5A0A43EB62D6DAF211 /* libexif.a */; };
 		B6346B66B0A2228A91D8A5D9 /* mtpDC.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 315C7FACB4A9E18AA95486CA /* mtpDC.cpp */; settings = {ATTRIBUTES = (); }; };
 		B6F50D5FBFAEB16DD0E5B1C3 /* moc_countrycodeinput.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = A1F48DF3E5D0D7C741C1EAC4 /* moc_countrycodeinput.cpp */; settings = {ATTRIBUTES = (); }; };
 		B780F9E21269259B90A1F32A /* moc_mtpDC.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 2C540BAEABD7F9B5FA11008E /* moc_mtpDC.cpp */; settings = {ATTRIBUTES = (); }; };
@@ -608,7 +607,6 @@
 			files = (
 				07055CC4194EE85B0008DEF6 /* libcrypto.a in Link Binary With Libraries */,
 				1BB705CDB741E2B7450201A5 /* Cocoa.framework in Link Binary With Libraries */,
-				B58956C9C026BD3A7FD9ECDF /* libexif.a in Link Binary With Libraries */,
 				328FD74542F6E2C873EE4D4B /* ApplicationServices.framework in Link Binary With Libraries */,
 				668DDDA0C55405E7FCFD6CA5 /* CoreServices.framework in Link Binary With Libraries */,
 				F8B465CE34D8DF87AAE95913 /* CoreFoundation.framework in Link Binary With Libraries */,
@@ -1602,6 +1600,7 @@
 					"-lz",
 					"-lm",
 					/usr/local/lib/liblzma.a,
+					/usr/local/lib/libexif.a,
 				);
 				PRODUCT_NAME = Telegram;
 				QT_LIBRARY_SUFFIX = "";
@@ -1726,6 +1725,7 @@
 					"-lz",
 					"-lm",
 					/usr/local/lib/liblzma.a,
+					/usr/local/lib/libexif.a,
 				);
 				PRODUCT_NAME = Telegram;
 				QT_LIBRARY_SUFFIX = _debug;

diff --git a/Telegram/Telegram.xcodeproj/qt_preprocess.mak b/Telegram/Telegram.xcodeproj/qt_preprocess.mak
@@ -70,9 +70,10 @@ GeneratedFiles/qrc_telegram.cpp: SourceFiles/telegram.qrc \
 		SourceFiles/art/bg_200x.png \
 		SourceFiles/art/emoji_125x.png \
 		SourceFiles/art/bg_125x.png \
-		SourceFiles/art/OpenSans-Regular.ttf \
-                SourceFiles/art/OpenSans-Bold.ttf \
-                SourceFiles/art/OpenSans-Semibold.ttf \
+		SourceFiles/art/fonts/DejaVuSans.ttf \
+		SourceFiles/art/fonts/OpenSans-Regular.ttf \
+                SourceFiles/art/fonts/OpenSans-Bold.ttf \
+                SourceFiles/art/fonts/OpenSans-Semibold.ttf \
 		SourceFiles/qmime/freedesktop.org.xml \
 		SourceFiles/art/usercolor4.png \
 		SourceFiles/art/chatcolor1.png \