diff options
| author | Mateusz Kaduk <mateusz.kaduk@gmail.com> | 2005-05-08 12:19:47 +0000 |
|---|---|---|
| committer | Mateusz Kaduk <mateusz.kaduk@gmail.com> | 2005-05-08 12:19:47 +0000 |
| commit | 29d807d250c257891aca93092018d5da7c6d1985 (patch) | |
| tree | 39691a9ff44abf326971d52e07d4e83a2b0f7efb | |
| parent | 8ec687b21a279d9156a0e02c82f3feee265f8a1a (diff) | |
| download | manaserv-29d807d250c257891aca93092018d5da7c6d1985.tar.gz manaserv-29d807d250c257891aca93092018d5da7c6d1985.tar.bz2 manaserv-29d807d250c257891aca93092018d5da7c6d1985.tar.xz manaserv-29d807d250c257891aca93092018d5da7c6d1985.zip | |
Linking with sqlite3 and added c++ sqlite wrapper
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ca5de358..e5f3b142 100644 --- a/configure.ac +++ b/configure.ac @@ -3,9 +3,19 @@ AC_INIT([TMW Server], [0.0.1], [b_lindeijer@users.sourceforge.net]) AC_CONFIG_HEADERS([config.h:config.h.in]) AM_INIT_AUTOMAKE +# Check with pkg-config +PKG_CHECK_MODULES(SQLITE, [sqlite3 >= 3.0.6], + [], + [AC_MSG_ERROR([Cannot find SQLite 3])] +) + +AC_SUBST(SQLITE_CFLAGS) +AC_SUBST(SQLITE_LIBS) + # Checks for programs. AC_PROG_CXX AC_PROG_CC +AC_PROG_RANLIB # Checks for libraries. AC_CHECK_LIB([physfs], [PHYSFS_init]) diff --git a/src/Makefile.am b/src/Makefile.am index 8aa36d07..a6abf79f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,10 +18,13 @@ tmwserv_SOURCES = main.cpp \ netsession.h \ netsession.cpp \ packet.h \ - packet.cpp + packet.cpp \ + sqlite/SQLiteWrapper.cpp \ + sqlite/SQLiteWrapper.h # set the include path found by configure -INCLUDES= $(all_includes) +INCLUDES= $(all_includes) $(SQLITE_CFLAGS) +LIBS = $(SQLITE_LIBS) # the library search path. tmwserv_LDFLAGS = $(all_libraries) -lSDL_net `sdl-config --libs` `pkg-config --libs libxml-2.0` -lphysfs |