summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Robbbert <pac0446@bigpond.net.au>2015-03-29 12:55:11 +1100
committer Robbbert <pac0446@bigpond.net.au>2015-03-29 12:55:11 +1100
commitfcc0bfed80e28d513539abdded7c802f6ca710a3 (patch)
treed88f33470e8c152480d99b3bcdf4e345eb834e6a
parentec1999fcbb1c8b309c914c760a86af501a9bf675 (diff)
parent1f9ec28ba485f917b9c73c6ad305b15dff3f499d (diff)
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r--makefile12
1 files 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