From afe3691975fd306ffd6526813f685752939ed58f Mon Sep 17 00:00:00 2001
From: hzqst <113660872@qq.com>
Date: Sun, 25 Feb 2024 13:08:26 +0800
Subject: [PATCH] 1.

---
 .github/workflows/msbuild.yml | 2 +-
 CGALib/CGALib.vcxproj         | 6 +++---
 CGALib/CGALib.vcxproj.user    | 4 ----
 build-nodegyp.bat             | 2 ++
 cgahook/cgahook.vcxproj       | 2 +-
 cgahook/cgahook.vcxproj.user  | 4 ----
 6 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 CGALib/CGALib.vcxproj.user
 delete mode 100644 cgahook/cgahook.vcxproj.user

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 609d235..3cfbbb1 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -124,7 +124,7 @@ jobs:
 
     - name: Build node-gyp
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: build-CGANode.bat
+      run: build-nodegyp.bat
       shell: cmd
 
     - name: Deploy qt and msvc redistribution
diff --git a/CGALib/CGALib.vcxproj b/CGALib/CGALib.vcxproj
index 44b1661..ccf3065 100644
--- a/CGALib/CGALib.vcxproj
+++ b/CGALib/CGALib.vcxproj
@@ -35,7 +35,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -48,13 +48,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/CGALib/CGALib.vcxproj.user b/CGALib/CGALib.vcxproj.user
deleted file mode 100644
index abe8dd8..0000000
--- a/CGALib/CGALib.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
diff --git a/build-nodegyp.bat b/build-nodegyp.bat
index b5a7487..583fdb9 100644
--- a/build-nodegyp.bat
+++ b/build-nodegyp.bat
@@ -10,6 +10,8 @@ if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
 
     "%InstallDir%\Common7\Tools\vsdevcmd.bat" -arch=x86
 
+    call npm install nan@latest --save
+
     call node-gyp configure build --arch=ia32
 
     mkdir "..\build\Release\"
diff --git a/cgahook/cgahook.vcxproj b/cgahook/cgahook.vcxproj
index 1284991..2da84ab 100644
--- a/cgahook/cgahook.vcxproj
+++ b/cgahook/cgahook.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
diff --git a/cgahook/cgahook.vcxproj.user b/cgahook/cgahook.vcxproj.user
deleted file mode 100644
index be25078..0000000
--- a/cgahook/cgahook.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file