diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-04-05 10:52:39 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-04-05 10:52:39 +0000 |
| commit | 25d2c764443723eb7a3dd5f8bf0b76586c1ff10b (patch) | |
| tree | b9cc681a3ff20900b32ce287505d018e0a7ae35f /src/Makefile.am | |
| parent | 49e268d1b4244948e49a11612501a743e311fbaf (diff) | |
Makefile.am updates, math::Axis, improved VertexArray, r_arraysize
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 504afb6..e6595f6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,16 +12,14 @@ bin_PROGRAMS = osiriond osirion osiriond_SOURCES = osiriond.cc EXTRA_osiriond_SOURCES = osiriond-res.rc osiriond_DEPENDENCIES = $(ICON_SERVER) -osiriond_LDADD = $(ICON_SERVER) $(top_builddir)/src/game/libgame.la \ - $(top_builddir)/src/core/libcore.la $(top_builddir)/src/server/libserver.la \ - $(HOST_LIBS) +osiriond_LDADD = $(top_builddir)/src/game/libgame.la \ + $(top_builddir)/src/server/libserver.la $(HOST_LIBS) $(ICON_SERVER) # client osirion_SOURCES = osirion.cc EXTRA_osirion_SOURCES = osirion-res.rc osirion_DEPENDENCIES = $(ICON_CLIENT) osirion_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS) $(GLUT_CFLAGS) -osirion_LDADD = $(ICON_CLIENT) $(top_builddir)/src/game/libgame.la \ - $(top_builddir)/src/core/libcore.la $(top_builddir)/src/client/libclient.la \ - $(HOST_LIBS) $(GL_LIBS) +osirion_LDADD = $(top_builddir)/src/game/libgame.la \ + $(top_builddir)/src/client/libclient.la $(GL_LIBS) $(HOST_LIBS) $(ICON_CLIENT) osirion_LDFLAGS = $(LIBSDL_LIBS) |