From 4e7f9e86e81af80de19f90b50632a1b579d9e4c3 Mon Sep 17 00:00:00 2001
From: Jeffrey Clark <dude@zaplabs.com>
Date: Wed, 9 Dec 2015 09:41:34 -0600
Subject: [PATCH 1/7] Refactor MACOSX_USE_LIBSDL to USE_LIBSDL for windows and
 linux static library support (nw)

---
 makefile                    |  6 ++---
 scripts/src/osd/sdl.lua     | 54 ++++++++++++++++++++++---------------
 scripts/src/osd/sdl_cfg.lua |  2 +-
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/makefile b/makefile
index 3f33bca63b3..88efddeb946 100644
--- a/makefile
+++ b/makefile
@@ -69,7 +69,7 @@
 # SDL_INSTALL_ROOT = /opt/sdl2
 # SDL_FRAMEWORK_PATH = $(HOME)/Library/Frameworks
 # SDL_LIBVER = sdl
-# MACOSX_USE_LIBSDL = 1
+# USE_LIBSDL = 1
 # CYGWIN_BUILD = 1
 
 # BUILDDIR = build
@@ -627,8 +627,8 @@ ifdef SDL_FRAMEWORK_PATH
 PARAMS += --SDL_FRAMEWORK_PATH='$(SDL_FRAMEWORK_PATH)'
 endif
 
-ifdef MACOSX_USE_LIBSDL
-PARAMS += --MACOSX_USE_LIBSDL='$(MACOSX_USE_LIBSDL)'
+ifdef USE_LIBSDL
+PARAMS += --USE_LIBSDL='$(USE_LIBSDL)'
 endif
 
 ifdef LDOPTS
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 6acb5a2d262..fd8cf22b026 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -54,14 +54,20 @@ function maintargetosdoptions(_target,_subtarget)
 	end
 
 	if _OPTIONS["targetos"]=="windows" then
-		if _OPTIONS["SDL_LIBVER"]=="sdl2" then
-			links {
-				"SDL2.dll",
-			}
+		if _OPTIONS["USE_LIBSDL"]~="1" then
+			if _OPTIONS["SDL_LIBVER"]=="sdl2" then
+				links {
+					"SDL2.dll",
+				}
+			else
+				links {
+					"SDL.dll",
+				}
+			end
 		else
-			links {
-				"SDL.dll",
-			}
+			local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+			addlibfromstring(str)
+			addoptionsfromstring(str)
 		end
 		links {
 			"psapi",
@@ -192,16 +198,16 @@ if not _OPTIONS["SDL_FRAMEWORK_PATH"] then
 end
 
 newoption {
-	trigger = "MACOSX_USE_LIBSDL",
-	description = "Use SDL library on OS (rather than framework)",
+	trigger = "USE_LIBSDL",
+	description = "Use SDL library on OS (rather than framework/dll)",
 	allowed = {
-		{ "0",  "Use framework"  },
+		{ "0",  "Use framework/dll"  },
 		{ "1",  "Use library" },
 	},
 }
 
-if not _OPTIONS["MACOSX_USE_LIBSDL"] then
-	_OPTIONS["MACOSX_USE_LIBSDL"] = "0"
+if not _OPTIONS["USE_LIBSDL"] then
+	_OPTIONS["USE_LIBSDL"] = "0"
 end
 
 
@@ -255,7 +261,7 @@ if BASE_TARGETOS=="unix" then
 				"-weak_framework Metal",
 			}
 		end
-		if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then
+		if _OPTIONS["USE_LIBSDL"]~="1" then
 			linkoptions {
 				"-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
 			}
@@ -269,7 +275,7 @@ if BASE_TARGETOS=="unix" then
 				}
 			end
 		else
-			local str = backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'")
+			local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
 			addlibfromstring(str)
 			addoptionsfromstring(str)
 		end
@@ -529,14 +535,20 @@ if _OPTIONS["with-tools"] then
 		}
 
 		if _OPTIONS["targetos"] == "windows" then
-			if _OPTIONS["SDL_LIBVER"] == "sdl2" then
-				links {
-					"SDL2.dll",
-				}
+			if _OPTIONS["USE_LIBSDL"]~="1" then
+				if _OPTIONS["SDL_LIBVER"] == "sdl2" then
+					links {
+						"SDL2.dll",
+					}
+				else
+					links {
+						"SDL.dll",
+					}
+				end
 			else
