diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfsound/stdafx.h | 2 | ||||
| -rw-r--r-- | plugins/dfxvideo/externals.h | 5 | ||||
| -rw-r--r-- | plugins/dfxvideo/gpu.c | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/plugins/dfsound/stdafx.h b/plugins/dfsound/stdafx.h index 7d1a1f52..3f28ceb9 100644 --- a/plugins/dfsound/stdafx.h +++ b/plugins/dfsound/stdafx.h @@ -31,6 +31,8 @@ #include "resource.h"
+#pragma warning (disable:4996)
+
#else
#ifndef _MACOSX diff --git a/plugins/dfxvideo/externals.h b/plugins/dfxvideo/externals.h index 35fe0eff..e8e36626 100644 --- a/plugins/dfxvideo/externals.h +++ b/plugins/dfxvideo/externals.h @@ -60,6 +60,9 @@ #define D3D_OVERLOADS
#define DIRECT3D_VERSION 0x600
#define CINTERFACE
+#ifndef WINVER
+#define WINVER 0x0500
+#endif
#include <stdio.h>
#include <stdlib.h>
@@ -71,7 +74,7 @@ #include <tchar.h>
#include "resource.h"
-#include "ddraw.h"
+#include "ddraw.h"
#include "d3dtypes.h"
#include "d3d.h"
diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c index f9def091..470a0e5b 100644 --- a/plugins/dfxvideo/gpu.c +++ b/plugins/dfxvideo/gpu.c @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#ifndef _MACGL +#if !defined(_MACGL) && !defined(_WINDOWS) #include "config.h" #endif @@ -379,9 +379,9 @@ void CALLBACK GPUmakeSnapshot(void) if (PSXDisplay.RGB24) { uint32_t lu = *(uint32_t *)pD; - line[j * 3 + 2] = RED(lu); - line[j * 3 + 1] = GREEN(lu); - line[j * 3 + 0] = BLUE(lu); + line[j * 3 + 2] = (unsigned char)RED(lu); + line[j * 3 + 1] = (unsigned char)GREEN(lu); + line[j * 3 + 0] = (unsigned char)BLUE(lu); pD += 3; } else |