diff -ruN scummvm-2.7.0-orig/base/version.cpp scummvm-2.7.0/base/version.cpp --- scummvm-2.7.0-orig/base/version.cpp 2023-02-13 16:19:05.000000000 -0600 +++ scummvm-2.7.0/base/version.cpp 2023-05-04 05:01:47.000000000 -0500 @@ -58,8 +58,7 @@ #if defined(__amigaos4__) || defined(__MORPHOS__) static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" AMIGA_DATE ")"; #endif -const char gScummVMBuildDate[] = __DATE__ " " __TIME__; -const char gScummVMVersionDate[] = SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")"; +const char gScummVMVersionDate[] = SCUMMVM_VERSION SCUMMVM_REVISION; const char gScummVMCompiler[] = "" #define STR_HELPER(x) #x #define STR(x) STR_HELPER(x) @@ -77,7 +76,7 @@ #undef STR #undef STR_HELPER ; -const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")"; +const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION; const char gScummVMFeatures[] = "" #ifdef TAINTED_BUILD // TAINTED means the build contains engines/subengines not enabled by default diff -ruN scummvm-2.7.0-orig/base/version.h scummvm-2.7.0/base/version.h --- scummvm-2.7.0-orig/base/version.h 2023-02-13 16:19:05.000000000 -0600 +++ scummvm-2.7.0/base/version.h 2023-05-04 04:17:46.000000000 -0500 @@ -23,7 +23,6 @@ #define BASE_VERSION_H extern const char gScummVMVersion[]; // e.g. "0.4.1" -extern const char gScummVMBuildDate[]; // e.g. "2003-06-24" extern const char gScummVMVersionDate[]; // e.g. "0.4.1 (2003-06-24)" extern const char gScummVMCompiler[]; // e.g. "GCC 11.2.0" extern const char gScummVMFullVersion[]; // e.g. "ScummVM 0.4.1 (2003-06-24)" diff -ruN scummvm-2.7.0-orig/configure scummvm-2.7.0/configure --- scummvm-2.7.0-orig/configure 2023-02-13 16:19:22.000000000 -0600 +++ scummvm-2.7.0/configure 2023-05-04 05:29:14.000000000 -0500 @@ -1342,7 +1342,7 @@ ;; --with-sdlnet-prefix=*) arg=`echo $ac_option | cut -d '=' -f 2` - SDL_NET_CFLAGS="-I$arg/include" + SDL_NET_CFLAGS="-I$arg/include/SDL2" SDL_NET_LIBS="-L$arg/lib" ;; --with-opengl-prefix=*) @@ -4033,7 +4033,8 @@ # Some platforms (eg. Android, iOS) may use an edited version # of SDL-net or SDL2-net that does not require SDL or SDL2 respectively # -if test "$_sdlnet" = auto ; then +if test "$_sdlnet" = yes ; then + echocheck "SDL2_net" # If SDL2 was detected, then test for SDL2_net exclusively # If SDL was detected, then test for SDL_net exclusively # If neither SDL nor SDL2 detected, then test for both (SDL2_net success takes priority) @@ -4046,8 +4047,10 @@ if test "$_pkg_config" = "yes" && $_pkgconfig --exists SDL2_net; then append_var SDL2_NET_LIBS "`$_pkgconfig --libs SDL2_net`" append_var SDL2_NET_CFLAGS "`$_pkgconfig --cflags SDL2_net | sed 's/[[:space:]]*-Dmain=SDL_main//g'`" + printf "found SDL2_net with pkgconfig" else append_var SDL2_NET_LIBS "-lSDL2_net" + printf "adding -lSDL2_net directly" fi fi @@ -4061,7 +4064,7 @@ fi # Check for SDL_Net - echocheck "SDL_Net" + echocheck "SDL_Net compiling" _sdlnet=no cat > $TMPC << EOF #include "SDL_net.h" diff -ruN scummvm-2.7.0-orig/gui/about.cpp scummvm-2.7.0/gui/about.cpp --- scummvm-2.7.0-orig/gui/about.cpp 2023-02-13 16:19:18.000000000 -0600 +++ scummvm-2.7.0/gui/about.cpp 2023-05-04 04:18:36.000000000 -0500 @@ -99,10 +99,6 @@ version += gScummVMVersion; addLine(version); - // I18N: built on with - Common::U32String date = Common::U32String::format(_("(built on %s with %s)"), gScummVMBuildDate, gScummVMCompiler); - addLine(Common::U32String("C2") + date); - for (i = 0; i < ARRAYSIZE(copyright_text); i++) addLine(Common::U32String(copyright_text[i]));