Remove 'mac32' and add 'osx' special targets.

This commit is contained in:
John Preston
2019-11-05 15:27:42 +03:00
parent 9a44531953
commit b94ed1fc3b
14 changed files with 96 additions and 98 deletions
+5 -5
View File
@@ -44,11 +44,11 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3
git clone https://github.com/telegramdesktop/zlib.git
git clone https://github.com/madler/zlib.git
cd zlib
./configure
make $MAKE_THREADS_CNT
@@ -232,9 +232,9 @@ Go to ***BuildPath*** and run
cd qtbase
git apply ../../patches/qtbase_5_12_5.diff
cd src/plugins/platforminputcontexts
git clone https://github.com/telegramdesktop/fcitx.git
git clone https://github.com/telegramdesktop/hime.git
git clone https://github.com/telegramdesktop/nimf.git
git clone https://github.com/desktop-app/fcitx.git
git clone https://github.com/desktop-app/hime.git
git clone https://github.com/desktop-app/nimf.git
cd ../../../..
./configure -prefix "/usr/local/desktop-app/Qt-5.12.5" -release -force-debug-info -opensource -confirm-license -qt-zlib -qt-libpng -qt-libjpeg -qt-harfbuzz -qt-pcre -qt-xcb -system-freetype -fontconfig -no-opengl -no-gtk -static -openssl-linked -I "/usr/local/desktop-app/openssl-1.1.1/include" OPENSSL_LIBS="/usr/local/desktop-app/openssl-1.1.1/lib/libssl.a /usr/local/desktop-app/openssl-1.1.1/lib/libcrypto.a -ldl -lpthread" -nomake examples -nomake tests
+5 -5
View File
@@ -32,7 +32,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
cd ThirdParty
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df4
cd ../
git clone https://chromium.googlesource.com/external/gyp
cd gyp
@@ -64,11 +64,11 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
cd ../
git checkout b0ec5df
cd ..
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3 range-v3
git clone https://github.com/telegramdesktop/lzma.git
git clone https://github.com/desktop-app/lzma.git
cd lzma\C\Util\LzmaLib
msbuild LzmaLib.sln /property:Configuration=Debug
msbuild LzmaLib.sln /property:Configuration=Release
@@ -93,7 +93,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
move ossl_static.pdb out32
cd ..
git clone https://github.com/telegramdesktop/zlib.git
git clone https://github.com/desktop-app/zlib.git
cd zlib
git checkout tdesktop
cd contrib\vstudio\vc14
+3 -3
View File
@@ -33,7 +33,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -50,7 +50,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3
@@ -60,7 +60,7 @@ Go to ***BuildPath*** and run
sudo make install
cd ..
git clone https://github.com/telegramdesktop/zlib.git
git clone https://github.com/desktop-app/zlib.git
cd zlib
CFLAGS="-mmacosx-version-min=10.10 -Werror=unguarded-availability-new" LDFLAGS="-mmacosx-version-min=10.10" ./configure
make $MAKE_THREADS_CNT
+5 -5
View File
@@ -33,7 +33,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -50,7 +50,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3
@@ -60,7 +60,7 @@ Go to ***BuildPath*** and run
sudo make install
cd ..
git clone https://github.com/telegramdesktop/zlib.git
git clone https://github.com/desktop-app/zlib.git
cd zlib
CFLAGS="-mmacosx-version-min=10.12 -Werror=unguarded-availability-new" LDFLAGS="-mmacosx-version-min=10.12" ./configure --prefix=/usr/local/macos
make $MAKE_THREADS_CNT
@@ -213,12 +213,12 @@ Go to ***BuildPath*** and run
git clone https://chromium.googlesource.com/crashpad/crashpad.git
cd crashpad
git checkout feb3aa3923
git apply ../../../tdesktop/Telegram/Patches/crashpad.diff
git apply ../../patches/crashpad.diff
cd third_party/mini_chromium
git clone https://chromium.googlesource.com/chromium/mini_chromium
cd mini_chromium
git checkout 7c5b0c1ab4
git apply ../../../../../../tdesktop/Telegram/Patches/mini_chromium.diff
git apply ../../../../../patches/mini_chromium.diff
cd ../../gtest
git clone https://chromium.googlesource.com/external/github.com/google/googletest gtest
cd gtest