diff options
| -rw-r--r-- | Doxyfile | 2 | ||||
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | ROADMAP | 7 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/client/Makefile.am | 7 | ||||
| -rw-r--r-- | src/common/Makefile.am | 5 | ||||
| -rw-r--r-- | src/game/Makefile.am | 4 | ||||
| -rw-r--r-- | src/server/Makefile.am | 3 |
9 files changed, 21 insertions, 17 deletions
@@ -25,7 +25,7 @@ ABBREVIATE_BRIEF = "The $name class" \ ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = NO -STRIP_FROM_PATH = /home/ingar/projects/radiant/gtkradiant-170-net/ +STRIP_FROM_PATH = /home/ingar/projects/osirion STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO @@ -7,7 +7,7 @@ the SDL and OpenGL library and header files. In theory, it should compile on any platform supported by SDL. I have succesfully compiled it on the following platforms: linux-x86_64, gcc 4.1.2, SDL 1.2.11 - mingw-win32 + mingw-win32 (client only!) Compile the source by executing the following commands: @@ -23,6 +23,6 @@ To run the dedicated server: src/server/osiriond The game data files should be located in the subdirectory -data/base if the main distribution. +data/base of the main distribution. @@ -4,6 +4,8 @@ Project::OSiRiON This is the Osirion project. I wrote it to get a better grasp on OpenGL and to get some C++ practice. Maybe someday, it will be a real game. + Read INSTALL for Installation instructions. + Controls space bar: switch camera between free mode and tracking mode @@ -29,4 +31,4 @@ License GNU General Public License version 2. -Stijn Buys <stijn.buys@telenet.be> +Ingar <ingar@telenet.be> @@ -1,4 +1,3 @@ - -M1: Multiple ships, one ship controlled by the player - - +M1: + Multiple ships, one ship controlled by the player + Load ship specs and model diff --git a/configure.in b/configure.in index 3372790..8bdbd92 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(configure.in) -AM_CONFIG_HEADER(config.h) +AM_CONFIG_HEADER(src/config.h) AM_INIT_AUTOMAKE(osirion, 0.0.1) AC_LANG_CPLUSPLUS diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 3df02d3..12b8f5d 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -3,9 +3,8 @@ METASOURCES = AUTO bin_PROGRAMS = osirion osirion_LDADD = $(top_builddir)/src/game/libgame.la \ $(top_builddir)/src/gl/libosiriongl.la -osirion_SOURCES = camera.cc camera.h client.cc client.h input.cc input.h \ - main.cc shipdrawer.cc shipdrawer.h stardrawer.cc stardrawer.h video.cc video.h \ - view.cc view.h console.cc console.h +osirion_SOURCES = camera.cc client.cc console.cc hud.cc input.cc main.cc \ + shipdrawer.cc stardrawer.cc video.cc view.cc @@ -13,3 +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 diff --git a/src/common/Makefile.am b/src/common/Makefile.am index dbed1fb..d7fc6e6 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -2,7 +2,8 @@ METASOURCES = AUTO libcommon_la_LDFLAGS = -avoid-version -no-undefined noinst_LTLIBRARIES = libcommon.la -libcommon_la_SOURCES = color.cc color.h file.cc file.h functions.cc functions.h \ - vector3f.cc vector3f.h console.cc console.h +libcommon_la_SOURCES = color.cc console.cc file.cc functions.cc inifile.cc \ + vector3f.cc +noinst_HEADERS = color.h console.h file.h functions.h inifile.h vector3f.h diff --git a/src/game/Makefile.am b/src/game/Makefile.am index ff46654..48c33d3 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 game.h player.h sector.h ship.cc ship.h star.cc \ - star.h world.h +libgame_la_SOURCES = game.cc sector.cc ship.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 diff --git a/src/server/Makefile.am b/src/server/Makefile.am index c167667..7532f1c 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = -I$(top_srcdir)/src METASOURCES = AUTO bin_PROGRAMS = osiriond -osiriond_SOURCES = console.cc console.h main.cc timer.cc timer.h +osiriond_SOURCES = console.cc main.cc timer.cc osiriond_LDADD = $(top_builddir)/src/game/libgame.la +noinst_HEADERS = console.h timer.h |