From 7594437a36acbdc7fb0c1a0e56b0954910c2543c Mon Sep 17 00:00:00 2001 From: Mateusz Kaduk Date: Mon, 23 May 2005 07:30:50 +0000 Subject: Building sqlite conditionaly --- src/Makefile.am | 8 ++++++-- src/sqlite/SQLiteWrapper.cpp | 1 - src/sqlite/SQLiteWrapper.h | 1 - src/storage.h | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 7d4a512b..8c3a9271 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,8 +19,6 @@ tmwserv_SOURCES = main.cpp \ netsession.cpp \ packet.h \ packet.cpp \ - sqlite/SQLiteWrapper.cpp \ - sqlite/SQLiteWrapper.h \ log.h \ log.cpp \ skill.h \ @@ -31,6 +29,12 @@ tmwserv_SOURCES = main.cpp \ script-squirrel.cpp \ storage.cpp storage.h + +if BUILD_SQLITE +tmwserv_SOURCES += sqlite/SQLiteWrapper.cpp \ + sqlite/SQLiteWrapper.h +endif + # set the include path found by configure INCLUDES= $(all_includes) $(SQLITE_CFLAGS) LIBS = $(SQLITE_LIBS) diff --git a/src/sqlite/SQLiteWrapper.cpp b/src/sqlite/SQLiteWrapper.cpp index eef2498f..f5b484b7 100644 --- a/src/sqlite/SQLiteWrapper.cpp +++ b/src/sqlite/SQLiteWrapper.cpp @@ -263,4 +263,3 @@ bool SQLiteWrapper::Commit() { bool SQLiteWrapper::Rollback() { return DirectStatement("rollback"); } - diff --git a/src/sqlite/SQLiteWrapper.h b/src/sqlite/SQLiteWrapper.h index 324fdb66..419e3d50 100644 --- a/src/sqlite/SQLiteWrapper.h +++ b/src/sqlite/SQLiteWrapper.h @@ -137,4 +137,3 @@ class SQLiteWrapper { }; #endif - diff --git a/src/storage.h b/src/storage.h index da30c083..8fd981a0 100644 --- a/src/storage.h +++ b/src/storage.h @@ -23,8 +23,6 @@ #ifndef STORAGE_H #define STORAGE_H -#define SQLITE_SUPPORT // For now - #ifdef SQLITE_SUPPORT #include "sqlite/SQLiteWrapper.h" #endif -- cgit v1.2.3-60-g2f50