Fix the DOS port.

4 files changed, 8 insertions, 0 deletions

diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h
index 9ec6d523fa..fcaa373b09 100644
--- a/crawl-ref/source/AppHdr.h
+++ b/crawl-ref/source/AppHdr.h
@@ -201,7 +201,9 @@
 
     // Use Perl-compatible regular expressions. libpcre must be available and
     // linked in.  This is optional.
+    #ifndef REGEX_PCRE
     #define REGEX_PCRE
+    #endif
 
 #elif defined(TARGET_OS_WINDOWS)
     #if !defined(USE_TILE)
diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite
-Subproject 5789354f91fdedf79f85b04facf29791fceea9f
+Subproject 582655fc04ad78968de280b9d928dc9ab16eec7
diff --git a/crawl-ref/source/libdos.cc b/crawl-ref/source/libdos.cc
index d704f6eedb..62e90ae93d 100644
--- a/crawl-ref/source/libdos.cc
+++ b/crawl-ref/source/libdos.cc
@@ -13,6 +13,8 @@
 #include "cio.h"
 #include <termios.h>
 #include <conio.h>
+#include "options.h"
+#include "viewgeom.h"
 
 #if defined(TARGET_OS_DOS)
 
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile
index c90de46ffb..6056922ce1 100644
--- a/crawl-ref/source/makefile
+++ b/crawl-ref/source/makefile
@@ -146,9 +146,13 @@ else
 ifdef NEED_LIBW32C
 OBJECTS += libw32c.o
 else
+ifdef NEED_LIBDOS
+OBJECTS += libdos.o
+else
 OBJECTS += libunix.o
 endif
 endif
+endif
 
 # To get stack trace symbols.
 # Note that MinGW doesn't support -rdynamic.