diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 49166a8b7..17123c08a 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 49166a8b7243fd8926d1808da87c803670b02474 +Subproject commit 17123c08ab88819908480e718bbb25f4e51598f3 diff --git a/cmake b/cmake index 1f1930830..289bf222c 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 1f193083002cb6ba3fe6d33b41991f0f7d819f0b +Subproject commit 289bf222cad071aba5bb7d1928b2654bac3f4cf0 diff --git a/docs/building-win-x64.md b/docs/building-win-x64.md index 039a94caa..566cd1a8e 100644 --- a/docs/building-win-x64.md +++ b/docs/building-win-x64.md @@ -214,12 +214,11 @@ Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** -static-runtime ^ -opengl es2 -no-angle ^ -I "%LibrariesPath%\tg_angle\include" ^ - -D "GL_APICALL=" ^ + -D "KHRONOS_STATIC=" ^ + -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^ QMAKE_LIBS_OPENGL_ES2_DEBUG="%LibrariesPath%\tg_angle\out\Debug\tg_angle.lib %LibrariesPath%\zlib\contrib\vstudio\vc14\x64\ZlibStatDebug\zlibstat.lib d3d9.lib dxgi.lib dxguid.lib" ^ QMAKE_LIBS_OPENGL_ES2_RELEASE="%LibrariesPath%\tg_angle\out\Release\tg_angle.lib %LibrariesPath%\zlib\contrib\vstudio\vc14\x64\ZlibStatReleaseWithoutAsm\zlibstat.lib d3d9.lib dxgi.lib dxguid.lib" ^ -egl ^ - -D "EGLAPI=" ^ - -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^ QMAKE_LIBS_EGL_DEBUG="%LibrariesPath%\tg_angle\out\Debug\tg_angle.lib %LibrariesPath%\zlib\contrib\vstudio\vc14\x64\ZlibStatDebug\zlibstat.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^ QMAKE_LIBS_EGL_RELEASE="%LibrariesPath%\tg_angle\out\Release\tg_angle.lib %LibrariesPath%\zlib\contrib\vstudio\vc14\x64\ZlibStatReleaseWithoutAsm\zlibstat.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^ -openssl-linked ^ diff --git a/docs/building-win.md b/docs/building-win.md index b16c15bcf..ee28a558a 100644 --- a/docs/building-win.md +++ b/docs/building-win.md @@ -217,12 +217,11 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** -static-runtime ^ -opengl es2 -no-angle ^ -I "%LibrariesPath%\tg_angle\include" ^ - -D "GL_APICALL=" ^ + -D "KHRONOS_STATIC=" ^ + -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^ QMAKE_LIBS_OPENGL_ES2_DEBUG="%LibrariesPath%\tg_angle\out\Debug\tg_angle.lib %LibrariesPath%\zlib\contrib\vstudio\vc14\x86\ZlibStatDebug\zlibstat.lib d3d9.lib dxgi.lib dxguid.lib" ^ QMAKE_LIBS_OPENGL_ES2_RELEASE="%LibrariesPath%\tg_angle\out\Release\tg_angle.lib %LibrariesPath%\zlib\contrib\vstudio\vc14\x86\ZlibStatReleaseWithoutAsm\zlibstat.lib d3d9.lib dxgi.lib dxguid.lib" ^ -egl ^ - -D "EGLAPI=" ^ - -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^ QMAKE_LIBS_EGL_DEBUG="%LibrariesPath%\tg_angle\out\Debug\tg_angle.lib %LibrariesPath%\zlib\contrib\vstudio\vc14\x86\ZlibStatDebug\zlibstat.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^ QMAKE_LIBS_EGL_RELEASE="%LibrariesPath%\tg_angle\out\Release\tg_angle.lib %LibrariesPath%\zlib\contrib\vstudio\vc14\x86\ZlibStatReleaseWithoutAsm\zlibstat.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^ -openssl-linked ^