MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build in Xcode.

Browse Source
This commit is contained in:
John Preston 2019-09-18 11:36:04 +03:00
parent 383195f1b2
commit 860353824b
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
View File

@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "platform/mac/file_utilities_mac.h"
#include "base/platform/mac/base_platform_mac_utilities.h"
#include "base/platform/mac/base_platform_utilities_mac.h"
#include "lang/lang_keys.h"
#include "styles/style_window.h"

2
Telegram/SourceFiles/platform/mac/launcher_mac.mm
View File

@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/crash_reports.h"
#include "core/update_checker.h"
#include "base/platform/base_platform_info.h"
#include "base/platform/mac/base_platform_mac_utilities.h"
#include "base/platform/mac/base_platform_utilities_mac.h"
#include "platform/platform_specific.h"
#include <Cocoa/Cocoa.h>

2
Telegram/SourceFiles/platform/mac/mac_touchbar.mm
View File

@ -28,7 +28,7 @@
#include "mainwidget.h"
#include "mainwindow.h"
#include "observer_peer.h"
#include "base/platform/mac/base_platform_mac_utilities.h"
#include "base/platform/mac/base_platform_utilities_mac.h"
#include "stickers.h"
#include "styles/style_dialogs.h"
#include "styles/style_media_player.h"

2
Telegram/SourceFiles/platform/mac/main_window_mac.mm
View File

@ -30,7 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/peer_list_controllers.h"
#include "boxes/about_box.h"
#include "lang/lang_keys.h"
#include "base/platform/mac/base_platform_mac_utilities.h"
#include "base/platform/mac/base_platform_utilities_mac.h"
#include "ui/widgets/input_fields.h"
#include "facades.h"
#include "app.h"

2
Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
View File

@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/platform/base_platform_info.h"
#include "platform/platform_specific.h"
#include "base/platform/mac/base_platform_mac_utilities.h"
#include "base/platform/mac/base_platform_utilities_mac.h"
#include "history/history.h"
#include "ui/empty_userpic.h"
#include "mainwindow.h"

2
Telegram/SourceFiles/platform/mac/specific_mac.mm
View File

@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h"
#include "mainwindow.h"
#include "history/history_location_manager.h"
#include "base/platform/mac/base_platform_mac_utilities.h"
#include "base/platform/mac/base_platform_utilities_mac.h"
#include "facades.h"
#include <QtGui/QDesktopServices>

2
Telegram/SourceFiles/platform/mac/specific_mac_p.mm
View File

@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/audio/media_audio.h"
#include "media/player/media_player_instance.h"
#include "platform/mac/mac_touchbar.h"
#include "base/platform/mac/base_platform_mac_utilities.h"
#include "base/platform/mac/base_platform_utilities_mac.h"
#include "base/platform/base_platform_info.h"
#include "lang/lang_keys.h"
#include "base/timer.h"

6
Telegram/gyp/telegram/mac.gypi
View File

@ -10,7 +10,7 @@
'mac_bundle': '1',
'mac_bundle_resources': [
'<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")',
'../Telegram/Images.xcassets',
'<(DEPTH)/../Telegram/Images.xcassets',
],
'xcode_settings': {
'INFOPLIST_FILE': '../Telegram.plist',
@ -30,7 +30,7 @@
'/usr/local/lib',
],
'sources': [
'../Telegram/Telegram.entitlements',
'<(DEPTH)/../Telegram/Telegram.entitlements',
],
'configurations': {
'Debug': {
@ -199,7 +199,7 @@
'mac_sandbox_development_team': '6N38VWS5BX',
'product_name': 'Telegram Desktop',
'sources': [
'../Telegram/Telegram Desktop.entitlements',
'<(DEPTH)/../Telegram/Telegram Desktop.entitlements',
],
'xcode_settings': {
'PRODUCT_BUNDLE_IDENTIFIER': 'org.telegram.desktop',

2
docs/building-cmake.md
View File

@ -228,7 +228,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/telegramdesktop/nimf.git
cd ../../../..
./configure -prefix "/usr/local/tdesktop/Qt-5.6.2" -release -force-debug-info -opensource -confirm-license -qt-zlib -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb -qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static -openssl-linked -nomake examples -nomake tests
./configure -prefix "/usr/local/desktop-app/Qt-5.6.2" -release -force-debug-info -opensource -confirm-license -qt-zlib -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb -qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static -openssl-linked -nomake examples -nomake tests
make $MAKE_THREADS_CNT
sudo make install

2
docs/building-xcode.md
View File

@ -225,7 +225,7 @@ Go to ***BuildPath*** and run
cd qtimageformats && git checkout v5.6.2 && cd ..
cd qtbase && git checkout v5.6.2 && git apply ../../../tdesktop/Telegram/Patches/qtbase_5_6_2.diff && cd ..
./configure -prefix "/usr/local/tdesktop/Qt-5.6.2" -debug-and-release -force-debug-info -opensource -confirm-license -static -opengl desktop -no-openssl -securetransport -nomake examples -nomake tests -platform macx-clang
./configure -prefix "/usr/local/desktop-app/Qt-5.6.2" -debug-and-release -force-debug-info -opensource -confirm-license -static -opengl desktop -no-openssl -securetransport -nomake examples -nomake tests -platform macx-clang
make $MAKE_THREADS_CNT
sudo make install
cd ..