diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-09-30 01:00:29 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-09-30 01:00:55 -0700 |
| commit | 2345ad3da2d77020e16409b2031c3cd95900ad01 (patch) | |
| tree | 360b5d325099f97f1e95822284e767817af4a261 /crawl-ref | |
| parent | a98267af0f2c0c556af7ea554c06245d33e04393 (diff) | |
| download | crawl-ref-2345ad3da2d77020e16409b2031c3cd95900ad01.tar.gz crawl-ref-2345ad3da2d77020e16409b2031c3cd95900ad01.zip | |
Revert "makefiles: set CXX variable only if not overridden on command-line"
This reverts commit 72068573977f6c562a7a0928ba37a16172a57b13.
For some reason, CXX is defined by GNU make by default.
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 67f994ee0e..f8fc9e30eb 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 8110433f4d..93fe6eaeb0 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 7d199d0f21..fe968520d1 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 |