diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-09-29 17:27:33 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-09-29 17:27:33 -0700 |
| commit | 72068573977f6c562a7a0928ba37a16172a57b13 (patch) | |
| tree | 9a861c81e2332de7449860e1d0353d1478569351 /crawl-ref | |
| parent | d0ffdd174d62b6de8fe65416f81192509e4ba74e (diff) | |
| download | crawl-ref-72068573977f6c562a7a0928ba37a16172a57b13.tar.gz crawl-ref-72068573977f6c562a7a0928ba37a16172a57b13.zip | |
makefiles: set CXX variable only if not overridden on command-line
Allows compiler selection on the command-line. For instance,
if we wanted to use llvm-g++, we'd use 'make CXX=llvm-g++'.
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/makefile.unix | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makefile_tiles.mgw | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makefile_tiles.unix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix index f8fc9e30eb..67f994ee0e 100644 --- a/crawl-ref/source/makefile.unix +++ b/crawl-ref/source/makefile.unix @@ -12,7 +12,7 @@ include makefile.obj OBJECTS += libunix.o crash-u.o -CXX = g++ +CXX ?= g++ DELETE = rm -f COPY = cp OS_TYPE = UNIX diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw index 93fe6eaeb0..8110433f4d 100644 --- a/crawl-ref/source/makefile_tiles.mgw +++ b/crawl-ref/source/makefile_tiles.mgw @@ -11,7 +11,7 @@ endif # need .exe so make will find the right file APPNAME = $(OPATH)\crawl.exe -CXX = g++ +CXX ?= g++ DELETE = del COPY = copy OS_TYPE = WIN32TILES diff --git a/crawl-ref/source/makefile_tiles.unix b/crawl-ref/source/makefile_tiles.unix index fe968520d1..7d199d0f21 100644 --- a/crawl-ref/source/makefile_tiles.unix +++ b/crawl-ref/source/makefile_tiles.unix @@ -14,7 +14,7 @@ OBJECTS += libgui.o tilepick.o tile2.o tilereg.o tilesdl.o tilefont.o tiletex.o SDL_CFLAGS := $(shell sdl-config --cflags) -CXX = g++ +CXX ?= g++ DELETE = rm -f COPY = cp OS_TYPE = UNIX |