diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-17 21:26:57 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-17 21:26:57 +0000 |
| commit | 24bbfa46caf3c7972ddac1b8cec577bfd0fa29e0 (patch) | |
| tree | beea6f8c3fd95b0629e31bcdbe7f92ea26a53e2b /crawl-ref/source/makefile | |
| parent | 3390e50bf690f56f9ae078b7ff9695e20355f905 (diff) | |
| download | crawl-ref-24bbfa46caf3c7972ddac1b8cec577bfd0fa29e0.tar.gz crawl-ref-24bbfa46caf3c7972ddac1b8cec577bfd0fa29e0.zip | |
Apply Haran's recent fixes to branch.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6592 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 9e1ded2ab6..0bb53bc62a 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -4,12 +4,12 @@ #Makefile chooser. Choose one: -MAKEFILE ?= makefile.unix +#MAKEFILE ?= makefile.unix #MAKEFILE ?= makefile.dos #MAKEFILE ?= makefile.osx #MAKEFILE ?= makefile.mgw #MAKEFILE ?= makefile_tiles.mgw -#MAKEFILE ?= makefile.x11 +MAKEFILE ?= makefile.x11 #jmf: number of concurrent jobs -- good value is (#_of_CPUs * 2) + 1 # cuts build time a lot on multi-cpu machines |