[Scummvm-git-logs] scummvm master -> 57dc6158f442f844f97f10797af1ed7bf25469f1

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
57dc6158f4 CREATE_PROJECT: Reenable OpenGL on arm64


Commit: 57dc6158f442f844f97f10797af1ed7bf25469f1
    https://github.com/scummvm/scummvm/commit/57dc6158f442f844f97f10797af1ed7bf25469f1
Author: SupSuper (supsuper at gmail.com)
Date: 2024-08-28T00:40:43+03:00

Commit Message:
CREATE_PROJECT: Reenable OpenGL on arm64

Changed paths:
    .github/workflows/ci.yml
    devtools/create_project/msvc.cpp


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 47fedd6f38e..c297021de9a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
           - platform: arm64
             arch: arm64
             triplet: arm64-windows
-            configFlags: --enable-discord --enable-faad --enable-gif --enable-mikmod --enable-mpeg2 --enable-vpx --disable-opengl
+            configFlags: --enable-discord --enable-faad --enable-gif --enable-mikmod --enable-mpeg2 --enable-vpx
     env:
       CONFIGURATION: Debug
       PLATFORM: ${{ matrix.platform }}
@@ -175,7 +175,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout at v3
+        uses: actions/checkout at v4
       - name: Add Ubuntu Xenial package sources
         if: matrix.platform == 'ubuntu-20.04'
         run: |
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 3e546eb19f7..ad80f03e678 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -42,10 +42,8 @@ MSVCProvider::MSVCProvider(StringList &global_warnings, std::map<std::string, St
 	amd64_disabled_features.push_back("nasm");
 	_arch_disabled_features[ARCH_AMD64] = amd64_disabled_features;
 	// NASM not supported for WoA target
-	// No OpenGL on Windows on ARM
 	StringList arm64_disabled_features;
 	arm64_disabled_features.push_back("nasm");
-	arm64_disabled_features.push_back("opengl");
 	_arch_disabled_features[ARCH_ARM64] = arm64_disabled_features;
 }
 
@@ -80,7 +78,7 @@ std::string MSVCProvider::getLibraryFromFeature(const char *feature, const Build
 		// Feature flags with library dependencies
 		{   "updates", "winsparkle.lib",            nullptr,         nullptr                                           },
 		{       "tts", nullptr,                     nullptr,         "sapi.lib"                                        },
-		{    "opengl", nullptr,                     nullptr,         "opengl32.lib"                                    },
+		{    "opengl", nullptr,                     nullptr,         nullptr                                           },
 		{      "enet", nullptr,                     nullptr,         "winmm.lib ws2_32.lib"                            }
 	};