diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e1e9013710..d8741a3af4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -97,7 +97,6 @@ jobs: -D CMAKE_CXX_FLAGS="-Werror" \ -D CMAKE_EXE_LINKER_FLAGS="-s" \ -D TDESKTOP_API_TEST=ON \ - -D DESKTOP_APP_USE_PACKAGED=OFF \ -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \ $DEFINE diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 695b6fa403..4f10695d4f 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -114,7 +114,6 @@ jobs: -D CMAKE_C_FLAGS="-Werror" \ -D CMAKE_CXX_FLAGS="-Werror" \ -D TDESKTOP_API_TEST=ON \ - -D DESKTOP_APP_USE_PACKAGED=OFF \ -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \ $DEFINE diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 486b61a15c..64ed2e37a5 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -149,7 +149,6 @@ jobs: call configure.bat ^ ${{ matrix.arch }} ^ -D TDESKTOP_API_TEST=ON ^ - -D DESKTOP_APP_USE_PACKAGED=OFF ^ -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF ^ -D DESKTOP_APP_NO_PDB=ON ^ %TDESKTOP_BUILD_DEFINE% ^ diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake index 9b8ec54422..fab5e1a3c3 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake @@ -17,11 +17,13 @@ if (DESKTOP_APP_USE_PACKAGED) endif() endif() +include(CMakeDependentOption) + add_library(lib_tgvoip_bundled STATIC) init_target(lib_tgvoip_bundled) -option(LIBTGVOIP_DISABLE_ALSA "Disable libtgvoip's ALSA backend (Linux only)." OFF) -option(LIBTGVOIP_DISABLE_PULSEAUDIO "Disable libtgvoip's PulseAudio backend (Linux only)." OFF) +cmake_dependent_option(LIBTGVOIP_DISABLE_ALSA "Disable libtgvoip's ALSA backend." OFF LINUX ON) +cmake_dependent_option(LIBTGVOIP_DISABLE_PULSEAUDIO "Disable libtgvoip's PulseAudio backend." OFF LINUX ON) set(tgvoip_loc ${third_party_loc}/libtgvoip) diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake index 5fe70fb2a0..1c3c254313 100644 --- a/Telegram/cmake/telegram_options.cmake +++ b/Telegram/cmake/telegram_options.cmake @@ -7,7 +7,10 @@ option(TDESKTOP_API_TEST "Use test API credentials." OFF) set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") -set(TDESKTOP_LAUNCHER_BASENAME "" CACHE STRING "Desktop file base name (Linux only).") + +if (LINUX) + set(TDESKTOP_LAUNCHER_BASENAME "" CACHE STRING "Desktop file base name.") +endif() if (TDESKTOP_API_TEST) set(TDESKTOP_API_ID 17349) diff --git a/cmake b/cmake index 9615515b06..50a67393ab 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9615515b069a1d3174fc45f9de69a23b616b80b3 +Subproject commit 50a67393abfc8b9d1fb69035dd373d394f78b477 diff --git a/docs/building-linux.md b/docs/building-linux.md index f647ceaeed..a63def593e 100644 --- a/docs/building-linux.md +++ b/docs/building-linux.md @@ -24,9 +24,7 @@ Go up to the `tdesktop` directory and run (using [your **api_id** and **api_hash tdesktop:centos_env \ /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \ -D TDESKTOP_API_ID=YOUR_API_ID \ - -D TDESKTOP_API_HASH=YOUR_API_HASH \ - -D DESKTOP_APP_USE_PACKAGED=OFF \ - -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF + -D TDESKTOP_API_HASH=YOUR_API_HASH Or, to create a debug build, run (also using [your **api_id** and **api_hash**](#obtain-your-api-credentials)) @@ -36,9 +34,7 @@ Or, to create a debug build, run (also using [your **api_id** and **api_hash**]( tdesktop:centos_env \ /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \ -D TDESKTOP_API_ID=YOUR_API_ID \ - -D TDESKTOP_API_HASH=YOUR_API_HASH \ - -D DESKTOP_APP_USE_PACKAGED=OFF \ - -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF + -D TDESKTOP_API_HASH=YOUR_API_HASH The built files will be in the `out` directory. diff --git a/docs/building-mac.md b/docs/building-mac.md index 4d1b5888c2..c9bd02fbf7 100644 --- a/docs/building-mac.md +++ b/docs/building-mac.md @@ -24,7 +24,7 @@ Go to ***BuildPath*** and run Go to ***BuildPath*/tdesktop/Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials)) - ./configure.sh -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF + ./configure.sh -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH Then launch Xcode, open ***BuildPath*/tdesktop/out/Telegram.xcodeproj** and build for Debug / Release. diff --git a/docs/building-win-x64.md b/docs/building-win-x64.md index 7c7fa82806..0f6861c4bc 100644 --- a/docs/building-win-x64.md +++ b/docs/building-win-x64.md @@ -55,7 +55,7 @@ Open **x64 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** Go to ***BuildPath*\\tdesktop\\Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials)) - configure.bat x64 -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF + configure.bat x64 -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH * Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2022 * Select Telegram project and press Build > Build Telegram (Debug and Release configurations) diff --git a/docs/building-win.md b/docs/building-win.md index bc7d246fc5..7c24751a1d 100644 --- a/docs/building-win.md +++ b/docs/building-win.md @@ -55,7 +55,7 @@ Open **x86 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** Go to ***BuildPath*\\tdesktop\\Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials)) - configure.bat -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF + configure.bat -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH * Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2022 * Select Telegram project and press Build > Build Telegram (Debug and Release configurations)