use qt6

kvnp · Dec 25, 2023 · 201513a · 201513a
1 parent 1aed723
commit 201513a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build-windows-vcpkg.yml b/.github/workflows/build-windows-vcpkg.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Configure
         #uses: lukka/run-cmake@v10
         working-directory: ${{github.workspace}}
-        run: cmake -B build $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake
+        run: cmake -B build $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DUSE_QT6=ON -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake
 
       - name: Make
         working-directory: ${{github.workspace}}/build
@@ -67,4 +67,4 @@ jobs:
       - uses: actions/upload-artifact@v1
         with:
           name: melonDS-${{matrix.target}}
-          path: ${{runner.workspace}}\build\melonDS.exe
+          path: ${{github.workspace}}\build\melonDS.exe
diff --git a/vcpkg.json b/vcpkg.json
@@ -5,9 +5,10 @@
         "sdl2",
         "libarchive",
         "libslirp",
-        "qt5-base",
-        "qt5-svg",
-        "qt5-multimedia",
+        "qtbase",
+        "qtsvg",
+        "qtmultimedia",
+        "qttools",
         "dirent"
     ]
 }