From 04b1ce5a6e88c7b9d8320f5c12b745131479e397 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Wed, 5 Jan 2022 19:58:45 +0100 Subject: [PATCH] CREATE_PROJECT: Make OpenGL features consistent with configure --- devtools/create_project/create_project.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 88b19439fed..51edd256629 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -335,7 +335,6 @@ int main(int argc, char *argv[]) { if (!getFeatureBuildState("opengl", setup.features)) { setFeatureBuildState("opengl_game", setup.features, false); setFeatureBuildState("opengl_shaders", setup.features, false); - setFeatureBuildState("opengles2", setup.features, false); } // Disable engines for which we are missing dependencies @@ -442,6 +441,10 @@ int main(int argc, char *argv[]) { setup.defines.push_back("DETECTION_STATIC"); } + if (getFeatureBuildState("opengl", setup.features)) { + setup.defines.push_back("USE_GLAD"); + } + // List of global warnings and map of project-specific warnings // FIXME: As shown below these two structures have different behavior for // Code::Blocks and MSVC. In Code::Blocks this is used to enable *and* @@ -1095,9 +1098,8 @@ const Feature s_features[] = { { "nasm", "USE_NASM", false, true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling. { "tinygl", "USE_TINYGL", false, true, "TinyGL support" }, { "opengl", "USE_OPENGL", false, true, "OpenGL support" }, - { "opengl_game", "USE_OPENGL_GAME", false, true, "OpenGL support in 3d games" }, + { "opengl_game", "USE_OPENGL_GAME", false, true, "OpenGL support (classic) in 3d games" }, { "opengl_shaders", "USE_OPENGL_SHADERS", false, true, "OpenGL support (shaders) 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" },