summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/debug.cc2
-rw-r--r--crawl-ref/source/makefile12
2 files changed, 8 insertions, 6 deletions
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 07fcc1e5d7..df323e2c23 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -646,6 +646,8 @@ static void wizard_go_to_level(const level_pos &pos)
old_level, old_where);
#ifdef USE_TILE
TileNewLevel(newlevel);
+#else
+ UNUSED(newlevel);
#endif
save_game_state();
new_level();
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