mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-02-17 13:27:01 +00:00
Move GSL dependency to a submodule.
This commit is contained in:
parent
e4f7b3c7c2
commit
7da52bd3ec
@ -27,10 +27,6 @@ GOTO:EOF
|
|||||||
call:logInfo "Clone dependencies repository"
|
call:logInfo "Clone dependencies repository"
|
||||||
git clone -q --branch=master https://github.com/telegramdesktop/dependencies_windows.git %LIB_DIR%
|
git clone -q --branch=master https://github.com/telegramdesktop/dependencies_windows.git %LIB_DIR%
|
||||||
cd %LIB_DIR%
|
cd %LIB_DIR%
|
||||||
|
|
||||||
call:logInfo "Clone GSL"
|
|
||||||
git clone https://github.com/Microsoft/GSL.git
|
|
||||||
|
|
||||||
call prepare.bat
|
call prepare.bat
|
||||||
GOTO:EOF
|
GOTO:EOF
|
||||||
|
|
||||||
@ -39,6 +35,9 @@ GOTO:EOF
|
|||||||
cd %LIB_DIR%
|
cd %LIB_DIR%
|
||||||
git clone https://chromium.googlesource.com/external/gyp
|
git clone https://chromium.googlesource.com/external/gyp
|
||||||
SET PATH=%PATH%;C:\TBuild\Libraries\gyp;C:\TBuild\Libraries\ninja;
|
SET PATH=%PATH%;C:\TBuild\Libraries\gyp;C:\TBuild\Libraries\ninja;
|
||||||
|
cd %SRC_DIR%
|
||||||
|
git submodule init
|
||||||
|
git submodule update
|
||||||
cd %SRC_DIR%\Telegram
|
cd %SRC_DIR%\Telegram
|
||||||
call gyp\refresh.bat
|
call gyp\refresh.bat
|
||||||
GOTO:EOF
|
GOTO:EOF
|
||||||
|
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[submodule "third_party/GSL"]
|
||||||
|
path = third_party/GSL
|
||||||
|
url = https://github.com/Microsoft/GSL.git
|
@ -543,8 +543,9 @@ buildCustomQt() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getGSL() {
|
getGSL() {
|
||||||
cd "$EXTERNAL"
|
cd "$UPSTREAM"
|
||||||
git clone https://github.com/Microsoft/GSL.git
|
git submodule init
|
||||||
|
git submodule update
|
||||||
}
|
}
|
||||||
|
|
||||||
getGYP() {
|
getGYP() {
|
||||||
@ -602,7 +603,6 @@ buildTelegram() {
|
|||||||
cd "$UPSTREAM/Telegram/gyp"
|
cd "$UPSTREAM/Telegram/gyp"
|
||||||
"$GYP_PATH/gyp" \
|
"$GYP_PATH/gyp" \
|
||||||
-Dbuild_defines=${GYP_DEFINES:1} \
|
-Dbuild_defines=${GYP_DEFINES:1} \
|
||||||
-Dlinux_path_gsl=$EXTERNAL/GSL \
|
|
||||||
-Dlinux_path_xkbcommon=$XKB_PATH \
|
-Dlinux_path_xkbcommon=$XKB_PATH \
|
||||||
-Dlinux_path_va=$VA_PATH \
|
-Dlinux_path_va=$VA_PATH \
|
||||||
-Dlinux_path_vdpau=$VDPAU_PATH \
|
-Dlinux_path_vdpau=$VDPAU_PATH \
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
'libs_loc': '<(libs_loc)',
|
'libs_loc': '<(libs_loc)',
|
||||||
'src_loc': '../SourceFiles',
|
'src_loc': '../SourceFiles',
|
||||||
'res_loc': '../Resources',
|
'res_loc': '../Resources',
|
||||||
|
'submodules_loc': '../../third_party',
|
||||||
'third_party_loc': '../ThirdParty',
|
'third_party_loc': '../ThirdParty',
|
||||||
'minizip_loc': '<(third_party_loc)/minizip',
|
'minizip_loc': '<(third_party_loc)/minizip',
|
||||||
'sp_media_key_tap_loc': '<(third_party_loc)/SPMediaKeyTap',
|
'sp_media_key_tap_loc': '<(third_party_loc)/SPMediaKeyTap',
|
||||||
@ -94,7 +95,7 @@
|
|||||||
'<(libs_loc)/openal-soft/include',
|
'<(libs_loc)/openal-soft/include',
|
||||||
'<(minizip_loc)',
|
'<(minizip_loc)',
|
||||||
'<(sp_media_key_tap_loc)',
|
'<(sp_media_key_tap_loc)',
|
||||||
'<(libs_loc)/GSL/include',
|
'<(submodules_loc)/GSL/include',
|
||||||
],
|
],
|
||||||
'sources': [
|
'sources': [
|
||||||
'<@(qrc_files)',
|
'<@(qrc_files)',
|
||||||
|
@ -33,14 +33,12 @@
|
|||||||
'linux_path_va%': '/usr/local',
|
'linux_path_va%': '/usr/local',
|
||||||
'linux_path_vdpau%': '/usr/local',
|
'linux_path_vdpau%': '/usr/local',
|
||||||
'linux_path_breakpad%': '<(libs_loc)/breakpad',
|
'linux_path_breakpad%': '<(libs_loc)/breakpad',
|
||||||
'linux_path_gsl%': '<(libs_loc)/GSL',
|
|
||||||
},
|
},
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'/usr/local/include',
|
'/usr/local/include',
|
||||||
'<(linux_path_ffmpeg)/include',
|
'<(linux_path_ffmpeg)/include',
|
||||||
'<(linux_path_openal)/include',
|
'<(linux_path_openal)/include',
|
||||||
'<(linux_path_breakpad)/include/breakpad',
|
'<(linux_path_breakpad)/include/breakpad',
|
||||||
'<(linux_path_gsl)/include',
|
|
||||||
],
|
],
|
||||||
'library_dirs': [
|
'library_dirs': [
|
||||||
'/usr/local/lib',
|
'/usr/local/lib',
|
||||||
|
@ -21,7 +21,7 @@ Choose a folder for the future build, for example **/home/user/TBuild** There yo
|
|||||||
|
|
||||||
By git – in Terminal go to **/home/user/TBuild** and run
|
By git – in Terminal go to **/home/user/TBuild** and run
|
||||||
|
|
||||||
git clone https://github.com/telegramdesktop/tdesktop.git
|
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
|
||||||
|
|
||||||
###Prepare libraries
|
###Prepare libraries
|
||||||
|
|
||||||
@ -29,10 +29,6 @@ Install dev libraries
|
|||||||
|
|
||||||
sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev libicu-dev libdee-dev
|
sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev libicu-dev libdee-dev
|
||||||
|
|
||||||
From **/home/user/TBuild/Libraries** run
|
|
||||||
|
|
||||||
git clone https://github.com/Microsoft/GSL.git
|
|
||||||
|
|
||||||
####zlib 1.2.8
|
####zlib 1.2.8
|
||||||
|
|
||||||
http://www.zlib.net/ > Download [**zlib source code, version 1.2.8, zipfile format**](http://zlib.net/zlib128.zip)
|
http://www.zlib.net/ > Download [**zlib source code, version 1.2.8, zipfile format**](http://zlib.net/zlib128.zip)
|
||||||
|
@ -46,15 +46,11 @@ Go to **D:\\TBuild**
|
|||||||
|
|
||||||
and run
|
and run
|
||||||
|
|
||||||
git clone https://github.com/telegramdesktop/tdesktop.git
|
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
|
||||||
mkdir Libraries
|
mkdir Libraries
|
||||||
|
|
||||||
## Prepare libraries
|
## Prepare libraries
|
||||||
|
|
||||||
From **D:\\TBuild\\Libraries** run
|
|
||||||
|
|
||||||
git clone https://github.com/Microsoft/GSL.git
|
|
||||||
|
|
||||||
### OpenSSL
|
### OpenSSL
|
||||||
|
|
||||||
Go to **D:\\TBuild\\Libraries** and run
|
Go to **D:\\TBuild\\Libraries** and run
|
||||||
|
@ -24,7 +24,7 @@ Choose a folder for the future build, for example **/home/user/TBuild** There yo
|
|||||||
|
|
||||||
By git – in Terminal go to **/home/user/TBuild** and run
|
By git – in Terminal go to **/home/user/TBuild** and run
|
||||||
|
|
||||||
git clone https://github.com/telegramdesktop/tdesktop.git
|
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
|
||||||
|
|
||||||
###Prepare libraries
|
###Prepare libraries
|
||||||
|
|
||||||
@ -32,10 +32,6 @@ Install dev libraries
|
|||||||
|
|
||||||
sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev
|
sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev
|
||||||
|
|
||||||
From **/home/user/TBuild/Libraries** run
|
|
||||||
|
|
||||||
git clone https://github.com/Microsoft/GSL.git
|
|
||||||
|
|
||||||
####zlib 1.2.8
|
####zlib 1.2.8
|
||||||
|
|
||||||
http://www.zlib.net/ > Download [**zlib source code, version 1.2.8, zipfile format**](http://zlib.net/zlib128.zip)
|
http://www.zlib.net/ > Download [**zlib source code, version 1.2.8, zipfile format**](http://zlib.net/zlib128.zip)
|
||||||
|
@ -10,7 +10,7 @@ Choose a folder for the future build, for example **/Users/user/TBuild** There y
|
|||||||
|
|
||||||
By git – in Terminal go to **/Users/user/TBuild** and run
|
By git – in Terminal go to **/Users/user/TBuild** and run
|
||||||
|
|
||||||
git clone https://github.com/telegramdesktop/tdesktop.git
|
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
|
||||||
|
|
||||||
then go to **/Users/user/TBuild/tdesktop** and run
|
then go to **/Users/user/TBuild/tdesktop** and run
|
||||||
|
|
||||||
@ -32,10 +32,6 @@ In your build Terminal run
|
|||||||
|
|
||||||
to set minimal supported OS version to 10.6 for future console builds.
|
to set minimal supported OS version to 10.6 for future console builds.
|
||||||
|
|
||||||
From **/Users/user/TBuild/Libraries** run
|
|
||||||
|
|
||||||
git clone https://github.com/Microsoft/GSL.git
|
|
||||||
|
|
||||||
####custom build of libc++
|
####custom build of libc++
|
||||||
|
|
||||||
From **/Users/user/TBuild/Libraries/macold** run
|
From **/Users/user/TBuild/Libraries/macold** run
|
||||||
|
@ -12,7 +12,7 @@ There you will have two folders, **Libraries** for third-party libs and **tdeskt
|
|||||||
|
|
||||||
By git – in Terminal go to **/Users/user/TBuild** and run:
|
By git – in Terminal go to **/Users/user/TBuild** and run:
|
||||||
|
|
||||||
git clone https://github.com/telegramdesktop/tdesktop.git
|
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
|
||||||
|
|
||||||
###Prepare libraries
|
###Prepare libraries
|
||||||
|
|
||||||
@ -22,10 +22,6 @@ In your build Terminal run:
|
|||||||
|
|
||||||
to set minimal supported OS version to 10.8 for future console builds.
|
to set minimal supported OS version to 10.8 for future console builds.
|
||||||
|
|
||||||
From **/Users/user/TBuild/Libraries** run
|
|
||||||
|
|
||||||
git clone https://github.com/Microsoft/GSL.git
|
|
||||||
|
|
||||||
####zlib 1.2.8
|
####zlib 1.2.8
|
||||||
|
|
||||||
http://www.zlib.net/ > Download [**zlib source code, version 1.2.8**](http://www.zlib.net/fossils/zlib-1.2.8.tar.gz)
|
http://www.zlib.net/ > Download [**zlib source code, version 1.2.8**](http://www.zlib.net/fossils/zlib-1.2.8.tar.gz)
|
||||||
|
1
third_party/GSL
vendored
Submodule
1
third_party/GSL
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit f9c47dd63fe25cc216294fbe7e2fbe4f9a302ca3
|
Loading…
Reference in New Issue
Block a user