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 @@ StaticLibrary true - v143 + $(DefaultPlatformToolset) Unicode @@ -48,13 +48,13 @@ StaticLibrary true - v143 + $(DefaultPlatformToolset) Unicode StaticLibrary false - v143 + $(DefaultPlatformToolset) true Unicode 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 @@ - - - - \ 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 @@ DynamicLibrary true - v143 + $(DefaultPlatformToolset) Unicode 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 @@ - - - - \ No newline at end of file