From 1a4ef72ffb6fbebf5b860f3a42c9dcf21e05a773 Mon Sep 17 00:00:00 2001
From: aramis_acg <aramis_acg@67173fc5-114c-0410-ac8e-9d2fd5bffc1f>
Date: Mon, 14 Dec 2009 18:32:06 +0000
Subject: [PATCH] Add 'noboost=1' and 'shared=1' parameter to SConstruct.
 Update INSTALL AND README.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@513 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
---
 INSTALL                     | 20 +++++++++++++++++---
 README                      | 11 ++++++++---
 workspaces/SCons/SConstruct | 12 +++++++++---
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index fdc75522f..90e173491 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,9 +1,12 @@
 	
 
 Open Asset Import Library (Assimp) Install
-------------------------------------------------
+------------------------------------------------
+
+
+=======================================================================
+Please see the doxygen documentation for full install instructions:
 
-Please see the doxygen documentation to learn how to build & use Assimp.
 A CHM file is included in the SVN repos: ./doc/AssimpDoc_Html/AssimpDoc.chm.
 At least Windows should be able to read it.
 
@@ -23,7 +26,18 @@ You can also find a copy of the doc on our web site:
 http://assimp.sourceforge.net/lib_html/index.html
 
 Beware, it could be outdated. If you're in serious doubt it might be,
-rebuilding the doc is probably a wise choice.
+rebuilding the doc is probably a wise choice.
+
+=======================================================================
+For the inpatient:
+
+Windows: go to ./workspaces/vc8 or ./workspaces/vc9, open the
+VS Solution and build your preferred build target ...
+
+Linux: try make in the ./code dir. Alternatively, run scons from
+./workspaces/SCons.
+
+
 
 
 
diff --git a/README b/README
index 92e76e495..c9e9448f1 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 	Open Asset Import Library (Assimp) Readme
 	-----------------------------------------
 
-Here you can find information regarding the Asset Import Library:
+Here you can find information regarding Open Asset Import Library:
 
 	1.		Overview
 	1.1		Supported file formats
@@ -30,11 +30,16 @@ The Asset Import Library provides a lot of model formats:
 	- X
 	- LWO
 	- OBJ
-	- SMD
+	- SMD
+	- Collada
+	- LWO
+	- Ogre XML
+	- partly LWS
+	- .. maybe some more ...
 
 1.2 File structure
 
-The Asset Import Library is implemented in C++ and provides a c-interface. The directories 
+Open Asset Import Library is implemented in C++ and provides a c-interface. The directories 
 are:
 
 	/bin			Binaries of the Asset Import Library.
diff --git a/workspaces/SCons/SConstruct b/workspaces/SCons/SConstruct
index 31eae61c7..adb8dcdcf 100644
--- a/workspaces/SCons/SConstruct
+++ b/workspaces/SCons/SConstruct
@@ -30,8 +30,8 @@ if ARGUMENTS.get('debug', 0):
 else:
 	ccflags = ccflags + ' -Os -fno-strict-aliasing -msse -Wall -pedantic'
     
-#if ARGUMENTS.get('noboost', 0):
-#    ccflags = ccflags + ' -DASSIMP_BUILD_BOOST_WORKAROUND '
+if ARGUMENTS.get('noboost', 0):
+	ccflags = ccflags + ' -DASSIMP_BUILD_BOOST_WORKAROUND '
 	
 env = Environment(CCFLAGS = ccflags, CPPPATH = g_IncPath, LIBPATH=g_LibPath)
 conf = Configure( env )
@@ -42,6 +42,12 @@ conf = Configure( env )
 env = conf.Finish()
 
 # Build library
-env.StaticLibrary(target = "assimp", source = g_assimp_lib_Source, 
+
+if ARGUMENTS.get("shared",0):
+	env.SharedLibrary(target = "assimp", source = g_assimp_lib_Source,
+		LIBPATH = g_LibPath)
+
+else:
+	env.StaticLibrary(target = "assimp", source = g_assimp_lib_Source, 
 		LIBPATH = g_LibPath)