Added --enable-static-libc option to the configure script,

automake syntax updates,
starsystem roadmap updates.

19 files changed, 59 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index a919ddb..7a7e456 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,9 @@
 	Project::OSiRiON - Changelog and release history
 
   ------------------------------------------------------------------
-  
+
+  * build-0.2.6-svn14xx "Pirate Edition"
+
   * build-0.2.5-svn1328 "Particle Probe"
   
 	2013-09-29
@@ -48,7 +50,7 @@
 	- Added a jumpgate between the Praetoria and the Carthagio systems
 	- Added planet Praetoria and its moon Caesar.
 	- Updated a number of stars across the galaxy.
-	- Added solar power arraa to the Carthagio system,
+	- Added solar power array to the Carthagio system.
 	- Added solar unit model.
 	- Added default armor settings to ship models.
 	- Improved jumpgate vortex particles.
diff --git a/configure.ac b/configure.ac
index f2a8a84..ff6cd2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,20 @@ AC_ARG_ENABLE(debug_messages,
 )
 
 dnl ----------------------------------------------------------------
+dnl static link
+dnl
+
+AC_ARG_ENABLE(static_libc,
+	AC_HELP_STRING([--enable-static-libc], [staticly link with libc and libstdc++]),
+	AC_MSG_RESULT(yes)
+	STATIC_LDADD="-static-libgcc -static-libstdc++",
+	AC_MSG_RESULT(no)
+	STATIC_LDADD=""
+)
+
+AC_SUBST(STATIC_LDADD)
+
+dnl ----------------------------------------------------------------
 dnl curses
 dnl
 
@@ -233,9 +247,7 @@ HAVE_BULLET=no
 AC_ARG_ENABLE(static_bullet,
 	AC_HELP_STRING([--enable-static-bullet], [staticly link with bullet physics libraries]),
 	AC_MSG_RESULT(yes),
-	STATIC_BULLET="yes"
 	AC_MSG_RESULT(no)
-	STATIC_BULLET="no"
 )
 
 AC_ARG_WITH(bullet,
@@ -244,7 +256,7 @@ AC_ARG_WITH(bullet,
         )
 )
 
-LD_FLAGS_save="$LD_FLAGS"
+LDFLAGS_save="$LDFLAGS"
 CPPFLAGS_save="$CPPFLAGS"
 
 BULLET_DIR="/usr"
@@ -271,10 +283,10 @@ else
 fi
 
 CPPFLAGS="$CPPFLAGS_save $BULLET_CPPFLAGS"
-LD_FLAGS="$LD_FLAGS_save $BULLET_LIBS"
+LDFLAGS="$LDFLAGS_save $BULLET_LIBS"
 
 CPPFLAGS="$CPPFLAGS_save"
-LD_FLAGS="$LD_FLAGS_save"
+LDFLAGS="$LDFLAGS_save"
 
 AC_SUBST(BULLET_CPPFLAGS)
 AC_SUBST(BULLET_LIBS)
@@ -284,7 +296,7 @@ dnl zlib
 dnl
 
 LIBS_save="$LIBS"
-LD_FLAGS_save="$LD_FLAGS"
+LDFLAGS_save="$LDFLAGS"
 
 AC_CHECK_HEADER(zlib.h, 
 	[],
@@ -296,7 +308,7 @@ AC_CHECK_LIB(z, compress,
 	AC_MSG_ERROR([zlib not found])
 )
 
-LD_FLAGS="$LD_FLAGS_save"
+LDFLAGS="$LDFLAGS_save"
 LIBS="$LIBS_save"
 
 LIBZ_LIBS="-lz"
@@ -321,7 +333,7 @@ if test "x${with_client}" = xno; then
 else
 	AC_MSG_RESULT(yes)
 
-	LD_FLAGS_save="$LDFLAGS"
+	LDFLAGS_save="$LDFLAGS"
 
 	dnl ---------------------------------------------------------------
 	dnl OpenGL
@@ -347,7 +359,7 @@ else
 		)
 	fi
 	
