change default windows build for cmake

onecoolx · Jul 3, 2024 · 8492a3d · 8492a3d
1 parent afd1a68
commit 8492a3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml
@@ -35,12 +35,12 @@ jobs:
       run: ./build_windows.bat
 
     - name: Restore Project
-      run: msbuild ./vcproj/picasso.sln /t:Restore /p:Configuration=$env:Configuration
+      run: msbuild ./proj/picasso.sln /t:Restore /p:Configuration=$env:Configuration
       env:
         Configuration: ${{ matrix.configuration }}
 
     - name: Build Solution
-      run: msbuild ./vcproj/picasso.sln /p:Configuration=$env:Configuration
+      run: msbuild ./proj/picasso.sln /p:Configuration=$env:Configuration
       env:
         Configuration: ${{ matrix.configuration }}   
 
diff --git a/build_windows.bat b/build_windows.bat
@@ -1,3 +1,6 @@
-set GYP_MSVS_VERSION=2019
-./tools/gyp/gyp --depth=./ picasso.gyp --generator-output=vcproj
+rem set GYP_MSVS_VERSION=2019
+rem ./tools/gyp/gyp --depth=./ picasso.gyp --generator-output=vcproj
 
+mkdir proj
+cd proj
+cmake ../