summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2015-04-04 18:25:04 +1100
committer Vas Crabb <vas@vastheman.com>2015-04-04 18:25:04 +1100
commit73f53bb15e363712d097fe59c097de1a1fb9fed0 (patch)
tree70b159e73ec28ed30fc6635c0df79007318ac031 /src
parent3a15dfc2d89ca7d42748ced4582e69e6556c61cd (diff)
* Take more link dependencies caused by OSD out of genie.lua
* Always dynamically link SDL on Windows * Fix SDL1 build on Windows
Diffstat (limited to 'src')
-rw-r--r--src/osd/sdl/video.h5
-rw-r--r--src/osd/sdl/window.c17
2 files changed, 16 insertions, 6 deletions
diff --git a/src/osd/sdl/video.h b/src/osd/sdl/video.h
index 913116f6b62..862988fe6ac 100644
--- a/src/osd/sdl/video.h
+++ b/src/osd/sdl/video.h
@@ -12,6 +12,11 @@
#ifndef __SDLVIDEO__
#define __SDLVIDEO__
+#if defined(SDLMAME_WIN32) && !(SDLMAME_SDL2)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
#include "osdsdl.h"
//============================================================
diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c
index e77fa480bb0..d44742c80f6 100644
--- a/src/osd/sdl/window.c
+++ b/src/osd/sdl/window.c
@@ -9,6 +9,11 @@
//
//============================================================
+#ifdef SDLMAME_WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
// standard SDL headers
#include "sdlinc.h"
@@ -60,16 +65,16 @@
// minimum window dimension
#define MIN_WINDOW_DIM 200
-//#ifndef SDLMAME_WIN32
-#define WMSZ_TOP (0)
-#define WMSZ_BOTTOM (1)
+#ifndef SDLMAME_WIN32
+#define WMSZ_TOP (0)
+#define WMSZ_BOTTOM (1)
#define WMSZ_BOTTOMLEFT (2)
#define WMSZ_BOTTOMRIGHT (3)
-#define WMSZ_LEFT (4)
+#define WMSZ_LEFT (4)
#define WMSZ_TOPLEFT (5)
#define WMSZ_TOPRIGHT (6)
-#define WMSZ_RIGHT (7)
-//#endif
+#define WMSZ_RIGHT (7)
+#endif
//============================================================
// GLOBAL VARIABLES