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

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
737473895f DC: Fix compilation
b661b7e428 COMMON: Attempt to fix DC build


Commit: 737473895f15342114109fa100880b5beaa27e0f
    https://github.com/scummvm/scummvm/commit/737473895f15342114109fa100880b5beaa27e0f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-10T10:22:41+02:00

Commit Message:
DC: Fix compilation

Changed paths:
    backends/platform/dc/dc.h
    backends/platform/dc/display.cpp


diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index 9c1ff0451c..f8f8416941 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -98,6 +98,8 @@ protected:
 
 public:
 
+  virtual Graphics::PixelBuffer getScreenPixelBuffer();
+
   // Determine the pixel format currently in use for screen rendering.
   Graphics::PixelFormat getScreenFormat() const;
 
diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp
index e197d88019..b3171a4a03 100644
--- a/backends/platform/dc/display.cpp
+++ b/backends/platform/dc/display.cpp
@@ -22,8 +22,9 @@
 
 #define RONIN_TIMER_ACCESS
 
-#include <common/scummsys.h>
-#include <graphics/surface.h>
+#include "common/scummsys.h"
+#include "graphics/surface.h"
+#include "graphics/pixelbuffer.h"
 #include "dc.h"
 
 #define SCREEN_W 640
@@ -185,6 +186,11 @@ void OSystem_Dreamcast::grabPalette(byte *colors, uint start, uint num) const
     }
 }
 
+Graphics::PixelBuffer OSystem_Dreamcast::getScreenPixelBuffer()
+{
+  return Graphics::PixelBuffer();
+}
+
 Graphics::PixelFormat OSystem_Dreamcast::getScreenFormat() const
 {
   return screenFormats[_screenFormat];


Commit: b661b7e4281ba3c8be7826792ef1a6d83833462f
    https://github.com/scummvm/scummvm/commit/b661b7e4281ba3c8be7826792ef1a6d83833462f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-10T10:28:05+02:00

Commit Message:
COMMON: Attempt to fix DC build

Changed paths:
    common/streamdebug.cpp
    common/streamdebug.h


diff --git a/common/streamdebug.cpp b/common/streamdebug.cpp
index 7f7878a949..ba3ff4e519 100644
--- a/common/streamdebug.cpp
+++ b/common/streamdebug.cpp
@@ -100,10 +100,12 @@ Debug &Debug::operator<<(unsigned int num) {
 	return maybeSpace();
 }
 
+#ifndef __DC__
 Debug &Debug::operator<<(double num) {
 	_stream->msg += String::format("%g", num);
 	return maybeSpace();
 }
+#endif
 
 Debug &Debug::operator<<(float num) {
 	_stream->msg += String::format("%g", num);
@@ -132,4 +134,3 @@ Debug &Debug::operator=(const Debug &other) {
 Common::Debug streamDbg(int level) {
 	return Common::Debug(level);
 }
-
diff --git a/common/streamdebug.h b/common/streamdebug.h
index 74346742fd..0d1af18ae2 100644
--- a/common/streamdebug.h
+++ b/common/streamdebug.h
@@ -42,7 +42,11 @@ public:
 	Debug &operator<<(char str);
 	Debug &operator<<(int number);
 	Debug &operator<<(unsigned int number);
+
+	// DC has float and double equal
+#ifndef __DC__
 	Debug &operator<<(double number);
+#endif
 	Debug &operator<<(float number);
 	Debug &operator<<(bool value);
 	Debug &operator<<(void *p);