From f71b6b92840a396500aa477a6dba94be4c36d3bb Mon Sep 17 00:00:00 2001
From: Stijn Buys
Date: Sat, 20 Nov 2010 01:13:13 +0000
Subject: have configure only look for bullet in /usr by default,
--with-bullet=prefix switch overrides, updated documentation
---
configure.in | 26 ++++++++------------------
developer/TODO | 7 ++++---
doc/index.html | 42 ++++++++++++++++++++++++++++++------------
doc/installation.html | 27 +++++++++++++--------------
doc/main.css | 12 +++++++-----
5 files changed, 62 insertions(+), 52 deletions(-)
diff --git a/configure.in b/configure.in
index 3fadb1b..d9f577d 100644
--- a/configure.in
+++ b/configure.in
@@ -250,32 +250,22 @@ AC_ARG_WITH(bullet,
LD_FLAGS_save="$LD_FLAGS"
CPPFLAGS_save="$CPPFLAGS"
-BULLET_DIRS="/usr/local /usr"
+BULLET_DIR="/usr"
if test "x${with_bullet}" != "x"; then
- BULLET_DIRS="${with_bullet}"
+ BULLET_DIR="${with_bullet}"
fi
-for dir_to_test in ${BULLET_DIRS}; do
- if test "x${BULLET_DIR}" = "x"; then
- CPPFLAGS="-I${dir_to_test}/include/bullet"
- AC_CHECK_HEADER(btBulletDynamicsCommon.h,
- BULLET_DIR="${dir_to_test}",
- []
- )
- fi
-done
-
-if test "x${BULLET_DIR}" = "x"; then
- AC_MSG_ERROR([bullet physics library not found in ${BULLET_DIRS}])
-fi
+CPPFLAGS="-I${BULLET_DIR}/include/bullet"
-AC_MSG_CHECKING([for bullet prefix])
-AC_MSG_RESULT([${BULLET_DIR}])
+AC_CHECK_HEADER(btBulletDynamicsCommon.h,
+ [],
+ AC_MSG_ERROR([bullet physics library not found in ${BULLET_DIR}])
+)
AC_MSG_CHECKING([if static linking of the bullet libraries is requested])
if test "x${enable_static_bullet}" = "xyes"; then
BULLET_CPPFLAGS="-I${BULLET_DIR}/include/bullet"
- BULLET_LIBS="$BULLET_DIR/lib/libBulletDynamics.a $BULLET_DIR/lib/libBulletCollision.a $BULLET_DIR/lib/libLinearMath.a"
+ BULLET_LIBS="${BULLET_DIR}/lib/libBulletDynamics.a $BULLET_DIR/lib/libBulletCollision.a $BULLET_DIR/lib/libLinearMath.a"
AC_MSG_RESULT([yes])
else
BULLET_CPPFLAGS="-I${BULLET_DIR}/include/bullet"
diff --git a/developer/TODO b/developer/TODO
index 9a51514..078f51c 100644
--- a/developer/TODO
+++ b/developer/TODO
@@ -105,7 +105,7 @@ sound:
game:
add Ship::ship_dock, making docking indepdendent of player->view()
- have the goto command check the target's Docked state
+ have the goto command check the target's Docked state -> ties into ship dock awereness
ship health/shield/armor
add fleet support
@@ -119,8 +119,9 @@ documentation:
update starsystem roadmap
add starsystem roadmap to the user documentation
add a yaw/pitch/roll image to the modelling documentation
- add a spacescape link
- add a link to CIA.vc
+
+ (ok) add a spacescape link
+ (ok) add a link to CIA.vc
data:
rename skies (lindblade1, lindblade2, ...)
diff --git a/doc/index.html b/doc/index.html
index 172dd10..0fd4b30 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -18,18 +18,28 @@
- Project::OSiRiON is a 3D space game under development. Its goal is to create an emersive
- universe with open gameplay inspired by classic titles such as
+ Project::OSiRiON is a free space trading and combat simulation under development.
+ Its goal is to create an immersive universe with open gameplay inspired by classic titles such as
Privateer and
Freelancer.
-
- The game uses a custom engine, written from scratch in C++ and
- uses portable libraries like SDL, OpenGL, OpenAL and zlib. Physics and collision
- are implemented using the Bullet physics library.
-
- The basic components are already in place: players are able to visit multiple star systems,
- buy ships, trade cargo or join a game on a network server, but important features like
- weapons and player saving are have yet to be implemented.
+
+
+ The engine is written from scratch in C++ and uses SDL, OpenGL, OpenAL, libjpeg, libpng, zlib
+ and the Bullet physics library. It is
+ a work in progress and evolves with the game as required.
+
+
+ The basic components are already in place: players can start a single-player game,
+ or join a network server. They can purchase a ship and explore the universe and can even earn
+ some cash trading cargo. Other important parts are still missing: games can not be saved and
+ there are no weapon nor combat features.
+
+
+ The game aims to be fully customizable. Common and easy to edit file formats
+ make it trivial to change most of the game settings and world definitions.
+
+
+ Packages of the latest development build are available for windows and linux.
@@ -99,7 +109,15 @@
http://ingar.satgnu.net/osirion
- The official IRC channel is #osirion on the FreeNode IRC network.
+ The official IRC channel is #osirion on the
+ FreeNode IRC network.
+
+
+ SVN activity is monitored by CIA.vc, the project pages can be found here:
+
@@ -121,7 +139,7 @@
of authors and copyright.
- Copyright © 2007-2009
+ Copyright © 2007-2010
Stijn "Ingar" Buys <ingar@telenet.be>
diff --git a/doc/installation.html b/doc/installation.html
index 2c3ddfc..cc1ec14 100644
--- a/doc/installation.html
+++ b/doc/installation.html
@@ -173,7 +173,7 @@ unzip ../osirion-data-latest.zip
the instructions in this document
to create a complete environment, capable of building the Project::OSiRiON source code.
You need to install the base system described in part one, and the following packages described
- in part two: DirectX development files, zlib, SDL, libpng, libjpeg, OpenAL Soft, pdcurses and bullet.
+ in part two: pkg-config, DirectX development files, zlib, SDL, libpng, libjpeg, OpenAL Soft, pdcurses and bullet.
@@ -250,32 +250,31 @@ autoreconf -fi
./configure
-
- If you do not need the client and want to build the dedicated server only
- you can pass the --without-client option to configure:
-
-
-./configure --without-client
-
Configure will automaticly detect the bullet library if it was installed in
- /usr or /usr/local.
+ /usr.
If it was installed somewhere else you will have to pass the --with-bullet=prefix option
- to configure. For example, --with-bullet=/opt/bullet will use the bullet libraries installed in
- /opt/bullet/lib and the includes in /opt/bullet/include/bullet.
+ to configure. For example, --with-bullet=/usr/local will use the bullet libraries installed in
+ /usr/local/lib and the includes in /usr/local/include/bullet.
-./configure --with-bullet=/opt/bullet
+./configure --with-bullet=/usr/local
If you add the --enable-static-bullet option, the resulting binary will be staticly
linked with the bullet libraries. They will work on systems that do not have bullet installed.
-./configure --with-bullet=/opt/bullet --enable-static-bullet
+./configure --with-bullet=/usr/local --enable-static-bullet
+
+
+ If you do not need the client and want to build the dedicated server only
+ you can pass the --without-client option to configure:
+
+
+./configure --without-client
-
If configure finds ncurses or pdcurses, the dedicated server will use this
library and a have a curses console. To disable curses detection, pass the
diff --git a/doc/main.css b/doc/main.css
index efcc412..68e4d6f 100644
--- a/doc/main.css
+++ b/doc/main.css
@@ -69,8 +69,8 @@ img {
border-bottom: 1px solid #606060;
border-left: 1px solid #606060;
border-right: 1px solid #606060;
- margin-top: 24px;
- margin-bottom: 24px;
+ margin-top: 16px;
+ margin-bottom: 16px;
}
.header {
@@ -96,8 +96,9 @@ img {
.title {
background: #d7d7d7;
margin-left: 24px;
- margin-right: 72px;
+ margin-right: 48px;
padding: 4px;
+ padding-left: 8px;
border-top: 1px solid #606060;
border-bottom: 1px solid #606060;
border-left: 1px solid #606060;
@@ -108,7 +109,7 @@ img {
.subtitle {
background: #e7e7e7;
margin-left: 48px;
- margin-right: 72px;
+ margin-right: 48px;
margin-top: 8px;
margin-bottom: 8px;
font-size: 12pt;
@@ -123,7 +124,7 @@ img {
.text, .nav, .toolbox {
margin-left: 48px;
- margin-right: 72px;
+ margin-right: 48px;
}
.text, .toolbox {
@@ -133,6 +134,7 @@ img {
border-left: 1px solid #606060;
border-right: 1px solid #606060;
padding: 8px;
+ padding-left: 8px;
margin-top: 8px;
margin-bottom: 8px;
}
--
cgit v1.2.3