diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-07-07 13:43:05 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-07-07 13:43:05 +0000 |
| commit | 7e15b99c01616999496155fe5d2ce89d7608932b (patch) | |
| tree | 226d5c23b0a931ccbbf490aaf2da647ed6ebe5d4 /src/Makefile.am | |
| parent | 1f71cc5e127f6163e9163afd42453fe145defbeb (diff) | |
Initial bullet physics support
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 085f15f..ede200f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ SUFFIXES = .rc .rc.o: windres $< -o $@ -SUBDIRS = auxiliary sys filesystem math model core dedicated audio render ui \ +SUBDIRS = auxiliary math sys filesystem model core dedicated render ui audio \ client game noinst_HEADERS = config.h @@ -26,7 +26,8 @@ osiriond_LDADD = $(top_builddir)/src/auxiliary/libauxiliary.la \ $(top_builddir)/src/core/libcore.la $(top_builddir)/src/filesystem/libfilesystem.la \ $(top_builddir)/src/game/libgame.la \ $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/dedicated/libdedicated.la \ - $(top_builddir)/src/math/libmath.la $(top_builddir)/src/sys/libsys.la $(HOST_LIBS) $(ICON_SERVER) $(CURSES_LIBS) + $(top_builddir)/src/math/libmath.la $(top_builddir)/src/sys/libsys.la \ + $(HOST_LIBS) $(BULLET_LIBS) $(CURSES_LIBS) $(ICON_SERVER) # client osirion_SOURCES = osirion.cc @@ -42,6 +43,6 @@ osirion_LDADD = $(top_builddir)/src/game/libgame.la $(top_builddir)/src/ui/libui $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/model/libmodel.la \ $(top_builddir)/src/math/libmath.la $(top_builddir)/src/auxiliary/libauxiliary.la \ $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/sys/libsys.la \ - $(top_builddir)/src/auxiliary/libauxiliary.la \ - $(AL_LIBS) $(GL_LIBS) $(HOST_LIBS) $(LIBPNG_LIBS) $(LIBJPG_LIBS) $(ICON_CLIENT) $(SDLMAIN) + $(top_builddir)/src/auxiliary/libauxiliary.la $(AL_LIBS) $(GL_LIBS) $(HOST_LIBS) \ + $(LIBPNG_LIBS) $(LIBJPG_LIBS) $(BULLET_LIBS) $(SDLMAIN) $(ICON_CLIENT) osirion_LDFLAGS = $(LIBSDL_LIBS) |