-				links {
-					"SDL.dll",
-				}
+				local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+				addlibfromstring(str)
+				addoptionsfromstring(str)
 			end
 			links {
 				"psapi",
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index dd902d1fe60..431443ac059 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -81,7 +81,7 @@ if BASE_TARGETOS=="unix" then
 		"SDLMAME_UNIX",
 	}
 	if _OPTIONS["targetos"]=="macosx" then
-		if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then
+		if _OPTIONS["USE_LIBSDL"]~="1" then
 			buildoptions {
 				"-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
 			}

From 36df7413dce0897215d3e01e54ac5334bb65d965 Mon Sep 17 00:00:00 2001
From: Jeffrey Clark <dude@zaplabs.com>
Date: Mon, 2 Nov 2015 21:05:34 -0600
Subject: [PATCH 2/7] add TOOLCHAIN make flag for explicit toolchain prefix
 cross compiling (nw)

---
 makefile                | 20 +++++++++++-------
 scripts/genie.lua       |  9 ++++++++
 scripts/src/osd/sdl.lua |  2 +-
 scripts/toolchain.lua   | 47 +++++++++++++++++++++++------------------
 4 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/makefile b/makefile
index 88efddeb946..cf6c49c75ff 100644
--- a/makefile
+++ b/makefile
@@ -75,6 +75,7 @@
 # BUILDDIR = build
 # TARGETOS = windows
 # CROSS_BUILD = 1
+# TOOLCHAIN =
 # OVERRIDE_CC = cc
 # OVERRIDE_CXX = c++
 # OVERRIDE_LD = ld
@@ -270,9 +271,9 @@ WINDRES  := $(MINGW32)/bin/windres
 endif
 else
 ifeq ($(ARCHITECTURE),_x64)
-WINDRES  := x86_64-w64-mingw32-windres
+WINDRES  := $(word 1,$(TOOLCHAIN) x86_64-w64-mingw32-)windres
 else
-WINDRES  := i686-w64-mingw32-windres
+WINDRES  := $(word 1,$(TOOLCHAIN) i686-w64-mingw32-)windres
 endif
 endif
 
@@ -407,6 +408,9 @@ endif
 
 PARAMS+= --distro=$(DISTRO)
 
+ifdef TOOLCHAIN
+PARAMS += --TOOLCHAIN='$(TOOLCHAIN)'
+endif
 ifdef OVERRIDE_CC
 PARAMS += --CC='$(OVERRIDE_CC)'
 ifndef CROSS_BUILD
@@ -777,12 +781,12 @@ endif
 
 ifeq ($(OS),windows)
 ifeq (posix,$(SHELLTYPE))
-GCC_VERSION      := $(shell $(subst @,,$(CC)) -dumpversion 2> /dev/null)
-CLANG_VERSION    := $(shell $(subst @,,$(CC)) --version 2> /dev/null| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$$/\1/" | head -n 1)
+GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null)
+CLANG_VERSION    := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$$/\1/" | head -n 1)
 PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python)
 else
-GCC_VERSION      := $(shell $(subst @,,$(CC)) -dumpversion 2> NUL)
-CLANG_VERSION    := $(shell $(subst @,,$(CC)) --version 2> NUL| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$$/\1/" | head -n 1)
+GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> NUL)
+CLANG_VERSION    := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> NUL| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$$/\1/" | head -n 1)
 PYTHON_AVAILABLE := $(shell $(PYTHON) --version > NUL 2>&1 && echo python)
 endif
 ifdef MSBUILD
@@ -799,9 +803,9 @@ MSBUILD_PARAMS += /p:Platform=win32
 endif
 endif
 else
-GCC_VERSION      := $(shell $(subst @,,$(CC)) -dumpversion 2> /dev/null)
+GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null)
 ifneq ($(OS),solaris)
