[Scummvm-git-logs] scummvm master -> 72fb9311b389b15eb319fcda5115298a46b2ec07

sev- noreply at scummvm.org
Mon Jun 5 17:30:08 UTC 2023


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:
72fb9311b3 BASE: Move sdl-sys.h include outside of Base namespace


Commit: 72fb9311b389b15eb319fcda5115298a46b2ec07
    https://github.com/scummvm/scummvm/commit/72fb9311b389b15eb319fcda5115298a46b2ec07
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-05T19:30:03+02:00

Commit Message:
BASE: Move sdl-sys.h include outside of Base namespace

Changed paths:
    base/commandLine.cpp


diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index d3a53587a46..798cacce5b3 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -49,6 +49,10 @@
 #define DETECTOR_TESTING_HACK
 #define UPGRADE_ALL_TARGETS_HACK
 
+#ifdef SDL_BACKEND
+#include "backends/platform/sdl/sdl-sys.h"
+#endif
+
 namespace Base {
 
 #ifndef DISABLE_COMMAND_LINE
@@ -61,10 +65,6 @@ static const char USAGE_STRING[] =
 	"Try '%s --help' for more options.\n"
 ;
 
-#ifdef SDL_BACKEND
-#include "backends/platform/sdl/sdl-sys.h"
-#endif
-
 // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :)
 static const char HELP_STRING1[] =
 	"ScummVM - Graphical Adventure Game Interpreter\n"




More information about the Scummvm-git-logs mailing list