From b0387b8e46d5a4f0700fcac0542bf899a3ac8c30 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Tue, 11 Jan 2022 11:40:33 +1100 Subject: [PATCH] Un-re-enable ModernGL build --- src/Platform_Posix.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/Platform_Posix.c b/src/Platform_Posix.c index 5195ef2f9..39c50ae9c 100644 --- a/src/Platform_Posix.c +++ b/src/Platform_Posix.c @@ -784,19 +784,27 @@ cc_bool Updater_Clean(void) { return true; } #if defined CC_BUILD_LINUX #if __x86_64__ const struct UpdaterInfo Updater_Info = { - "&eModernGL is recommended for newer machines (2015 or later)", 2, + #ifndef CC_BUILD_GLMODERN + "", 1, { { "OpenGL", "ClassiCube" } } + #else + "&eModernGL is recommended for newer machines (2010 or later)", 2, { { "OpenGL", "ClassiCube" }, { "ModernGL", "cc-nix64-gl2" } } + #endif }; #elif __i386__ const struct UpdaterInfo Updater_Info = { - "&eModernGL is recommended for newer machines (2015 or later)", 2, + #ifndef CC_BUILD_GLMODERN + "", 1, { { "OpenGL", "ClassiCube.32" } } + #else + "&eModernGL is recommended for newer machines (2010 or later)", 2, { { "OpenGL", "ClassiCube.32" }, { "ModernGL", "cc-nix32-gl2" } } + #endif }; #elif CC_BUILD_RPI const struct UpdaterInfo Updater_Info = { "", 1, { { "OpenGL", "ClassiCube.rpi" } } }; @@ -806,19 +814,27 @@ const struct UpdaterInfo Updater_Info = { "&eCompile latest source code to updat #elif defined CC_BUILD_MACOS #if __x86_64__ const struct UpdaterInfo Updater_Info = { - "&eModernGL is recommended for newer machines (2015 or later)", 2, + #ifndef CC_BUILD_GLMODERN + "", 1, { { "OpenGL", "ClassiCube.64.osx" } } + #else + "&eModernGL is recommended for newer machines (2010 or later)", 2, { { "OpenGL", "ClassiCube.64.osx" }, { "ModernGL", "cc-osx64-gl2" } } + #endif }; #elif __i386__ const struct UpdaterInfo Updater_Info = { - "&eModernGL is recommended for newer machines (2015 or later)", 2, + #ifndef CC_BUILD_GLMODERN + "", 1, { { "OpenGL", "ClassiCube.osx" } } + #else + "&eModernGL is recommended for newer machines (2010 or later)", 2, { { "OpenGL", "ClassiCube.osx" }, { "ModernGL", "cc-osx32-gl2" } } + #endif }; #else const struct UpdaterInfo Updater_Info = { "&eCompile latest source code to update", 0 };