-CLANG_VERSION    := $(shell $(subst @,,$(CC))  --version  2> /dev/null | head -n 1 | grep -e 'version [0-9]\.[0-9]\(\.[0-9]\)\?' -o | grep -e '[0-9]\.[0-9]\(\.[0-9]\)\?' -o | tail -n 1)
+CLANG_VERSION    := $(shell $(TOOLCHAIN)$(subst @,,$(CC))  --version  2> /dev/null | head -n 1 | grep -e 'version [0-9]\.[0-9]\(\.[0-9]\)\?' -o | grep -e '[0-9]\.[0-9]\(\.[0-9]\)\?' -o | tail -n 1)
 endif
 PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python)
 endif
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 4384b9f379b..8d52dc75391 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -197,6 +197,11 @@ newoption {
 	description = "LD replacement",
 }
 
+newoption {
+	trigger = "TOOLCHAIN",
+	description = "Toolchain prefix"
+}
+
 newoption {
 	trigger = "PROFILE",
 	description = "Enable profiling.",
@@ -427,6 +432,10 @@ if(_OPTIONS["USE_BGFX"]~=nil) then
 	USE_BGFX = tonumber(_OPTIONS["USE_BGFX"])
 end
 
+if(_OPTIONS["TOOLCHAIN"] == nil) then
+	_OPTIONS['TOOLCHAIN'] = ""
+end
+
 GEN_DIR = MAME_BUILD_DIR .. "generated/"
 
 if (_OPTIONS["target"] == nil) then return false end
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index fd8cf22b026..6a63e7caf91 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -106,7 +106,7 @@ end
 
 function sdlconfigcmd()
 	if not _OPTIONS["SDL_INSTALL_ROOT"] then
-		return _OPTIONS["SDL_LIBVER"] .. "-config"
+		return _OPTIONS['TOOLCHAIN'] .. "pkg-config " .. _OPTIONS["SDL_LIBVER"]
 	else
 		return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin",_OPTIONS["SDL_LIBVER"]) .. "-config"
 	end
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 27b571e18d0..aaf8811fed1 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -4,6 +4,11 @@
 --
 
 local naclToolchain = ""
+local toolchainPrefix = ""
+
+if _OPTIONS['TOOLCHAIN'] then
+	toolchainPrefix = _OPTIONS["TOOLCHAIN"]
+end
 
 newoption {
 	trigger = "gcc",
@@ -204,15 +209,18 @@ function toolchain(_buildDir, _subDir)
 			if not os.getenv("MINGW32") then
 				print("Set MINGW32 envrionment variable.")
 			end
-			premake.gcc.cc  = "$(MINGW32)/bin/i686-w64-mingw32-gcc"
-			premake.gcc.cxx = "$(MINGW32)/bin/i686-w64-mingw32-g++"
+			if not toolchainPrefix then
+				toolchainPrefix = "$(MINGW32)/bin/i686-w64-mingw32-"
+			end
+			premake.gcc.cc  = toolchainPrefix .. "gcc"
+			premake.gcc.cxx = toolchainPrefix .. "g++"
 -- work around GCC 4.9.2 not having proper linker for LTO=1 usage
 			local version_4_ar = str_to_version(_OPTIONS["gcc_version"])
 			if (version_4_ar < 50000) then
-				premake.gcc.ar  = "$(MINGW32)/bin/ar"
+				premake.gcc.ar  = toolchainPrefix .. "ar"
 			end
 			if (version_4_ar >= 50000) then
-				premake.gcc.ar  = "$(MINGW32)/bin/gcc-ar"
+				premake.gcc.ar  = toolchainPrefix .. "gcc-ar"
 			end
 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw32-gcc")
 		end
@@ -221,20 +229,22 @@ function toolchain(_buildDir, _subDir)
 			if not os.getenv("MINGW64") then
 				print("Set MINGW64 envrionment variable.")
 			end
-			premake.gcc.cc  = "$(MINGW64)/bin/x86_64-w64-mingw32-gcc"
-			premake.gcc.cxx = "$(MINGW64)/bin/x86_64-w64-mingw32-g++"
+			if not toolchainPrefix then
+				toolchainPrefix = "$(MINGW64)/bin/x86_64-w64-mingw32-"
+			end
+			premake.gcc.cc  = toolchainPrefix .. "gcc"
+			premake.gcc.cxx = toolchainPrefix .. "g++"
 -- work around GCC 4.9.2 not having proper linker for LTO=1 usage
 			local version_4_ar = str_to_version(_OPTIONS["gcc_version"])
 			if (version_4_ar < 50000) then
-				premake.gcc.ar  = "$(MINGW64)/bin/ar"
+				premake.gcc.ar  = toolchainPrefix .. "ar"
 			end
 			if (version_4_ar >= 50000) then
-				premake.gcc.ar  = "$(MINGW64)/bin/gcc-ar"
+				premake.gcc.ar  = toolchainPrefix .. "gcc-ar"
 			end
 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw64-gcc")
 		end
 
-
 		if "mingw-clang" == _OPTIONS["gcc"] then
 			premake.gcc.cc   = "clang"
 			premake.gcc.cxx  = "clang++"
@@ -283,18 +293,17 @@ function toolchain(_buildDir, _subDir)
 
 		if "osx" == _OPTIONS["gcc"] then
 			if os.is("linux") then
-				local osxToolchain = "x86_64-apple-darwin13-"
-				premake.gcc.cc  = osxToolchain .. "clang"
-				premake.gcc.cxx = osxToolchain .. "clang++"
-				premake.gcc.ar  = osxToolchain .. "ar"
+				premake.gcc.cc  = toolchainPrefix .. "clang"
+				premake.gcc.cxx = toolchainPrefix .. "clang++"
+				premake.gcc.ar  = toolchainPrefix .. "ar"
 			end
 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx")
 		end
 
 		if "osx-clang" == _OPTIONS["gcc"] then
-			premake.gcc.cc  = "clang"
-			premake.gcc.cxx = "clang++"
-			premake.gcc.ar  = "ar"
+			premake.gcc.cc  = toolchainPrefix .. "clang"
+			premake.gcc.cxx = toolchainPrefix .. "clang++"
+			premake.gcc.ar  = toolchainPrefix .. "ar"
 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang")
 		end
 
@@ -911,7 +920,6 @@ function toolchain(_buildDir, _subDir)
 end
 
 function strip()
-
 	configuration { "android-arm", "Release" }
 		postbuildcommands {
 			"$(SILENT) echo Stripping symbols.",
@@ -939,13 +947,12 @@ function strip()
 	configuration { "mingw*", "x64", "Release" }
 		postbuildcommands {
 			"$(SILENT) echo Stripping symbols.",
-			"$(SILENT) $(MINGW64)/bin/strip -s \"$(TARGET)\"",
+			"$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix or "$(MINGW64)/bin/") .. "strip -s \"$(TARGET)\"",
 		}
-
 	configuration { "mingw*", "x32", "Release" }
 		postbuildcommands {
 			"$(SILENT) echo Stripping symbols.",
-			"$(SILENT) $(MINGW32)/bin/strip -s \"$(TARGET)\""
+			"$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix or "$(MINGW32)/bin/") .. "strip -s \"$(TARGET)\"",
 		}
 
 	configuration { "pnacl" }

From 3570d4f0ebde2977fb8301f8f9a1c942cb149b17 Mon Sep 17 00:00:00 2001
From: Jeffrey Clark <dude@zaplabs.com>
Date: Mon, 2 Nov 2015 21:08:15 -0600
Subject: [PATCH 3/7] check STRIP_SYMBOLS in strip function and add strip
 support for osx (nw)

---
 scripts/genie.lua       |  5 +----
 scripts/src/osd/sdl.lua |  4 ++++
 scripts/src/tools.lua   | 31 +++++++++++++++++++++++++++++++
 scripts/toolchain.lua   | 10 ++++++++++
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/scripts/genie.lua b/scripts/genie.lua
index 8d52dc75391..dd955bd0ce9 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1309,10 +1309,7 @@ else
 	startproject (_OPTIONS["subtarget"])
 end 
 mainProject(_OPTIONS["target"],_OPTIONS["subtarget"])
-
-if (_OPTIONS["STRIP_SYMBOLS"]=="1") then
-	strip()
-end
+strip()
 
 if _OPTIONS["with-tools"] then
 	group "tools"
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 6a63e7caf91..8ac53f39173 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -565,6 +565,8 @@ if _OPTIONS["with-tools"] then
 				MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm",
 			}
 		end
+
+		strip()
 end
 
 
@@ -606,4 +608,6 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
 		files {
 			MAME_DIR .. "src/osd/sdl/aueffectutil.mm",
 		}
+
+		strip()
 end
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 19942651f0c..c3ed2654782 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -50,6 +50,8 @@ files {
 	MAME_DIR .. "src/tools/romcmp.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- chdman
 --------------------------------------------------
@@ -104,6 +106,8 @@ files {
 	MAME_DIR .. "src/version.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- jedutil
 --------------------------------------------------
@@ -145,6 +149,8 @@ files {
 	MAME_DIR .. "src/tools/jedutil.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- unidasm
 --------------------------------------------------
@@ -201,6 +207,7 @@ files {
 	MAME_DIR .. "src/emu/emucore.cpp",
 }
 
+strip()
 
 --------------------------------------------------
 -- ldresample
@@ -255,6 +262,8 @@ files {
 	MAME_DIR .. "src/tools/ldresample.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- ldverify
 --------------------------------------------------
@@ -308,6 +317,8 @@ files {
 	MAME_DIR .. "src/tools/ldverify.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- regrep
 --------------------------------------------------
@@ -349,6 +360,8 @@ files {
 	MAME_DIR .. "src/tools/regrep.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- srcclean
 ---------------------------------------------------
@@ -390,6 +403,8 @@ files {
 	MAME_DIR .. "src/tools/srcclean.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- src2html
 --------------------------------------------------
@@ -431,6 +446,8 @@ files {
 	MAME_DIR .. "src/tools/src2html.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- split
 --------------------------------------------------
@@ -483,6 +500,8 @@ files {
 	MAME_DIR .. "src/tools/split.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- pngcmp
 --------------------------------------------------
@@ -524,6 +543,8 @@ files {
 	MAME_DIR .. "src/tools/pngcmp.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- nltool
 --------------------------------------------------
@@ -578,6 +599,8 @@ files {
 	MAME_DIR .. "src/lib/netlist/prg/nltool.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- nlwav
 --------------------------------------------------
@@ -610,6 +633,8 @@ files {
   MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- castool
 --------------------------------------------------
@@ -664,6 +689,8 @@ files {
 	MAME_DIR .. "src/tools/castool.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- floptool
 --------------------------------------------------
@@ -719,6 +746,8 @@ files {
 	MAME_DIR .. "src/tools/floptool.cpp",
 }
 
+strip()
+
 --------------------------------------------------
 -- imgtool
 --------------------------------------------------
@@ -822,3 +851,5 @@ files {
 	MAME_DIR .. "src/tools/imgtool/modules/bml3.cpp",
 	MAME_DIR .. "src/tools/imgtool/modules/hp48.cpp",
 }
+
+strip()
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index aaf8811fed1..40690b00831 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -920,6 +920,16 @@ function toolchain(_buildDir, _subDir)
 end
 
 function strip()
+	if not _OPTIONS["STRIP_SYMBOLS"]=="1" then
+		return true
+	end
+
+	configuration { "osx-*", "Release" }
+		postbuildcommands {
+			"$(SILENT) echo Stripping symbols.",
+			"$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix) .. "strip \"$(TARGET)\"",
+		}
+
 	configuration { "android-arm", "Release" }
 		postbuildcommands {
 			"$(SILENT) echo Stripping symbols.",

From 591d1202ac2b9f75fdf957061ec42a04b644d2a5 Mon Sep 17 00:00:00 2001
From: Jeffrey Clark <dude@zaplabs.com>
Date: Tue, 3 Nov 2015 00:29:49 -0600
Subject: [PATCH 4/7] fix cross compile windows targetextension (nw)

---
 scripts/src/osd/sdl.lua |  5 +++
 scripts/src/tools.lua   | 80 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 8ac53f39173..edac636a8ad 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -566,6 +566,11 @@ if _OPTIONS["with-tools"] then
 			}
 		end
 
+		configuration { "mingw*" or "vs*" }
+			targetextension ".exe"
+
+		configuration { }
+
 		strip()
 end
 
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index c3ed2654782..421f5cc76b5 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -50,6 +50,11 @@ files {
 	MAME_DIR .. "src/tools/romcmp.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -106,6 +111,11 @@ files {
 	MAME_DIR .. "src/version.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -149,6 +159,11 @@ files {
 	MAME_DIR .. "src/tools/jedutil.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -207,6 +222,11 @@ files {
 	MAME_DIR .. "src/emu/emucore.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -262,6 +282,11 @@ files {
 	MAME_DIR .. "src/tools/ldresample.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -317,6 +342,11 @@ files {
 	MAME_DIR .. "src/tools/ldverify.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -360,6 +390,11 @@ files {
 	MAME_DIR .. "src/tools/regrep.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -403,6 +438,11 @@ files {
 	MAME_DIR .. "src/tools/srcclean.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -446,6 +486,11 @@ files {
 	MAME_DIR .. "src/tools/src2html.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -500,6 +545,11 @@ files {
 	MAME_DIR .. "src/tools/split.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -543,6 +593,11 @@ files {
 	MAME_DIR .. "src/tools/pngcmp.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -599,6 +654,11 @@ files {
 	MAME_DIR .. "src/lib/netlist/prg/nltool.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -633,6 +693,11 @@ files {
   MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -689,6 +754,11 @@ files {
 	MAME_DIR .. "src/tools/castool.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -746,6 +816,11 @@ files {
 	MAME_DIR .. "src/tools/floptool.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()
 
 --------------------------------------------------
@@ -852,4 +927,9 @@ files {
 	MAME_DIR .. "src/tools/imgtool/modules/hp48.cpp",
 }
 
+configuration { "mingw*" or "vs*" }
+	targetextension ".exe"
+
+configuration { }
+
 strip()

From 43cb7eb2e69c16e7a9a3c1f4043bce6dd2b78e07 Mon Sep 17 00:00:00 2001
From: Jeffrey Clark <dude@zaplabs.com>
Date: Mon, 2 Nov 2015 20:41:18 -0600
Subject: [PATCH 5/7] genie make targets for packager scripts (nw)

---
 makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/makefile b/makefile
index cf6c49c75ff..a70d6a6db12 100644
--- a/makefile
+++ b/makefile
@@ -1240,10 +1240,13 @@ $(GENIE): $(GENIE_SRC)
 
 3rdparty/genie/src/hosts/%.c:
 
-clean:
+.PHONY: genieclean
+genieclean:
+	$(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make clean
+
+clean: genieclean
 	@echo Cleaning...
 	-@rm -rf $(BUILDDIR)
-	$(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make clean
 	$(SILENT) $(MAKE) -C $(SRC)/devices/cpu/m68000 clean
 
 GEN_FOLDERS := $(GENDIR)/$(TARGET)/layout/ $(GENDIR)/$(TARGET)/$(SUBTARGET)/
@@ -1261,8 +1264,10 @@ endif
 $(GEN_FOLDERS):
 	-$(call MKDIR,$@)
 
+genie: $(GENIE)
+
 generate: \
-		$(GENIE) \
+		genie \
 		$(GEN_FOLDERS) \
 		$(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS)) \
 		$(SRC)/devices/cpu/m68000/m68kops.cpp

From 726d141193deaab9f9e5c915e4bd24ff46195f8c Mon Sep 17 00:00:00 2001
From: Jeffrey Clark <dude@zaplabs.com>
Date: Tue, 3 Nov 2015 08:53:15 -0600
Subject: [PATCH 6/7] fix windows bgfx library link in sdl builds (nw)

---
 scripts/src/osd/sdl.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index edac636a8ad..591b75d0b29 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -99,6 +99,11 @@ function maintargetosdoptions(_target,_subtarget)
 
 	configuration { "mingw*" or "vs*" }
 		targetprefix "sdl"
+		if USE_BGFX == 1 then
+			links {
+				"psapi"
+			}
+		end
 
 	configuration { }
 end

From 1ddc780160b8ba5bf0ab29b757e591700434e525 Mon Sep 17 00:00:00 2001
From: Jeffrey Clark <dude@zaplabs.com>
Date: Mon, 4 Jan 2016 21:41:56 -0600
Subject: [PATCH 7/7] osx clang, silence flac unknown attribute error (nw)

---
 scripts/src/3rdparty.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index ef46f1cab24..34376515c64 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -280,6 +280,11 @@ end
 		buildoptions {
 			"-Wno-enum-conversion",
 		}
+		if _OPTIONS["targetos"]=="macosx" then
+			buildoptions_c {
+				"-Wno-unknown-attributes",
+			}
+		end
 	end
 	configuration { }