diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-17 07:47:50 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-17 07:47:50 +0000 |
commit | 0a69a524938f8c559947685b901abdb22043925b (patch) | |
tree | b54afdee8f5b7d1669fdd2453cd5f6fe733bb687 /crawl-ref/source/makefile | |
parent | ae735f39601423c88be471340dfe88dc3d3d103d (diff) | |
download | crawl-ref-0a69a524938f8c559947685b901abdb22043925b.tar.gz crawl-ref-0a69a524938f8c559947685b901abdb22043925b.zip |
Apply r6579 to 0.4.1, and revert my local makefile change (oops!)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6581 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 0bb53bc62a..9e1ded2ab6 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 |