Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2007-11-11 12:36:02 +0000
committerStijn Buys <ingar@osirion.org>2007-11-11 12:36:02 +0000
commit20bee9120ea573db8a0335a0a0fcf3358c3fab6b (patch)
tree7a201f4b0127514a77028c576c28c2a2e40e31c1 /src
parent7db1598f6b18b043b474d66677a6c1c49b318694 (diff)
project updates
Diffstat (limited to 'src')
-rw-r--r--src/client/Makefile.am4
-rw-r--r--src/game/Makefile.am4
-rw-r--r--src/game/shipspecs.cc9
-rw-r--r--src/game/shipspecs.h13
-rw-r--r--src/gl/Makefile.am4
5 files changed, 28 insertions, 6 deletions
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 12b8f5d..4e5705c 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -12,5 +12,5 @@ INCLUDES = -I$(top_srcdir)/src
osirion_CFLAGS = $(LIBSDL_CFLAGS)
osirion_LDFLAGS = $(LIBSDL_LIBS)
-noinst_HEADERS = camera.h client.h console.h input.h shipdrawer.h stardrawer.h \
- video.h view.h
+noinst_HEADERS = camera.h client.h console.h input.h shipdrawer.h shipspecs.h \
+ stardrawer.h video.h view.h
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index 48c33d3..fc1b23e 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
libgame_la_LDFLAGS = -avoid-version -no-undefined
noinst_LTLIBRARIES = libgame.la
-libgame_la_SOURCES = game.cc sector.cc ship.cc star.cc
+libgame_la_SOURCES = game.cc sector.cc ship.cc shipspecs.cc star.cc
INCLUDES = -I$(top_srcdir)/src
libgame_la_LIBADD = $(top_builddir)/src/common/libcommon.la
-noinst_HEADERS = game.h player.h sector.h ship.h star.h world.h
+noinst_HEADERS = game.h player.h sector.h ship.h shipspecs.h star.h world.h
diff --git a/src/game/shipspecs.cc b/src/game/shipspecs.cc
new file mode 100644
index 0000000..38a74cc
--- /dev/null
+++ b/src/game/shipspecs.cc
@@ -0,0 +1,9 @@
+/*
+ game/shipspecs.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 "shipspecs.h"
+
diff --git a/src/game/shipspecs.h b/src/game/shipspecs.h
new file mode 100644
index 0000000..a907057
--- /dev/null
+++ b/src/game/shipspecs.h
@@ -0,0 +1,13 @@
+/*
+ game/shipspecs.h
+ This file is part of the Osirion project and is distributed under
+ the terms and conditions of the GNU General Public License version 2
+*/
+
+#ifndef __INCLUDED_SHIPSPECS_H__
+#define __INCLUDED_SHIPSPECS_H__
+
+class ShipSpecs {
+};
+
+#endif // __INCLUDED_SHIPSPECS_H__
diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am
index 671ff5f..291565d 100644
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@ -5,5 +5,5 @@ libosiriongl_la_LDFLAGS = -avoid-version -no-undefined
noinst_LTLIBRARIES = libosiriongl.la
INCLUDES = -I$(top_srcdir)/src
-libosiriongl_la_SOURCES = box.h box.cc sphere.cc sphere.h osiriongl.cc \
- osiriongl.h
+libosiriongl_la_SOURCES = box.cc sphere.cc osiriongl.cc
+noinst_HEADERS = box.h osiriongl.h sphere.h