Skip to content

Commit b86da76

Browse files
committedMay 18, 2017
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.
1 parent 59100a5 commit b86da76

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed
 

‎Telegram/gyp/refresh.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ if not "%TDESKTOP_BUILD_DEFINES%" == "" (
2828
set GYP_MSVS_VERSION=2015
2929

3030
cd "%FullScriptPath%"
31-
call gyp --depth=. --generator-output=../.. -Goutput_dir=out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=ninja
31+
call gyp --depth=. --generator-output=.. -Goutput_dir=../out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=ninja
3232
if %errorlevel% neq 0 goto error
33-
call gyp --depth=. --generator-output=../.. -Goutput_dir=out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=msvs-ninja
33+
call gyp --depth=. --generator-output=.. -Goutput_dir=../out !BUILD_DEFINES! -Dofficial_build_target=%BuildTarget% Telegram.gyp --format=msvs-ninja
3434
if %errorlevel% neq 0 goto error
3535
cd ../..
3636

‎Telegram/gyp/refresh.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ MySystem=`uname -s`
1717
cd $FullScriptPath
1818

1919
if [ "$MySystem" == "Linux" ]; then
20-
../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out -Dofficial_build_target=$BuildTarget Telegram.gyp --format=cmake
20+
../../../Libraries/gyp/gyp --depth=. --generator-output=.. -Goutput_dir=../out -Dofficial_build_target=$BuildTarget Telegram.gyp --format=cmake
2121
cd ../../out/Debug
2222
../../../Libraries/cmake-3.6.2/bin/cmake .
2323
cd ../Release
@@ -28,7 +28,7 @@ else
2828
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode-ninja
2929
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode
3030
# use patched gyp with Xcode project generator
31-
../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out -Gxcode_upgrade_check_project_version=830 -Dofficial_build_target=$BuildTarget Telegram.gyp --format=xcode
31+
../../../Libraries/gyp/gyp --depth=. --generator-output=.. -Goutput_dir=../out -Gxcode_upgrade_check_project_version=830 -Dofficial_build_target=$BuildTarget Telegram.gyp --format=xcode
3232
fi
3333

3434
cd ../..

‎docs/building-msvc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,6 @@ After, call `gyp\refresh.bat` (python 2.7 needed)
300300

301301
#### Build the project
302302

303-
* File > Open > Project/Solution > **D:\TBuild\tdesktop\Telegram.sln**
303+
* File > Open > Project/Solution > **D:\TBuild\tdesktop\Telegram\Telegram.sln**
304304
* Select Telegram project and press Build > Build Telegram (Debug and Release configurations)
305305
* The result Telegram.exe will be located in **D:\TBuild\tdesktop\out\Debug** (and **Release**)

‎docs/building-xcode.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,4 +233,4 @@ In Terminal go to **/home/user/TBuild/tdesktop/Telegram** and run
233233

234234
gyp/refresh.sh
235235

236-
Then launch Xcode, open **/Users/user/TBuild/tdesktop/Telegram.xcodeproj** and build for Debug / Release.
236+
Then launch Xcode, open **/Users/user/TBuild/tdesktop/Telegram/Telegram.xcodeproj** and build for Debug / Release.

0 commit comments

Comments
 (0)
Please sign in to comment.