From 120e21c126c41969f6b37252d7102161acebfb75 Mon Sep 17 00:00:00 2001 From: Christoph Auer Date: Sun, 19 Feb 2017 12:34:10 +0100 Subject: [PATCH] Remove workaround for missing build defines Fixed by commit https://github.com/telegramdesktop/tdesktop/commit/d1d9e29ca58bbb4d426c927b7453578acbf0100f --- Telegram/gyp/refresh.bat | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Telegram/gyp/refresh.bat b/Telegram/gyp/refresh.bat index 6cdf42aa33..3049291901 100644 --- a/Telegram/gyp/refresh.bat +++ b/Telegram/gyp/refresh.bat @@ -1,5 +1,5 @@ @echo OFF -setlocal enabledelayedexpansion +setlocal EnableDelayedExpansion set "FullScriptPath=%~dp0" set "FullExecPath=%cd%" @@ -13,16 +13,16 @@ if exist "%FullScriptPath%..\..\..\Libraries\openssl\tmp32\lib.pdb" ( ) ) -if "%TDESKTOP_BUILD_DEFINES%" == "" ( - set "TDESKTOP_BUILD_DEFINES= " +set BUILD_DEFINES= +if not "%TDESKTOP_BUILD_DEFINES%" == "" ( + set "BUILD_DEFINES=-Dbuild_defines=%TDESKTOP_BUILD_DEFINES%" + echo [INFO] Set build defines to !BUILD_DEFINES! ) -set "BUILD_DEFINES=-Dbuild_defines=%TDESKTOP_BUILD_DEFINES%" - cd "%FullScriptPath%" -call gyp --depth=. --generator-output=../.. -Goutput_dir=out %BUILD_DEFINES% Telegram.gyp --format=ninja +call gyp --depth=. --generator-output=../.. -Goutput_dir=out !BUILD_DEFINES! Telegram.gyp --format=ninja if %errorlevel% neq 0 goto error -call gyp --depth=. --generator-output=../.. -Goutput_dir=out %BUILD_DEFINES% Telegram.gyp --format=msvs-ninja +call gyp --depth=. --generator-output=../.. -Goutput_dir=out !BUILD_DEFINES! Telegram.gyp --format=msvs-ninja if %errorlevel% neq 0 goto error cd ../..