Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

renamed CC to OVERRIDE_CC and same for CXX and LD since otherwise values sent to GENie are makefile defaults and they always overwrite values in built scripts (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-03-27 15:11:41 +01:00
parent f3ad510321
commit fdd61e7569
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
makefile
View File

@ -18,15 +18,6 @@
ifdef TOOLS
PARAMS+= --with-tools
endif
ifdef CC
PARAMS+= --CC='$(CC)'
endif
ifdef CXX
PARAMS+= --CXX='$(CXX)'
endif
ifdef LD
PARAMS+= --LD='$(LD)'
endif
#-------------------------------------------------
# specify core target: mame, mess, etc.
@ -154,6 +145,8 @@ endif
PYTHON = @python
CC = @gcc
LD = @g++
#-------------------------------------------------
# distribution may change things
@ -165,14 +158,25 @@ else
ifeq ($(DISTRO),debian-stable)
else
ifeq ($(DISTRO),ubuntu-intrepid)
# Force gcc-4.2 on ubuntu-intrepid
CC = @gcc -V 4.2
LD = @g++-4.2
else
ifeq ($(DISTRO),gcc44-generic)
CC = @gcc-4.4
LD = @g++-4.4
else
ifeq ($(DISTRO),gcc45-generic)
CC = @gcc-4.5
LD = @g++-4.5
else
ifeq ($(DISTRO),gcc46-generic)
CC = @gcc-4.6
LD = @g++-4.6
else
ifeq ($(DISTRO),gcc47-generic)
CC = @gcc-4.7
LD = @g++-4.7
else
$(error DISTRO $(DISTRO) unknown)
endif
@ -185,6 +189,19 @@ endif
PARAMS+= --distro=$(DISTRO)
ifdef OVERRIDE_CC
PARAMS+= --CC='$(OVERRIDE_CC)'
CC = $(OVERRIDE_CC)
endif
ifdef OVERRIDE_CXX
PARAMS+= --CXX='$(OVERRIDE_CXX)'
CXX = $(OVERRIDE_CXX)
endif
ifdef OVERRIDE_LD
PARAMS+= --LD='$(OVERRIDE_LD)'
LD = $(OVERRIDE_LD)
endif
#-------------------------------------------------
# sanity check the configuration
#-------------------------------------------------