Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-16 05:24:54 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
Robbbert 2015-03-29 12:55:11 +11:00
commit fcc0bfed80
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
makefile
View File

@ -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