diff --git a/Telegram/gyp/refresh.bat b/Telegram/gyp/refresh.bat index 4f29651c7..1c820ea09 100644 --- a/Telegram/gyp/refresh.bat +++ b/Telegram/gyp/refresh.bat @@ -28,9 +28,9 @@ if not "%TDESKTOP_BUILD_DEFINES%" == "" ( set GYP_MSVS_VERSION=2015 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 -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 cd ../.. diff --git a/Telegram/gyp/refresh.sh b/Telegram/gyp/refresh.sh index cd96456c9..d9e90a16b 100755 --- a/Telegram/gyp/refresh.sh +++ b/Telegram/gyp/refresh.sh @@ -17,7 +17,7 @@ MySystem=`uname -s` cd $FullScriptPath 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 ../../../Libraries/cmake-3.6.2/bin/cmake . 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 # 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 cd ../.. diff --git a/docs/building-msvc.md b/docs/building-msvc.md index db0ea2622..88262c711 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -300,6 +300,6 @@ After, call `gyp\refresh.bat` (python 2.7 needed) #### 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) * The result Telegram.exe will be located in **D:\TBuild\tdesktop\out\Debug** (and **Release**) diff --git a/docs/building-xcode.md b/docs/building-xcode.md index 98146959d..6cc793d2a 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -233,4 +233,4 @@ In Terminal go to **/home/user/TBuild/tdesktop/Telegram** and run 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.