Ok shuffling done

scripts/genie.lua

@@ -327,24 +327,11 @@ dofile ("toolchain.lua")
 
 
 if _OPTIONS["targetos"]=="windows" then
-	configuration { "mingw*" }
-		linkoptions {
-			"-municode",
-		}
-	configuration { "vs*" }
-		flags {
-			"Unicode",
-		}
 	configuration { "x64" }
 		defines {
 			"X64_WINDOWS_ABI",
 		}
 	configuration { }
-		defines {
-			"UNICODE",
-			"_UNICODE",
-			"main=utf8_main",
-		}	
 end
 
 -- Avoid error when invoking genie --help.

scripts/src/osd/osdmini.lua

@@ -30,6 +30,7 @@ project ("osd_" .. _OPTIONS["osd"])
 	}
 
 	files {
+		MAME_DIR .. "src/osd/osdnet.c",
 		MAME_DIR .. "src/osd/osdmini/minimain.c",
 		MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
 		MAME_DIR .. "src/osd/modules/font/font_sdl.c",
@@ -87,6 +88,7 @@ project ("ocore_" .. _OPTIONS["osd"])
 	end
 
 	files {
+		MAME_DIR .. "src/osd/osdcore.c",
 		MAME_DIR .. "src/osd/modules/osdmodule.c",
 		MAME_DIR .. "src/osd/osdmini/minidir.c",
 		MAME_DIR .. "src/osd/osdmini/minifile.c",

scripts/src/osd/sdl.lua

@@ -43,6 +43,14 @@ function maintargetosdoptions(_target)
 	end
 
 	if _OPTIONS["targetos"]=="windows" then
+		configuration { "mingw*" }
+			linkoptions{
+				"-municode",
+			}
+		configuration { "vs*" }
+			flags {
+				"Unicode",
+			}
 		configuration { "x32", "vs*" }
 			libdirs {
 				path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86")

scripts/src/osd/sdl_cfg.lua

@@ -99,6 +99,12 @@ if BASE_TARGETOS=="unix" then
 end
 
 if _OPTIONS["targetos"]=="windows" then
+	defines {
+		"UNICODE",
+		"_UNICODE",
+		"main=utf8_main",
+	}
+
 	configuration { "vs*" }
 		includedirs {
 			path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include")

scripts/src/osd/windows.lua

@@ -4,6 +4,13 @@ dofile("modules.lua")
 function maintargetosdoptions(_target)
 	osdmodulestargetconf()
 
+	configuration { "mingw*" }
+		linkoptions {
+			"-municode",
+		}
+
+	configuration { }
+
 	if _OPTIONS["DIRECTINPUT"] == "8" then
 		links {
 			"dinput8",

scripts/src/osd/windows_cfg.lua

@@ -1,9 +1,19 @@
 defines {
+	"UNICODE",
+	"_UNICODE",
 	"OSD_WINDOWS",
 	"USE_SDL=0",
+	"main=utf8_main",
 	"_WIN32_WINNT=0x0501",
 }
 
+configuration { "vs*" }
+	flags {
+		"Unicode",
+	}
+
+configuration { }
+
 if not _OPTIONS["DONT_USE_NETWORK"] then
 	defines {
 		"USE_NETWORK",