removed libcommon

modularized client and server

5 files changed, 13 insertions, 33 deletions

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 9807963..f1a3f9d 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,17 +1,13 @@
-
 METASOURCES = AUTO
-bin_PROGRAMS = osirion
-
-osirion_LDADD = $(top_builddir)/src/math/libmath.la \
-	$(top_builddir)/src/common/libcommon.la $(top_builddir)/src/sys/libsys.la \
-	$(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/core/libcore.la $(top_builddir)/src/game/libgame.la \
-	$(top_builddir)/src/gl/libgl.la
-osirion_SOURCES = application.cc camera.cc client.cc console.cc hud.cc input.cc main.cc \
-	shipdrawer.cc stardrawer.cc video.cc view.cc
-
 INCLUDES = -I$(top_srcdir)/src
-osirion_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS)
-osirion_LDFLAGS = $(LIBSDL_LIBS) $(GL_LIBS)
 
+libclient_la_SOURCES = application.cc camera.cc client.cc console.cc hud.cc input.cc \
+ shipdrawer.cc stardrawer.cc video.cc view.cc
+libclient_la_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS)
+libclient_la_LDFLAGS = -avoid-version -no-undefined $(GL_LIBS) $(LIBSDL_LIBS)
+noinst_LTLIBRARIES = libclient.la
 noinst_HEADERS = application.h camera.h client.h console.h input.h shipdrawer.h stardrawer.h \
-	video.h view.h
+ video.h view.h
+libclient_la_LIBADD = $(top_builddir)/src/math/libmath.la \
+	$(top_builddir)/src/sys/libsys.la $(top_builddir)/src/filesystem/libfilesystem.la \
+	$(top_builddir)/src/core/libcore.la $(top_builddir)/src/game/libgame.la $(top_builddir)/src/gl/libgl.la
diff --git a/src/client/console.h b/src/client/console.h
index 8e8ab02..1a36d00 100644
--- a/src/client/console.h
+++ b/src/client/console.h
@@ -7,12 +7,12 @@
 #ifndef __INCLUDED_CLIENT_CONSOLE_H__
 #define __INCLUDED_CLIENT_CONSOLE_H__
 
-#include "common/consoleinterface.h"
+#include "sys/consoleinterface.h"
 
 namespace client {
 
 /// client console implementation
-class Console : public common::ConsoleInterface {
+class Console : public sys::ConsoleInterface {
 public:
 	/// stream to send normal messages too
 	virtual std::ostream & messagestream();
diff --git a/src/client/main.cc b/src/client/main.cc
deleted file mode 100644
index 6955042..0000000
--- a/src/client/main.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-/* client/main.cc
-   This file is part of the Osirion project and is distributed under 
-   the terms and conditions of the GNU General Public License version 2 
-*/
-
-#include "client/client.h"
-
-int main( int argc, char *argv[] )
-{
-	client::application.init();
-	client::application.run();
-	client::application.shutdown();
-}
-
diff --git a/src/client/video.cc b/src/client/video.cc
index 9a542f3..ca0401f 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -6,7 +6,7 @@
 
 #include "client/client.h"
 #include "gl/gllib.h"
-#include "common/common.h"
+#include "sys/sys.h"
 
 #include <SDL/SDL.h>
 
diff --git a/src/client/view.cc b/src/client/view.cc
index 63a6942..30dd6d6 100644
--- a/src/client/view.cc
+++ b/src/client/view.cc
@@ -9,7 +9,7 @@
 #include "client/stardrawer.h"
 #include "game/game.h"
 #include "gl/gllib.h"
-#include "common/common.h"
+#include "sys/sys.h"
 #include "math/mathlib.h"
 
 #include <SDL/SDL.h>
@@ -17,8 +17,6 @@
 namespace client
 {
 
-using namespace common;
-
 ShipDrawer *shipdrawer = 0;
 StarDrawer *stardrawer = 0;