Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-02-02 13:23:00 +0000
committerStijn Buys <ingar@osirion.org>2008-02-02 13:23:00 +0000
commitcdc5a69a108654ff378839e8cf93669de31ff9c5 (patch)
tree10bdc47d0d51485f49387bee3aeae7037c47df6e /src/game
parent1765b93250ac3b89947c3da7f0c7266a910367c9 (diff)
removed libcommon
modularized client and server
Diffstat (limited to 'src/game')
-rw-r--r--src/game/Makefile.am6
-rw-r--r--src/game/game.cc2
-rw-r--r--src/game/game.h2
3 files changed, 3 insertions, 7 deletions
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index 1ed5015..f86c814 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -1,11 +1,7 @@
INCLUDES = -I$(top_srcdir)/src
METASOURCES = AUTO
-libgame_la_LDFLAGS = -avoid-version --no-undefined
-libgame_la_LIBADD = $(top_builddir)/src/math/libmath.la \
- $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/filesystem/libfilesystem.la \
- $(top_builddir)/src/core/libcore.la
+libgame_la_LDFLAGS = -avoid-version
libgame_la_SOURCES = game.cc sector.cc ship.cc shipspecs.cc star.cc
noinst_LTLIBRARIES = libgame.la
diff --git a/src/game/game.cc b/src/game/game.cc
index b2b0822..7f2ad17 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -10,7 +10,7 @@
#include "game/ship.h"
#include "game/star.h"
#include "filesystem/filesystem.h"
-#include "common/common.h"
+#include "sys/sys.h"
// C++ headers
#include <vector>
diff --git a/src/game/game.h b/src/game/game.h
index 5a0afc7..6f77bcf 100644
--- a/src/game/game.h
+++ b/src/game/game.h
@@ -11,7 +11,7 @@
#include "game/ship.h"
#include "game/star.h"
#include "core/core.h"
-#include "common/common.h"
+#include "sys/sys.h"
/// the game-specific engine
/** The main game functions. The console should be initialized before calling these.