-	LD_FLAGS="$LD_FLAGS_save"
+	LDFLAGS="$LDFLAGS_save"
 	GL_LIBS="$HOST_GL_LIBS"
 	AC_SUBST(GL_LIBS)
 	AC_SUBST(GL_CFLAGS)
@@ -367,7 +379,7 @@ else
 		)
 	fi
 	
-	LD_FLAGS="$LD_FLAGS_save"
+	LDFLAGS="$LDFLAGS_save"
 	AL_LIBS="$HOST_AL_LIBS"
 	AC_SUBST(AL_LIBS)
 	AC_SUBST(AL_CFLAGS)
@@ -543,7 +555,7 @@ Configuration summary:
 
 platform ........... $host
 flags .............. $CPPFLAGS $CXXFLAGS
-libraries .......... $HOST_LIBS $LIBJPG_LIBS $LIBPNG_LIBS $LIBZ_LIBS $CURSES_LIBS
+libraries .......... $HOST_LIBS $LIBJPG_LIBS $LIBPNG_LIBS $LIBZ_LIBS $CURSES_LIBS $STATIC_LDADD
 bullet ............. $BULLET_LIBS
 curses ............. $HAVE_CURSES
 build client ....... $BUILD_CLIENT])
diff --git a/doc/starsystem_roadmap.html b/doc/starsystem_roadmap.html
index cbf5e9c..0374496 100644
--- a/doc/starsystem_roadmap.html
+++ b/doc/starsystem_roadmap.html
@@ -150,12 +150,12 @@
 	Planet Ghant is the Headquarters of the Merchants Association.
 </p>
 <ul class="content">
-	<li class="content">planet Ghant
-	<li class="content">Alexandria outpost
-	<li class="content">Battleship custodian
+	<li class="content">planet Ghant, Merchants Association headquarters
+	<li class="content">Alexandria outpost, Colonial outpost
+	<li class="content">Battleship custodian, Militia base
 
-	<li class="content">planet Seymour
-	<li class="content">Regula station
+	<li class="content">Seymour, mining planet
+	<li class="content">Regula station, niobium mining facility
 </ul>
 
 <h4 class="content">Brogha system</h4>
@@ -164,7 +164,7 @@
 </p>
 <ul class="content">
 	<li class="content">planet Brogha, agricultural planet
-	<li class="content">Cantor observatory
+	<li class="content">Cantor observatory, research facility
 </ul>
 
 <h4 class="content">Antwerp system</h4>
@@ -186,6 +186,7 @@
 <h4 class="content">Khorsand system</h4>
 <ul class="content">
 	<li class="content">Kerman refinery, niobium processing facility
+	<li class="content">Auberry factory
 </ul>
 
 <h4 class="content">Vostok system</h4>
@@ -196,7 +197,7 @@
 </p>
 
 <ul class="content">
-	<li class="content">planet Warsaw
+	<li class="content">planet Warsaw, Micron Corporation headquarters
 </ul>
 
 <!-- Neutral systems =============================================== -->
@@ -273,17 +274,23 @@
 </p>
 
 <h4 class="content">Cadiz system</h4>
+<ul class="content">
+	<li class="content">Urushima station, Ryu Sengir base
+</ul>
 
 <h4 class="content">Gibraltar system</h4>
 
 <h4 class="content">Oran system</h4>
+<ul class="content">
+	<li class="content">Watasumi station, Ryu Sengir headquarters, holds the Tide Jewels
+</ul>
 
 <h4 class="content">Camorra system</h4>
 <p class="content">
 	Camorra is a system claimed by pirates
 </p>
 <ul class="content">
-	<li class="content">planet Naples, pirate base
+	<li class="content">planet Naples, Camorra Syndicate headquarters
 </ul>
 
 <!-- Southern Rim ================================================== -->
diff --git a/src/Makefile.am b/src/Makefile.am
index 75aff0d..ccb90f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,7 @@ osiriond_LDADD = \
 	$(top_builddir)/src/math/libmath.la \
 	$(top_builddir)/src/auxiliary/libauxiliary.la \
 	$(ICON_SERVER) \
