From 602e2de3e016272f29067f7c98b24c5cdfa65834 Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Mon, 30 Mar 2015 03:50:34 +1100
Subject: [PATCH] Fix osdmini build on Windows (crashes if you run it though)

---
 scripts/genie.lua               | 7 -------
 scripts/src/osd/sdl.lua         | 8 ++++++++
 scripts/src/osd/sdl_cfg.lua     | 1 +
 scripts/src/osd/windows.lua     | 5 +++++
 scripts/src/osd/windows_cfg.lua | 1 +
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/scripts/genie.lua b/scripts/genie.lua
index 5c8ad04dc75..d16ebf179a7 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -715,13 +715,9 @@ configuration { "osx*" }
 
 
 configuration { "mingw*" }
-		defines {
-			"main=utf8_main",
-		}
 		linkoptions {
 			"-static-libgcc",
 			"-static-libstdc++",
-			"-municode",
 		}
 if _OPTIONS["osd"]=="sdl" then
 		links {
@@ -748,9 +744,6 @@ end
 		}
 
 configuration { "vs*" }
-		defines {
-			"main=utf8_main",
-		}
 		defines {
 			"XML_STATIC",
 			"WIN32",
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index ffe4080a6e4..e548aa677f1 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -28,6 +28,14 @@ function maintargetosdoptions(_target)
 	configuration { }
 end
 
+
+if _OPTIONS["targetos"]=="windows" then
+	linkoptions {
+		"-municode",
+	}
+end
+
+
 configuration { "mingw*" }
 		linkoptions {
 			"-Wl,--allow-multiple-definition",
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index e746dcf40df..600e19035b6 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -13,6 +13,7 @@ if _OPTIONS["targetos"]=="windows" then
 		"USE_OPENGL=1",
 		"USE_QTDEBUG=1",
 		"SDLMAME_NET_PCAP",
+		"main=utf8_main",
 	}
 
 	buildoptions {
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 6cdc4009b11..70aa239e766 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -13,6 +13,11 @@ function maintargetosdoptions(_target)
 end
 
 
+linkoptions {
+	"-municode",
+}
+
+
 project ("osd_" .. _OPTIONS["osd"])
 	uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
 	kind "StaticLib"
diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua
index 90944ecbb4f..50775976b01 100644
--- a/scripts/src/osd/windows_cfg.lua
+++ b/scripts/src/osd/windows_cfg.lua
@@ -12,4 +12,5 @@ defines {
 	"USE_DISPATCH_GL=1",
 	"DIRECTINPUT_VERSION=0x0800",
 	"SDLMAME_NET_PCAP",
+	"main=utf8_main",
 }