Fix the window demo when building with mutlple versions of Visual Stu…

…dio.
Tencent · Dec 7, 2024 · d9d8a78 · d9d8a78
1 parent e54f277
commit d9d8a78
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/DEPS b/DEPS
@@ -7,12 +7,12 @@
     "common": [
       {
         "url": "${PAG_GROUP}/vendor_tools.git",
-        "commit": "effcc0d22be03e55fab5c42ae82815ee7d76f74f",
+        "commit": "4e331972e2e828655b1901dccd5081cc995b32fc",
         "dir": "third_party/vendor_tools"
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "bc72a3730fe0733391dbaf5ce8ec139a8073c1a6",
+        "commit": "b062b9a779e481e99f0e1da1f0951f0f5a9f431f",
         "dir": "third_party/tgfx"
       },
       {

diff --git a/win/Win32Demo/WinPAGDemo.vcxproj b/win/Win32Demo/WinPAGDemo.vcxproj
@@ -108,6 +108,7 @@
       <Command>cd "$(SolutionDir).."
 call npm install -g depsync --silent
 call depsync
+set CMAKE_MSVC_PATH=$(VCInstallDir)
 node .\build_pag -a x86 -DPAG_BUILD_SHARED=OFF</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -142,6 +143,7 @@ node .\build_pag -a x86 -DPAG_BUILD_SHARED=OFF</Command>
       <Command>cd "$(SolutionDir).."
 call npm install -g depsync --silent
 call depsync
+set CMAKE_MSVC_PATH=$(VCInstallDir)
 node .\build_pag -a x86 -DPAG_BUILD_SHARED=OFF</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -166,6 +168,7 @@ node .\build_pag -a x86 -DPAG_BUILD_SHARED=OFF</Command>
       <Command>cd "$(SolutionDir).."
 call npm install -g depsync --silent
 call depsync
+set CMAKE_MSVC_PATH=$(VCInstallDir)
 node .\build_pag -a x64 -DPAG_BUILD_SHARED=OFF</Command>
     </PreBuildEvent>
     <ProjectReference>
@@ -207,6 +210,7 @@ node .\build_pag -a x64 -DPAG_BUILD_SHARED=OFF</Command>
       <Command>cd "$(SolutionDir).."
 call npm install -g depsync --silent
 call depsync
+set CMAKE_MSVC_PATH=$(VCInstallDir)
 node .\build_pag -a x64 -DPAG_BUILD_SHARED=OFF</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>