From 3550cc5025a9903eb722f789dca626787a074748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl?= Date: Sun, 12 Sep 2021 23:50:23 -0400 Subject: [PATCH 1/3] Use local environment to build dependencies This solves potential issues with vsvarsall generating oversized environment variables with multiple runs. --- deps/build.bat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deps/build.bat b/deps/build.bat index d2cb9f9c..63064786 100644 --- a/deps/build.bat +++ b/deps/build.bat @@ -35,6 +35,7 @@ if exist %vswhere% ( :initialize_environment echo Initializing environment... +setlocal call %vcvarsall% %machine% || ( echo Please edit the build script according to your system configuration. exit /B 1 @@ -65,5 +66,7 @@ xcopy /s ..\builds\libcurl-vc%vc%-%machine%-release-static-ipv6-sspi-schannel\li cd /D %currentdir% +endlocal + echo Done! pause From 4a010c716f3d513eeffc1d935b3b5dae9f17f106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl?= Date: Sun, 12 Sep 2021 23:51:06 -0400 Subject: [PATCH 2/3] Add post-build step to copy themes This removes a manual step for first-time debugging and allows quick testing of theme changes. It is only supported for x86/x64 builds. --- project/vs2019/Taiga.vcxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/project/vs2019/Taiga.vcxproj b/project/vs2019/Taiga.vcxproj index b2958011..2b8a259e 100644 --- a/project/vs2019/Taiga.vcxproj +++ b/project/vs2019/Taiga.vcxproj @@ -153,6 +153,9 @@ ..\..\res\Taiga.manifest + + xcopy ..\..\data $(OutputPath)\data /I /E /Y + @@ -177,6 +180,9 @@ ..\..\res\Taiga.manifest + + xcopy ..\..\data $(OutputPath)\data /I /E /Y + @@ -231,6 +237,9 @@ ..\..\res\Taiga.manifest + + xcopy ..\..\data $(OutputPath)\data /I /E /Y + @@ -261,6 +270,9 @@ ..\..\res\Taiga.manifest + + xcopy ..\..\data $(OutputPath)\data /I /E /Y + From 0ff909a1ea8f81e3ff9da5dbf3c24d1fbd84c8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl?= Date: Mon, 13 Sep 2021 00:07:16 -0400 Subject: [PATCH 3/3] Add pre-build event to build dependencies This runs only if libcurl_a.lib is not found in its expected location. It is only compatible with x86/x64 builds. --- project/vs2019/Taiga.vcxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/project/vs2019/Taiga.vcxproj b/project/vs2019/Taiga.vcxproj index 2b8a259e..a1cb3144 100644 --- a/project/vs2019/Taiga.vcxproj +++ b/project/vs2019/Taiga.vcxproj @@ -156,6 +156,9 @@ xcopy ..\..\data $(OutputPath)\data /I /E /Y + + if not exist "..\..\deps\lib\$(LibrariesArchitecture)\libcurl_a.lib" ..\..\deps\build.bat --machine=$(LibrariesArchitecture) + @@ -183,6 +186,9 @@ xcopy ..\..\data $(OutputPath)\data /I /E /Y + + if not exist "..\..\deps\lib\$(LibrariesArchitecture)\libcurl_a.lib" ..\..\deps\build.bat --machine=$(LibrariesArchitecture) + @@ -240,6 +246,9 @@ xcopy ..\..\data $(OutputPath)\data /I /E /Y + + if not exist "..\..\deps\lib\$(LibrariesArchitecture)\libcurl_a.lib" ..\..\deps\build.bat --machine=$(LibrariesArchitecture) + @@ -273,6 +282,9 @@ xcopy ..\..\data $(OutputPath)\data /I /E /Y + + if not exist "..\..\deps\lib\$(LibrariesArchitecture)\libcurl_a.lib" ..\..\deps\build.bat --machine=$(LibrariesArchitecture) +