From 935c280b4d68c581a97e2fbf2f91419773928b3c Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 29 Mar 2015 03:29:22 +0200
Subject: [PATCH] Fix cross-compile. The following will build mame64.exe on
 linux

make TARGETOS=windows PTR64=1 OSD=windows OS=linux VERBOSE=1 \
			OVERRIDE_CC="@ccache x86_64-w64-mingw32-gcc" \
			OVERRIDE_CXX="@ccache x86_64-w64-mingw32-g++" \
			OVERRIDE_LD="x86_64-w64-mingw32-g++" \
			WINDRES="x86_64-w64-mingw32-windres" \
			MINGW64=/usr $*
---
 makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index 806492f3356..84358f99bc1 100644
--- a/makefile
+++ b/makefile
@@ -133,6 +133,8 @@ ARCHITECTURE = x64
 endif
 endif
 
+else
+CROSS_BUILD = 1
 endif # TARGET_OS
 
 ifdef PTR64
@@ -191,16 +193,22 @@ PARAMS+= --distro=$(DISTRO)
 
 ifdef OVERRIDE_CC
 PARAMS+= --CC='$(OVERRIDE_CC)'
+ifndef CROSS_BUILD
 CC = $(OVERRIDE_CC)
 endif
+endif
 ifdef OVERRIDE_CXX
 PARAMS+= --CXX='$(OVERRIDE_CXX)'
+ifndef CROSS_BUILD
 CXX = $(OVERRIDE_CXX)
 endif
+endif
 ifdef OVERRIDE_LD
 PARAMS+= --LD='$(OVERRIDE_LD)'
+ifndef CROSS_BUILD
 LD = $(OVERRIDE_LD)
 endif
+endif
 
 #-------------------------------------------------
 # sanity check the configuration
@@ -299,10 +307,10 @@ endif
 # extension for executables
 EXE =
 
-ifeq ($(TARGETOS),windows)
+ifeq ($(OS),windows)
 EXE = .exe
 endif
-ifeq ($(TARGETOS),os2)
+ifeq ($(OS),os2)
 EXE = .exe
 endif