-	$(BULLET_LIBS) $(CURSES_LIBS) $(LIBZ_LIBS) $(HOST_LIBS)
+	$(BULLET_LIBS) $(CURSES_LIBS) $(LIBZ_LIBS) $(HOST_LIBS) $(STATIC_LDADD)
 
 # client
 osirion_SOURCES = osirion.cc
@@ -87,4 +87,4 @@ osirion_LDADD =  \
 	$(top_builddir)/src/auxiliary/libauxiliary.la \
 	$(SDLMAIN) $(ICON_CLIENT) \
 	$(BULLET_LIBS)  $(LIBSDL_LIBS) $(LIBVORBISFILE_LIBS) $(AL_LIBS) $(GL_LIBS) \
-	$(LIBJPG_LIBS) $(LIBPNG_LIBS) $(LIBZ_LIBS) $(HOST_LIBS)
+	$(LIBJPG_LIBS) $(LIBPNG_LIBS) $(LIBZ_LIBS) $(HOST_LIBS) $(STATIC_LDADD)
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index 8b76cc9..9ffd637 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 METASOURCES = AUTO
 
 if BUILD_DEDICATED
diff --git a/src/auxiliary/Makefile.am b/src/auxiliary/Makefile.am
index 6db5443..1658e2c 100644
--- a/src/auxiliary/Makefile.am
+++ b/src/auxiliary/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libauxiliary.la
 libauxiliary_la_LDFLAGS = -avoid-version -no-undefined
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index fccf2d6..f6d447d 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 if BUILD_DEDICATED
 noinst_LTLIBRARIES =
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 3f7094d..2485ee9 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libcore.la
 
diff --git a/src/dedicated/Makefile.am b/src/dedicated/Makefile.am
index 437ce71..8d5e7ac 100644
--- a/src/dedicated/Makefile.am
+++ b/src/dedicated/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libdedicated.la
 noinst_HEADERS = console.h dedicated.h
diff --git a/src/filesystem/Makefile.am b/src/filesystem/Makefile.am
index 8f5bafd..89737a6 100644
--- a/src/filesystem/Makefile.am
+++ b/src/filesystem/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libfilesystem.la
 noinst_HEADERS = \
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index 2aaf56f..c33369f 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/game
 SUBDIRS = base example intro
 
 noinst_LTLIBRARIES = libgame.la
diff --git a/src/game/base/Makefile.am b/src/game/base/Makefile.am
index 42a7f5c..5ac64c8 100644
--- a/src/game/base/Makefile.am
+++ b/src/game/base/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/game
 
 noinst_LTLIBRARIES = libbase.la
 
diff --git a/src/game/example/Makefile.am b/src/game/example/Makefile.am
index 99dec0a..83a3118 100644
--- a/src/game/example/Makefile.am
+++ b/src/game/example/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/game
 
 noinst_LTLIBRARIES = libexample.la
 noinst_HEADERS = \
diff --git a/src/game/intro/Makefile.am b/src/game/intro/Makefile.am
index a9d09b9..bc3114f 100644
--- a/src/game/intro/Makefile.am
+++ b/src/game/intro/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/game
 
 noinst_LTLIBRARIES = libintro.la
 
diff --git a/src/math/Makefile.am b/src/math/Makefile.am
index 0588bba..32644aa 100644
--- a/src/math/Makefile.am
+++ b/src/math/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libmath.la
 noinst_HEADERS = \
diff --git a/src/model/Makefile.am b/src/model/Makefile.am
index dfd462e..cd7defd 100644
--- a/src/model/Makefile.am
+++ b/src/model/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 
 noinst_LTLIBRARIES = libmodel.la
diff --git a/src/render/Makefile.am b/src/render/Makefile.am
index b5acde1..31b8567 100644
--- a/src/render/Makefile.am
+++ b/src/render/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 METASOURCES = AUTO
 
 if BUILD_DEDICATED
diff --git a/src/sys/Makefile.am b/src/sys/Makefile.am
index ff1fbe0..4fd0f12 100644
--- a/src/sys/Makefile.am
+++ b/src/sys/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 METASOURCES = AUTO
 libsys_la_LDFLAGS = -avoid-version -no-undefined
 noinst_LTLIBRARIES = libsys.la
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index ef3289f..e309dda 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 
 if BUILD_DEDICATED