Skip to content

Commit

Permalink
Add 'noboost=1' and 'shared=1' parameter to SConstruct. Update INSTAL…
Browse files Browse the repository at this point in the history
…L AND README.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@513 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
  • Loading branch information
aramis_acg committed Dec 14, 2009
1 parent a9ece90 commit 1a4ef72
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 9 deletions.
20 changes: 17 additions & 3 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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.





Expand Down
11 changes: 8 additions & 3 deletions README
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
Expand Down
12 changes: 9 additions & 3 deletions workspaces/SCons/SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -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)

0 comments on commit 1a4ef72

Please sign in to comment.