mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-03-25 04:38:23 +00:00
Fix build in Xcode.
This commit is contained in:
parent
383195f1b2
commit
860353824b
@ -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"
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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>
|
||||
|
@ -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"
|
||||
|
@ -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',
|
||||
|
@ -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
|
||||
|
@ -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 ..
|
||||
|
Loading…
Reference in New Issue
Block a user