[Scummvm-git-logs] scummvm master -> dca7619c867b042c8893955ffc921c56bbc7c65c

[dwatteau]

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:
dca7619c86 BASE: Print SDL1.2/SDL2 in cloud builds too and reindent the ifdefs


Commit: dca7619c867b042c8893955ffc921c56bbc7c65c
    https://github.com/scummvm/scummvm/commit/dca7619c867b042c8893955ffc921c56bbc7c65c
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-09T12:09:37+01:00

Commit Message:
BASE: Print SDL1.2/SDL2 in cloud builds too and reindent the ifdefs

Spotted by Lothar in the MSYS2/mingw64 and MXE builds, thanks!

Changed paths:
    base/version.cpp


diff --git a/base/version.cpp b/base/version.cpp
index 64350e8a8f7..c06e372bfbd 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -86,17 +86,15 @@ const char gScummVMFeatures[] = ""
 #endif
 
 #ifdef USE_TREMOR
-#ifdef USE_TREMOLO
+#  ifdef USE_TREMOLO
 	// libTremolo is used on WinCE for better ogg performance
 	"Tremolo "
-#else
+#  else
 	"Tremor "
-#endif
-#else
-#ifdef USE_VORBIS
+#  endif
+#elif defined(USE_VORBIS)
 	"Vorbis "
 #endif
-#endif
 
 #ifdef USE_FLAC
 	"FLAC "
@@ -194,52 +192,56 @@ const char gScummVMFeatures[] = ""
 
 #ifdef USE_CLOUD
 	"cloud ("
-#ifdef USE_LIBCURL
+#  ifdef USE_LIBCURL
 	"servers"
-#ifdef USE_SDL_NET
-	", "
-#endif
-#endif
-#ifdef USE_SDL_NET
-	"local"
-#endif
+#    ifdef USE_SDL_NET
+	", local) "
+#    else
 	") "
+#    endif
+#  endif
 #else
-#ifdef USE_LIBCURL
+#  ifdef USE_LIBCURL
 	"libcurl "
-#endif
-#ifdef SDL_BACKEND
-#ifdef USE_SDL2
-	"SDL2 "
-#else
-	"SDL1.2 "
-#endif
-#endif
-#ifdef USE_SDL_NET
+#  endif
+#  ifdef USE_SDL_NET
 	"SDL_net "
+#  endif
 #endif
-#endif
+
 #ifdef USE_ENET
 	"ENet "
 #endif
+
+#ifdef SDL_BACKEND
+#  ifdef USE_SDL2
+	"SDL2 "
+#  else
+	"SDL1.2 "
+#  endif
+#endif
+
 #ifdef USE_TINYGL
 	"TinyGL "
 #endif
+
 #ifdef USE_OPENGL
 	"OpenGL "
-#ifdef USE_OPENGL_SHADERS
+#  ifdef USE_OPENGL_SHADERS
 	"(with shaders) "
+#  endif
 #endif
-#endif
+
 #ifdef USE_GLES_MODE
-#if USE_GLES_MODE == 0
+#  if USE_GLES_MODE == 0
 	"OpenGL desktop only "
-#elif USE_GLES_MODE == 1
+#  elif USE_GLES_MODE == 1
 	"OpenGL ES 1 only "
-#elif USE_GLES_MODE == 2
+#  elif USE_GLES_MODE == 2
 	"OpenGL ES 2 only "
+#  endif
 #endif
-#endif
+
 #ifdef USE_RETROWAVE
 	"RetroWave "
 #endif