diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-06 05:04:40 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-06 05:04:40 +0000 |
| commit | 7281e182f7ade312409dee7b007188906169918e (patch) | |
| tree | 45d8a8ad7e60524471d0441f65187dd25e3b633c /crawl-ref/source/makefile | |
| parent | d8a1d291f7fc2b4499f6366255f83fbcdd76d35a (diff) | |
| download | crawl-ref-7281e182f7ade312409dee7b007188906169918e.tar.gz crawl-ref-7281e182f7ade312409dee7b007188906169918e.zip | |
Modified top level makefile to conditionally set the MAKEFILE variable.
Fixed warning in non-tiles build.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3212 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index d9cdd776a4..69e243b507 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -4,12 +4,12 @@ #Makefile chooser. Choose one: -MAKEFILE = makefile.unix -#MAKEFILE = makefile.dos -#MAKEFILE = makefile.osx -#MAKEFILE = makefile.mgw -#MAKEFILE = makefile_tiles.mgw -#MAKEFILE = makefile.x11 +MAKEFILE ?= makefile.unix +#MAKEFILE ?= makefile.dos +#MAKEFILE ?= makefile.osx +#MAKEFILE ?= makefile.mgw +#MAKEFILE ?= makefile_tiles.mgw +#MAKEFILE ?= makefile.x11 #jmf: number of concurrent jobs -- good value is (#_of_CPUs * 2) + 1 # cuts build time a lot on multi-cpu machines |