From bd93aed393b5023068ff9f2786cb7b138b54da01 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 29 Jun 2021 17:33:41 +0300 Subject: [PATCH] Test build with statically linked ANGLE. --- docs/building-msvc.md | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/docs/building-msvc.md b/docs/building-msvc.md index fb66aa1cc4..4ee4a26413 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -172,9 +172,23 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** SET PATH=%PATH_BACKUP_% cd .. + git clone https://chromium.googlesource.com/angle/angle + cd angle + python scripts/bootstrap.py + gclient sync + + git apply ../patches/angle.diff + + gn gen out/Debug --args="is_component_build = false is_debug = true target_cpu = \"x86\" is_clang = false enable_iterator_debugging = true angle_enable_metal=false angle_enable_swiftshader=false angle_enable_vulkan=false" + + gn gen out/Release --args="is_component_build = false is_debug = false target_cpu = \"x86\" is_clang = false enable_iterator_debugging = false angle_enable_metal=false angle_enable_swiftshader=false angle_enable_vulkan=false" + + ninja -C out/Debug libANGLE_static libGLESv2_static libEGL_static + ninja -C out/Release libANGLE_static libGLESv2_static libEGL_static + SET LibrariesPath=%cd% - git clone git://code.qt.io/qt/qt5.git qt_5_15_2 - cd qt_5_15_2 + git clone git://code.qt.io/qt/qt5.git al_5_15_2 + cd al_5_15_2 perl init-repository --module-subset=qtbase,qtimageformats git checkout v5.15.2 git submodule update qtbase qtimageformats @@ -183,14 +197,23 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** cd .. configure ^ - -prefix "%LibrariesPath%\Qt-5.15.2" ^ + -prefix "%LibrariesPath%\Al-5.15.2" ^ + -recheck ^ -debug-and-release ^ -force-debug-info ^ -opensource ^ -confirm-license ^ -static ^ -static-runtime ^ - -opengl dynamic ^ + -opengl es2 -no-angle ^ + -I "%LibrariesPath%\angle\include" ^ + -D "GL_APICALL=" ^ + QMAKE_LIBS_OPENGL_ES2_DEBUG="%LibrariesPath%\angle\out\Debug\obj\libGLESv2_static.lib %LibrariesPath%\angle\out\Debug\obj\libANGLE_static.lib d3d11.lib d3d9.lib dxgi.lib dxguid.lib" ^ + QMAKE_LIBS_OPENGL_ES2_RELEASE="%LibrariesPath%\angle\out\Release\obj\libGLESv2_static.lib %LibrariesPath%\angle\out\Release\obj\libANGLE_static.lib d3d11.lib d3d9.lib dxgi.lib dxguid.lib" ^ + -egl ^ + -D "EGLAPI=" ^ + QMAKE_LIBS_EGL_DEBUG="%LibrariesPath%\angle\out\Debug\obj\libEGL_static.lib %LibrariesPath%\angle\out\Debug\obj\libGLESv2_static.lib %LibrariesPath%\angle\out\Debug\obj\libANGLE_static.lib d3d11.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^ + QMAKE_LIBS_EGL_RELEASE="%LibrariesPath%\angle\out\Release\obj\libEGL_static.lib %LibrariesPath%\angle\out\Release\obj\libGLESv2_static.lib %LibrariesPath%\angle\out\Release\obj\libANGLE_static.lib d3d11.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^ -openssl-linked ^ -I "%LibrariesPath%\openssl_1_1_1\include" ^ OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^