From 8548e1273bf068feeeed283e9ae90ca826fd0efa Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sun, 22 Apr 2007 20:31:54 +0000
Subject: Fixed trunk build for DOS and Windows. DOS and Windows builds use a
 SQLite db, with a dbm-like wrapper so database.cc builds unchanged.

Added SQLite to the source tree. Only DOS and Windows builds use it at the
moment, but it can be added to Unix builds easily (and will be added
automatically if a suitable db.h or ndbm.h is not found).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1342 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/makefile.dos | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'crawl-ref/source/makefile.dos')

diff --git a/crawl-ref/source/makefile.dos b/crawl-ref/source/makefile.dos
index e6a04b722b..a28780bb74 100644
--- a/crawl-ref/source/makefile.dos
+++ b/crawl-ref/source/makefile.dos
@@ -25,8 +25,13 @@ endif
 LUALIB = lua
 LUALIBA = lib$(LUALIB).a
 
-LIB = -L$(LUASRC) -l$(LUALIB)
-INCLUDES := -Iutil -I. -I$(LUASRC)
+SQLSRC := util\sqlite
+SQLLIB := sql3
+SQLLIBA := lib$(SQLLIB).a
+FSQLLIBA := $(SQLSRC)\$(SQLLIBA)
+
+LIB = -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB)
+INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC)
 
 WORKDIR := $(shell cd)
 
@@ -58,7 +63,7 @@ endif
 
 OBJECTS := $(UTIL)levcomp.o $(UTIL)levtab.o $(UTIL)levlex.o $(OBJECTS)
 
-GAME_DEPENDS := $(LUASRC)\$(LUALIBA) $(OBJECTS)
+GAME_DEPENDS := $(LUASRC)\$(LUALIBA) $(FSQLLIBA) $(OBJECTS)
 
 ##########################################################################
 
@@ -131,7 +136,12 @@ clean-lua:
 		$(MAKE) clean_win
 		cd $(WORKDIR)
 
-distclean: clean-lua
+clean-sql:
+		cd $(SQLSRC)
+		$(MAKE) "RM_F=cmd /c del /f" clean
+		cd $(WORKDIR)
+
+distclean: clean-lua clean-sql
 		$(DELETE) *.o 
 		$(DELETE) bones.*
 		$(DELETE) morgue.txt
@@ -167,4 +177,14 @@ $(LUASRC)\$(LUALIBA):
 	@echo Building Lua...
 	@cd $(LUASRC)
 	@$(MAKE) crawl_dos
-	@cd $(WORKDIR)
\ No newline at end of file
+	@cd $(WORKDIR)
+
+#############################################################################
+# Build SQLite
+
+$(FSQLLIBA):
+	@echo Building SQLite
+	cd $(SQLSRC)
+	$(MAKE) LIBSQL=$(SQLLIBA)
+	cd $(WORKDIR)
+
-- 
cgit v1.2.3-54-g00ecf