diff options
| author | Aaron Marks <nymacro@gmail.com> | 2005-06-19 12:26:04 +0000 |
|---|---|---|
| committer | Aaron Marks <nymacro@gmail.com> | 2005-06-19 12:26:04 +0000 |
| commit | f194e2fb62234ff66d0ee12282ce4a22aa237e89 (patch) | |
| tree | 60b48cf64e8b16abcee01516e7f35020b77e1171 /src/Makefile.am | |
| parent | d711ab557a1e3613df1f6fd1ad818695acda05ed (diff) | |
| download | manaserv-f194e2fb62234ff66d0ee12282ce4a22aa237e89.tar.gz manaserv-f194e2fb62234ff66d0ee12282ce4a22aa237e89.tar.bz2 manaserv-f194e2fb62234ff66d0ee12282ce4a22aa237e89.tar.xz manaserv-f194e2fb62234ff66d0ee12282ce4a22aa237e89.zip | |
Added PostgreSQL DAL class.
Updated configure.ac to include PostgreSQL & MySQL. (MySQL needs to be adjusted, and it seems that using --with-sqlite will drop out of configure after check for atexit. I dont know why, as i didn't touch the SQLite stuff) :)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 71f67e5e..33e18365 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,8 +34,6 @@ tmwserv_SOURCES = main.cpp \ dal/dataprovider.cpp \ dal/dataproviderfactory.h \ dal/dataproviderfactory.cpp \ - dal/sqlitedataprovider.h \ - dal/sqlitedataprovider.cpp \ dal/recordset.h \ dal/recordset.cpp \ dal/dalexcept.h \ @@ -48,26 +46,24 @@ tmwserv_SOURCES = main.cpp \ utils/logger.h \ utils/logger.cpp -# dal/mysqldataprovider.h -# dal/mysqldataprovider.cpp +if BUILD_SQLITE +tmwserv_SOURCES += dal/sqlitedataprovider.h \ + dal/sqlitedataprovider.cpp +endif -# Obsoleted by utils/logger.* -# -# log.h -# log.cpp +if BUILD_POSTGRE +tmwserv_SOURCES += dal/pqdataprovider.h \ + dal/pqdataprovider.cpp +endif -# Obsoleted by DAL. -# -#if BUILD_SQLITE -#tmwserv_SOURCES += sqlite/SQLiteWrapper.cpp \ -# sqlite/SQLiteWrapper.h \ -# sqlitestorage.cpp \ -# sqlitestorage.h -#endif +if BUILD_MYSQL +tmwserv_SOURCES += dal/mysqldataprovider.h \ + dal/mysqldataprovider.cpp +endif # set the include path found by configure -INCLUDES= $(all_includes) $(SQLITE_CFLAGS) -LIBS = $(SQLITE_LIBS) +INCLUDES= $(all_includes) +LIBS = $(SQLITE_LIBS) $(MYSQL_LIBS) $(POSTGRE_LIBS) # the library search path. tmwserv_LDFLAGS = $(all_libraries) \ @@ -75,7 +71,9 @@ tmwserv_LDFLAGS = $(all_libraries) \ `pkg-config --libs libxml-2.0` \ -lphysfs \ -lcrypto -tmwserv_CXXFLAGS = -g -Wall `sdl-config --cflags` `pkg-config --cflags libxml-2.0` -fno-inline $(SCRIPT_CFLAGS) +tmwserv_CXXFLAGS = -g -Wall `sdl-config --cflags` `pkg-config --cflags libxml-2.0` -fno-inline $(SCRIPT_CFLAGS) $(POSTGRE_CFLAGS) $(SQLITE_CFLAGS) + #tmwserv_LDADD = $(LIBSDL_LIBS) -lphysfs tmwserv_LDADD = $(SCRIPT_LIBS) tmwserv_TARGET = ../tmwserv + |