Use new defaults in configure invocations.
This commit is contained in:
parent
094010a91d
commit
42015d6a72
|
@ -89,7 +89,7 @@ jobs:
|
||||||
|
|
||||||
- name: Libraries.
|
- name: Libraries.
|
||||||
run: |
|
run: |
|
||||||
./$REPO_NAME/Telegram/build/prepare/mac.sh skip-release silent skip-qt5 qt6
|
./$REPO_NAME/Telegram/build/prepare/mac.sh skip-release silent
|
||||||
|
|
||||||
- name: Telegram Desktop build.
|
- name: Telegram Desktop build.
|
||||||
if: env.ONLY_CACHE == 'false'
|
if: env.ONLY_CACHE == 'false'
|
||||||
|
@ -109,7 +109,6 @@ jobs:
|
||||||
-D CMAKE_C_FLAGS="-Werror" \
|
-D CMAKE_C_FLAGS="-Werror" \
|
||||||
-D CMAKE_CXX_FLAGS="-Werror" \
|
-D CMAKE_CXX_FLAGS="-Werror" \
|
||||||
-D TDESKTOP_API_TEST=ON \
|
-D TDESKTOP_API_TEST=ON \
|
||||||
-D DESKTOP_APP_QT6=ON \
|
|
||||||
-D DESKTOP_APP_USE_PACKAGED=OFF \
|
-D DESKTOP_APP_USE_PACKAGED=OFF \
|
||||||
-D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
|
-D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
|
||||||
$DEFINE
|
$DEFINE
|
||||||
|
|
|
@ -249,7 +249,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then
|
||||||
rm -rf "$ReleasePath/$BinaryName.app/Contents/_CodeSignature"
|
rm -rf "$ReleasePath/$BinaryName.app/Contents/_CodeSignature"
|
||||||
rm -rf "$ReleasePath/Updater"
|
rm -rf "$ReleasePath/Updater"
|
||||||
|
|
||||||
./configure.sh -D DESKTOP_APP_QT6=ON -D DESKTOP_APP_MAC_ARCH="x86_64;arm64"
|
./configure.sh
|
||||||
|
|
||||||
cd $ProjectPath
|
cd $ProjectPath
|
||||||
cmake --build . --config Release --target Telegram
|
cmake --build . --config Release --target Telegram
|
||||||
|
|
|
@ -59,7 +59,7 @@ if building:
|
||||||
finish(1, 'Todays updates version exists.')
|
finish(1, 'Todays updates version exists.')
|
||||||
|
|
||||||
if uuid == '':
|
if uuid == '':
|
||||||
result = subprocess.call('./configure.sh -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64"', shell=True)
|
result = subprocess.call('./configure.sh', shell=True)
|
||||||
if result != 0:
|
if result != 0:
|
||||||
finish(1, 'While calling GYP.')
|
finish(1, 'While calling GYP.')
|
||||||
|
|
||||||
|
|
2
cmake
2
cmake
|
@ -1 +1 @@
|
||||||
Subproject commit 410223b538e2d49d0b911648694ac878fd0596f9
|
Subproject commit 62f37fd1f68aece06470305d91afce7056aebc7c
|
Loading…
Reference in New Issue