[Scummvm-git-logs] scummvm master -> 6e40b64eb1b8d605cf6dc958c80507a6db595614
sev-
sev at scummvm.org
Sat Aug 18 14:08:44 CEST 2018
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4fe84887cc BUILD: Update flags for compiling on FreeMiNT
e0b4bb0f1e AUDIO: Fix non-compilable STMIDI audio backend
6e40b64eb1 POSIX: Allow forbidden symbols required by FreeMiNT
Commit: 4fe84887cc063fd0be9c6d8dfa55100057b7440f
https://github.com/scummvm/scummvm/commit/4fe84887cc063fd0be9c6d8dfa55100057b7440f
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-08-18T14:08:40+02:00
Commit Message:
BUILD: Update flags for compiling on FreeMiNT
Changed paths:
configure
diff --git a/configure b/configure
index 62560d6..b70dba8 100755
--- a/configure
+++ b/configure
@@ -2053,7 +2053,7 @@ if test "$have_gcc" = yes ; then
case $_host_os in
# newlib-based system include files suppress non-C89 function
# declarations under __STRICT_ANSI__
- 3ds | amigaos* | android | androidsdl | dreamcast | ds | gamecube | mingw* | n64 | psp | ps2 | ps3 | psp2 | tizen | wii | wince )
+ 3ds | amigaos* | android | androidsdl | dreamcast | ds | gamecube | mingw* | mint* | n64 | psp | ps2 | ps3 | psp2 | tizen | wii | wince )
;;
*)
append_var CXXFLAGS "-ansi"
@@ -2757,6 +2757,8 @@ case $_host_os in
;;
mint*)
append_var DEFINES "-DSYSTEM_NOT_SUPPORTING_D_TYPE"
+ append_var DEFINES "-D_GNU_SOURCE"
+ append_var DEFINES "-D_ISOC11_SOURCE"
;;
msys)
echo ERROR: Using the MSYS shell in msys mode is not supported. Please use the MSYS shell in mingw mode instead.
@@ -3154,10 +3156,8 @@ if test -n "$_host"; then
_timidity=no
;;
m68k-atari-mint)
- append_var DEFINES "-DSYSTEM_NOT_SUPPORTING_D_TYPE"
- _ranlib=m68k-atari-mint-ranlib
- _ar="m68k-atari-mint-ar cru"
_seq_midi=no
+ _timidity=no
;;
maemo)
_optimization_level=-Os
Commit: e0b4bb0f1ec77e5b739881f23cc394c0bcf0e878
https://github.com/scummvm/scummvm/commit/e0b4bb0f1ec77e5b739881f23cc394c0bcf0e878
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-08-18T14:08:40+02:00
Commit Message:
AUDIO: Fix non-compilable STMIDI audio backend
Changed paths:
backends/midi/stmidi.cpp
diff --git a/backends/midi/stmidi.cpp b/backends/midi/stmidi.cpp
index 28350b3..de0f05a 100644
--- a/backends/midi/stmidi.cpp
+++ b/backends/midi/stmidi.cpp
@@ -41,6 +41,7 @@
#include <osbind.h>
#include "audio/mpu401.h"
+#include "common/error.h"
#include "common/util.h"
#include "audio/musicplugin.h"
Commit: 6e40b64eb1b8d605cf6dc958c80507a6db595614
https://github.com/scummvm/scummvm/commit/6e40b64eb1b8d605cf6dc958c80507a6db595614
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-08-18T14:08:40+02:00
Commit Message:
POSIX: Allow forbidden symbols required by FreeMiNT
Changed paths:
backends/fs/chroot/chroot-fs-factory.cpp
backends/fs/chroot/chroot-fs.cpp
backends/fs/posix/posix-fs-factory.cpp
backends/fs/posix/posix-fs.cpp
backends/platform/sdl/posix/posix.cpp
backends/saves/posix/posix-saves.cpp
diff --git a/backends/fs/chroot/chroot-fs-factory.cpp b/backends/fs/chroot/chroot-fs-factory.cpp
index db5655f..dadc50b 100644
--- a/backends/fs/chroot/chroot-fs-factory.cpp
+++ b/backends/fs/chroot/chroot-fs-factory.cpp
@@ -26,6 +26,8 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
#define FORBIDDEN_SYMBOL_EXCEPTION_exit //Needed for IRIX's unistd.h
+#define FORBIDDEN_SYMBOL_EXCEPTION_random
+#define FORBIDDEN_SYMBOL_EXCEPTION_srandom
#include "backends/fs/chroot/chroot-fs-factory.h"
#include "backends/fs/chroot/chroot-fs.h"
diff --git a/backends/fs/chroot/chroot-fs.cpp b/backends/fs/chroot/chroot-fs.cpp
index ac7cde3..c10cc0b 100644
--- a/backends/fs/chroot/chroot-fs.cpp
+++ b/backends/fs/chroot/chroot-fs.cpp
@@ -29,6 +29,8 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
#define FORBIDDEN_SYMBOL_EXCEPTION_getenv
#define FORBIDDEN_SYMBOL_EXCEPTION_exit //Needed for IRIX's unistd.h
+#define FORBIDDEN_SYMBOL_EXCEPTION_random
+#define FORBIDDEN_SYMBOL_EXCEPTION_srandom
#include "backends/fs/chroot/chroot-fs.h"
diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp
index d6266c7..6ef5fce 100644
--- a/backends/fs/posix/posix-fs-factory.cpp
+++ b/backends/fs/posix/posix-fs-factory.cpp
@@ -28,6 +28,8 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
#define FORBIDDEN_SYMBOL_EXCEPTION_exit //Needed for IRIX's unistd.h
+#define FORBIDDEN_SYMBOL_EXCEPTION_random
+#define FORBIDDEN_SYMBOL_EXCEPTION_srandom
#include "backends/fs/posix/posix-fs-factory.h"
#include "backends/fs/posix/posix-fs.h"
diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp
index 01c2751..b0c8889 100644
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@@ -29,6 +29,8 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
#define FORBIDDEN_SYMBOL_EXCEPTION_getenv
#define FORBIDDEN_SYMBOL_EXCEPTION_exit //Needed for IRIX's unistd.h
+#define FORBIDDEN_SYMBOL_EXCEPTION_random
+#define FORBIDDEN_SYMBOL_EXCEPTION_srandom
#include "backends/fs/posix/posix-fs.h"
#include "backends/fs/stdiostream.h"
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index b8a0402..4665228 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -26,6 +26,8 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h //On IRIX, sys/stat.h includes sys/time.h
#define FORBIDDEN_SYMBOL_EXCEPTION_system
+#define FORBIDDEN_SYMBOL_EXCEPTION_random
+#define FORBIDDEN_SYMBOL_EXCEPTION_srandom
#include "common/scummsys.h"
diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp
index 2a7b4d3..9c2206b 100644
--- a/backends/saves/posix/posix-saves.cpp
+++ b/backends/saves/posix/posix-saves.cpp
@@ -27,6 +27,8 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
#define FORBIDDEN_SYMBOL_EXCEPTION_getenv
+#define FORBIDDEN_SYMBOL_EXCEPTION_random
+#define FORBIDDEN_SYMBOL_EXCEPTION_srandom
#include "common/scummsys.h"
More information about the Scummvm-git-logs
mailing list