Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-05-03 21:04:02 +0000
committerStijn Buys <ingar@osirion.org>2008-05-03 21:04:02 +0000
commit82293065b52f5a4e5c4ccde5eade4ebae18014ca (patch)
tree254f1fa3259f03f033b3d1fd225742a12de167b1 /src/Makefile.am
parent5388c37bdc040ba50d21ec16a01f399d20592a90 (diff)
liibmodel
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 74a31e3..19ad3be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,33 +4,34 @@ SUFFIXES = .rc
.rc.o:
windres $< -o $@
-SUBDIRS = math sys filesystem core server render client game
+SUBDIRS = sys math filesystem model core render server client game
noinst_HEADERS = config.h
bin_PROGRAMS = osiriond osirion
# dedicated server
osiriond_SOURCES = osiriond.cc
EXTRA_osiriond_SOURCES = osiriond-res.rc
-osiriond_DEPENDENCIES = $(ICON_SERVER) $(top_builddir)/src/game/libgame.la \
- $(top_builddir)/src/sys/libsys.la $(top_builddir)/src/math/libmath.la \
- $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/core/libcore.la \
- $(top_builddir)/src/server/libserver.la
+osiriond_DEPENDENCIES = $(ICON_SERVER) $(top_builddir)/src/core/libcore.la \
+ $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/filesystem/libfilesystem.la \
+ $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la \
+ $(top_builddir)/src/server/libserver.la $(top_builddir)/src/sys/libsys.la
osiriond_LDADD = $(top_builddir)/src/game/libgame.la \
- $(top_builddir)/src/sys/libsys.la $(top_builddir)/src/math/libmath.la \
- $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/core/libcore.la \
- $(top_builddir)/src/server/libserver.la $(HOST_LIBS) $(ICON_SERVER)
+ $(top_builddir)/src/core/libcore.la $(top_builddir)/src/filesystem/libfilesystem.la \
+ $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/math/libmath.la \
+ $(top_builddir)/src/server/libserver.la $(top_builddir)/src/sys/libsys.la $(HOST_LIBS) $(ICON_SERVER)
# client
osirion_SOURCES = osirion.cc
EXTRA_osirion_SOURCES = osirion-res.rc
-osirion_DEPENDENCIES = $(ICON_CLIENT) $(top_builddir)/src/game/libgame.la \
- $(top_builddir)/src/sys/libsys.la $(top_builddir)/src/math/libmath.la \
- $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/core/libcore.la \
- $(top_builddir)/src/render/librender.la $(top_builddir)/src/client/libclient.la
+osirion_DEPENDENCIES = $(ICON_CLIENT) $(top_builddir)/src/client/libclient.la \
+ $(top_builddir)/src/core/libcore.la $(top_builddir)/src/filesystem/libfilesystem.la \
+ $(top_builddir)/src/game/libgame.la $(top_builddir)/src/math/libmath.la $(ICON_CLIENT) \
+ $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/render/librender.la \
+ $(top_builddir)/src/sys/libsys.la
osirion_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS) $(GLUT_CFLAGS)
osirion_LDADD = $(top_builddir)/src/game/libgame.la \
- $(top_builddir)/src/sys/libsys.la $(top_builddir)/src/math/libmath.la \
- $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/core/libcore.la \
- $(top_builddir)/src/render/librender.la $(top_builddir)/src/client/libclient.la $(GL_LIBS) $(HOST_LIBS) \
- $(ICON_CLIENT)
+ $(top_builddir)/src/client/libclient.la $(top_builddir)/src/core/libcore.la \
+ $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/filesystem/libfilesystem.la \
+ $(top_builddir)/src/math/libmath.la $(top_builddir)/src/render/librender.la \
+ $(top_builddir)/src/sys/libsys.la $(GL_LIBS) $(HOST_LIBS) $(ICON_CLIENT)
osirion_LDFLAGS = $(LIBSDL_LIBS)