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-06-14 10:07:12 +0000
committerStijn Buys <ingar@osirion.org>2008-06-14 10:07:12 +0000
commitd9aff6e24a0b0cb650331c77ab724eb8b0109bd6 (patch)
tree5555759e42258ae05f7363168f1bbf80ecbe5e37 /src/Makefile.am
parentf1a97c89908be62cdc91c7a3d5b53149aa03de05 (diff)
fixed potential camera bug for cnontrolable entities without model
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c55179..3f82bdd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,17 +6,16 @@ SUFFIXES = .rc
if BUILD_CLIENT
MAYBE_CLIENT_SUBDIRS = audio render client
- MAYBE_CLIENT_PROGRAMS = osirion
endif
SUBDIRS = sys math auxiliary filesystem model core server $(MAYBE_CLIENT_SUBDIRS) game
noinst_HEADERS = config.h
-if BUILD_CLIENT
-bin_PROGRAMS = osiriond osirion
-else
+if BUILD_DEDICATED
bin_PROGRAMS = osiriond
+else
+bin_PROGRAMS = osiriond osirion
endif
# dedicated server
@@ -36,11 +35,8 @@ osiriond_LDADD = $(top_builddir)/src/auxiliary/libauxiliary.la \
osirion_SOURCES = osirion.cc
EXTRA_osirion_SOURCES = osirion-res.rc
osirion_DEPENDENCIES = $(ICON_CLIENT) \
- $(top_builddir)/src/auxiliary/libauxiliary.la $(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 \
- $(top_builddir)/src/model/libmodel.la $(top_builddir)/src/audio/libaudio.la \
- $(top_builddir)/src/render/librender.la $(top_builddir)/src/sys/libsys.la
+ $(top_builddir)/src/audio/libaudio.la $(top_builddir)/src/render/librender.la \
+ $(top_builddir)/src/client/libclient.la
osirion_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS) $(GLUT_CFLAGS)
osirion_LDADD = $(top_builddir)/src/game/libgame.la \
$(top_builddir)/src/client/libclient.la $(top_builddir)/src/audio/libaudio.la \