mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-04-07 18:15:05 +00:00
Move project files tdesktop to tdesktop/Telegram.
After adding the libtgvoip submodule its project was created by GYP outside the project folder, because the relative path to libtgvoip.gyp is "../ThirdParty/libtgvoip/" and projects are created in the same relative folders. Now we place MSVC and Xcode projects in tdesktop/Telegram, so the libtgvoip project is created at tdesktop/ThirdParty/libtgvoip.
This commit is contained in:
parent
59100a51c6
commit
b86da76613
@ -28,9 +28,9 @@ if not "%TDESKTOP_BUILD_DEFINES%" == "" (
|
|||||||
set GYP_MSVS_VERSION=2015
|
set GYP_MSVS_VERSION=2015
|
||||||
|
|
||||||
cd "%FullScriptPath%"
|
cd "%FullScriptPath%"
|
||||||
call gyp --depth=. --generator-output=../.. -Goutput_dir=out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=ninja
|
call gyp --depth=. --generator-output=.. -Goutput_dir=../out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=ninja
|
||||||
if %errorlevel% neq 0 goto error
|
if %errorlevel% neq 0 goto error
|
||||||
call gyp --depth=. --generator-output=../.. -Goutput_dir=out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=msvs-ninja
|
call gyp --depth=. --generator-output=.. -Goutput_dir=../out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=msvs-ninja
|
||||||
if %errorlevel% neq 0 goto error
|
if %errorlevel% neq 0 goto error
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ MySystem=`uname -s`
|
|||||||
cd $FullScriptPath
|
cd $FullScriptPath
|
||||||
|
|
||||||
if [ "$MySystem" == "Linux" ]; then
|
if [ "$MySystem" == "Linux" ]; then
|
||||||
../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out -Dofficial_build_target=$BuildTarget Telegram.gyp --format=cmake
|
../../../Libraries/gyp/gyp --depth=. --generator-output=.. -Goutput_dir=../out -Dofficial_build_target=$BuildTarget Telegram.gyp --format=cmake
|
||||||
cd ../../out/Debug
|
cd ../../out/Debug
|
||||||
../../../Libraries/cmake-3.6.2/bin/cmake .
|
../../../Libraries/cmake-3.6.2/bin/cmake .
|
||||||
cd ../Release
|
cd ../Release
|
||||||
@ -28,7 +28,7 @@ else
|
|||||||
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode-ninja
|
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode-ninja
|
||||||
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode
|
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode
|
||||||
# use patched gyp with Xcode project generator
|
# use patched gyp with Xcode project generator
|
||||||
../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out -Gxcode_upgrade_check_project_version=830 -Dofficial_build_target=$BuildTarget Telegram.gyp --format=xcode
|
../../../Libraries/gyp/gyp --depth=. --generator-output=.. -Goutput_dir=../out -Gxcode_upgrade_check_project_version=830 -Dofficial_build_target=$BuildTarget Telegram.gyp --format=xcode
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd ../..
|
cd ../..
|
||||||
|
@ -300,6 +300,6 @@ After, call `gyp\refresh.bat` (python 2.7 needed)
|
|||||||
|
|
||||||
#### Build the project
|
#### Build the project
|
||||||
|
|
||||||
* File > Open > Project/Solution > **D:\TBuild\tdesktop\Telegram.sln**
|
* File > Open > Project/Solution > **D:\TBuild\tdesktop\Telegram\Telegram.sln**
|
||||||
* Select Telegram project and press Build > Build Telegram (Debug and Release configurations)
|
* Select Telegram project and press Build > Build Telegram (Debug and Release configurations)
|
||||||
* The result Telegram.exe will be located in **D:\TBuild\tdesktop\out\Debug** (and **Release**)
|
* The result Telegram.exe will be located in **D:\TBuild\tdesktop\out\Debug** (and **Release**)
|
||||||
|
@ -233,4 +233,4 @@ In Terminal go to **/home/user/TBuild/tdesktop/Telegram** and run
|
|||||||
|
|
||||||
gyp/refresh.sh
|
gyp/refresh.sh
|
||||||
|
|
||||||
Then launch Xcode, open **/Users/user/TBuild/tdesktop/Telegram.xcodeproj** and build for Debug / Release.
|
Then launch Xcode, open **/Users/user/TBuild/tdesktop/Telegram/Telegram.xcodeproj** and build for Debug / Release.
|
||||||
|
Loading…
Reference in New Issue
Block a user