[Scummvm-git-logs] scummvm master -> 159e77a8f1a70350c084ff0e43cc326186d5284a
SupSuper
supsuper at gmail.com
Sat Oct 10 19:49:06 UTC 2020
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1ca009ddc6 CREATE_PROJECT: Remove orphaned opengles v1 feature
f22f08059c CREATE_PROJECT: --disable-opengl disables all OpenGL features
159e77a8f1 CI: ARM64 doesn't support OpenGL
Commit: 1ca009ddc6251672120b69740029605771df7a29
https://github.com/scummvm/scummvm/commit/1ca009ddc6251672120b69740029605771df7a29
Author: SupSuper (supsuper at gmail.com)
Date: 2020-10-10T19:50:49+01:00
Commit Message:
CREATE_PROJECT: Remove orphaned opengles v1 feature
Changed paths:
devtools/create_project/create_project.cpp
devtools/create_project/msvc.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 242dd9e9f9..74bcab5f2c 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1055,7 +1055,7 @@ const Feature s_features[] = {
{ "opengl", "USE_OPENGL", false, true, "OpenGL support" },
{ "opengl_game", "USE_OPENGL_GAME", false, true, "OpenGL support in 3d games" },
{ "opengl_shaders", "USE_OPENGL_SHADERS", false, true, "OpenGL support (shaders) in 3d games" },
- { "opengles", "USE_GLES", false, true, "forced OpenGL ES mode in 3d games" },
+ { "opengles2", "USE_GLES2", false, false, "forced OpenGL ES2 mode in 3d games" },
{ "taskbar", "USE_TASKBAR", false, true, "Taskbar integration support" },
{ "cloud", "USE_CLOUD", false, true, "Cloud integration support" },
{ "translation", "USE_TRANSLATION", false, true, "Translation support" },
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 3972b59a4a..6719f0c4b2 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -43,12 +43,11 @@ 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, OpenGL ES on Windows on ARM
+ // No OpenGL on Windows on ARM
// https://github.com/microsoft/vcpkg/issues/11248 [fribidi] Fribidi doesn't cross-compile on x86-64 to target arm/arm64
StringList arm64_disabled_features;
arm64_disabled_features.push_back("nasm");
arm64_disabled_features.push_back("opengl");
- arm64_disabled_features.push_back("opengles");
arm64_disabled_features.push_back("fribidi");
_arch_disabled_features[ARCH_ARM64] = arm64_disabled_features;
}
Commit: f22f08059ce9030e1849c312c4dba2bc937ad579
https://github.com/scummvm/scummvm/commit/f22f08059ce9030e1849c312c4dba2bc937ad579
Author: SupSuper (supsuper at gmail.com)
Date: 2020-10-10T19:53:34+01:00
Commit Message:
CREATE_PROJECT: --disable-opengl disables all OpenGL features
Changed paths:
devtools/create_project/create_project.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 74bcab5f2c..b0ec46f08f 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -304,6 +304,19 @@ int main(int argc, char *argv[]) {
j->enable = false;
}
+ // HACK: Vorbis and Tremor can not be enabled simultaneously
+ if (getFeatureBuildState("tremor", setup.features)) {
+ setFeatureBuildState("vorbis", setup.features, false);
+ }
+
+ // HACK: These features depend on OpenGL
+ if (!getFeatureBuildState("opengl", setup.features)) {
+ setFeatureBuildState("opengl_game", setup.features, false);
+ setFeatureBuildState("opengl_shaders", setup.features, false);
+ setFeatureBuildState("opengles2", setup.features, false);
+ setFeatureBuildState("glew", setup.features, false);
+ }
+
// Disable engines for which we are missing dependencies
for (EngineDescList::const_iterator i = setup.engines.begin(); i != setup.engines.end(); ++i) {
if (i->enable) {
@@ -318,11 +331,6 @@ int main(int argc, char *argv[]) {
}
}
- // HACK: Vorbis and Tremor can not be enabled simultaneously
- if (getFeatureBuildState("tremor", setup.features)) {
- setFeatureBuildState("vorbis", setup.features, false);
- }
-
// Print status
cout << "Enabled engines:\n\n";
for (EngineDescList::const_iterator i = setup.engines.begin(); i != setup.engines.end(); ++i) {
@@ -1068,7 +1076,7 @@ const Feature s_features[] = {
{ "text-console", "USE_TEXT_CONSOLE_FOR_DEBUGGER", false, false, "Text console debugger" }, // This feature is always applied in xcode projects
{ "tts", "USE_TTS", false, true, "Text to speech support"},
{"builtin-resources", "BUILTIN_RESOURCES", false, true, "include resources (e.g. engine data, fonts) into the binary"},
- {"detection-static", "USE_DETECTION_FEATURES_STATIC", false, true, "Static linking of detection objects for engines."},
+ { "detection-static", "USE_DETECTION_FEATURES_STATIC", false, true, "Static linking of detection objects for engines."},
{ "cxx11", "USE_CXX11", false, true, "Compile with c++11 support"}
};
Commit: 159e77a8f1a70350c084ff0e43cc326186d5284a
https://github.com/scummvm/scummvm/commit/159e77a8f1a70350c084ff0e43cc326186d5284a
Author: SupSuper (supsuper at gmail.com)
Date: 2020-10-10T19:54:26+01:00
Commit Message:
CI: ARM64 doesn't support OpenGL
Changed paths:
.github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cfe4ef0b9e..30b374f6ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,8 +28,8 @@ jobs:
triplet: arm64-windows
# fribidi is disabled due to https://github.com/microsoft/vcpkg/issues/11248 [fribidi] Fribidi doesn't cross-compile on x86-64 to target arm/arm64
# Note that fribidi is also disabled on arm64 in devtools/create_project/msvc.cpp
- configFlags: --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi
- vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype glew libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
+ configFlags: --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi --disable-opengl
+ vcpkgPackages: 'curl discord-rpc faad2 fluidsynth freetype libflac libjpeg-turbo libmad libmpeg2 libogg libpng libtheora libvorbis sdl2 sdl2-net zlib'
env:
CONFIGURATION: Release
PLATFORM: ${{ matrix.platform }}
More information about the Scummvm-git-logs
mailing list