diff --git a/code/AssimpPCH.cpp b/code/AssimpPCH.cpp index 3ed338de9..3ae4ba60e 100644 --- a/code/AssimpPCH.cpp +++ b/code/AssimpPCH.cpp @@ -1,18 +1,47 @@ -// this is a dummy - it is used to generate the precompiled header file. +// This is a dummy unit - it is used to generate the precompiled header file. +// + it contains version management functions #include "AssimpPCH.h" - - - +// ################################################################################ +// Legal information string +// Note that this string must be contained in the compiled image. static const char* LEGAL_INFORMATION = -"Open Asset Import Library (ASSIMP).\n\n" +"Open Asset Import Library (ASSIMP).\n" +"A free C/C++ library to import various 3D file formats into applications\n\n" -"Licensed under a modified BSD license (http://assimp.sourceforge.net/main_license.html)\n" -"(c) ASSIMP Development Team, 2008\n" -"Hosted at SourceForge, http://assimp.sourceforge.net\n" +"(c) ASSIMP Development Team, 2008-2009\n" +"License: modified BSD license (http://assimp.sourceforge.net/main_license.html)\n" +"Website: http://assimp.sourceforge.net\n" ; +// ################################################################################ + +// ------------------------------------------------------------------------------------------------ +ASSIMP_API const char* aiGetLegalString () +{ + return LEGAL_INFORMATION; +} + +// ------------------------------------------------------------------------------------------------ +ASSIMP_API unsigned int aiGetVersionMinor () +{ + return 5; +} + +// ------------------------------------------------------------------------------------------------ +ASSIMP_API unsigned int aiGetVersionMajor () +{ + return 0; +} + +// ------------------------------------------------------------------------------------------------ +ASSIMP_API unsigned int aiGetVersionRevision () +{ + // TODO: find a way to update the revision number automatically + return 254; +} + diff --git a/code/AssimpPCH.h b/code/AssimpPCH.h index cf5dddc38..2878e5253 100644 --- a/code/AssimpPCH.h +++ b/code/AssimpPCH.h @@ -106,6 +106,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ******************************************************************* #ifdef ASSIMP_BUILD_BOOST_WORKAROUND +#if _MSC_VER >= 1400 +# pragma message( "AssimpBuild: Using -noBoost workaround" ) +#endif + # include "../include/BoostWorkaround/boost/scoped_ptr.hpp" # include "../include/BoostWorkaround/boost/scoped_array.hpp" # include "../include/BoostWorkaround/boost/format.hpp" @@ -113,6 +117,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #else +#if _MSC_VER >= 1400 +# pragma message( "AssimpBuild: Using standard boost headers" ) +#endif + # include # include # include diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp index 389f1b1cc..15d9afd28 100644 --- a/code/SceneCombiner.cpp +++ b/code/SceneCombiner.cpp @@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SceneCombiner.h" #include "fast_atof.h" #include "Hash.h" +#include "time.h" // ---------------------------------------------------------------------------- // We need boost::random here. The workaround uses rand() instead of a proper @@ -58,12 +59,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ---------------------------------------------------------------------------- #ifdef ASSIMP_BUILD_BOOST_WORKAROUND +#if _MSC_VER >= 1400 +# pragma message( "AssimpBuild: Using -noBoost workaround for boost::random" ) +#endif + # include "../include/BoostWorkaround/boost/random/uniform_int.hpp" # include "../include/BoostWorkaround/boost/random/variate_generator.hpp" # include "../include/BoostWorkaround/boost/random/mersenne_twister.hpp" #else +#if _MSC_VER >= 1400 +# pragma message( "AssimpBuild: Using standard boost headers for boost::random" ) +#endif + # include # include # include @@ -289,7 +298,7 @@ void SceneCombiner::MergeScenes(aiScene** _dest, aiScene* master, { // Construct a proper random number generator boost::mt19937 rng( ::clock() ); - boost::uniform_int<> dist(1,1 << 24u); + boost::uniform_int<> dist(1u,1 << 24u); boost::variate_generator > rndGen(rng, dist); for (unsigned int i = 1; i < src.size();++i) diff --git a/include/BoostWorkaround/boost/common_factor_rt.hpp b/include/BoostWorkaround/boost/common_factor_rt.hpp index 04af64ab6..39de4c439 100644 --- a/include/BoostWorkaround/boost/common_factor_rt.hpp +++ b/include/BoostWorkaround/boost/common_factor_rt.hpp @@ -9,8 +9,9 @@ namespace math { // TODO: use binary GCD for unsigned integers .... template < typename IntegerType > -IntegerType gcd( IntegerType const &a, IntegerType const &b ) +IntegerType gcd( IntegerType a, IntegerType b ) { + IntegerType zero = (IntegerType)0; while ( true ) { if ( a == zero ) @@ -24,7 +25,7 @@ IntegerType gcd( IntegerType const &a, IntegerType const &b ) } template < typename IntegerType > -IntegerType lcm( IntegerType const &a, IntegerType const &b ) +IntegerType lcm( IntegerType a, IntegerType b ) { IntegerType t = gcd (a,b); if (!t)return t; diff --git a/include/BoostWorkaround/boost/foreach.hpp b/include/BoostWorkaround/boost/foreach.hpp new file mode 100644 index 000000000..066bb11bd --- /dev/null +++ b/include/BoostWorkaround/boost/foreach.hpp @@ -0,0 +1,115 @@ + +#ifndef BOOST_FOREACH + +/////////////////////////////////////////////////////////////////////////////// +// A stripped down version of FOREACH for +// illustration purposes. NOT FOR GENERAL USE. +// For a complete implementation, see BOOST_FOREACH at +// http://boost-sandbox.sourceforge.net/vault/index.php?directory=eric_niebler +// +// Copyright 2004 Eric Niebler. +// Distributed under the Boost Software License, Version 1.0. (See +// accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) +// +// Adapted to Assimp November 29th, 2008 (Alexander Gessler). +// Added code to handle both const and non-const iterators, simplified some +// parts. +/////////////////////////////////////////////////////////////////////////////// + +namespace boost { +namespace foreach_detail { + +/////////////////////////////////////////////////////////////////////////////// +// auto_any + +struct auto_any_base +{ + operator bool() const { return false; } +}; + +template +struct auto_any : auto_any_base +{ + auto_any(T const& t) : item(t) {} + mutable T item; +}; + +template +T& auto_any_cast(auto_any_base const& any) +{ + return static_cast const&>(any).item; +} + +/////////////////////////////////////////////////////////////////////////////// +// FOREACH helper function + +template +auto_any begin(T const& t) +{ + return t.begin(); +} + +template +auto_any end(T const& t) +{ + return t.end(); +} + + +// const_iterator +template +bool done(auto_any_base const& cur, auto_any_base const& end, T const&) +{ + typedef typename T::const_iterator iter_type; + return auto_any_cast(cur) == auto_any_cast(end); +} + +template +void next(auto_any_base const& cur, T const&) +{ + ++auto_any_cast(cur); +} + +template +typename T::const_reference deref(auto_any_base const& cur, T const&) +{ + return *auto_any_cast(cur); +} + + +// iterator +template +bool done(auto_any_base const& cur, auto_any_base const& end, T&) +{ + typedef typename T::iterator iter_type; + return auto_any_cast(cur) == auto_any_cast(end); +} + +template +void next(auto_any_base const& cur, T&) +{ + ++auto_any_cast(cur); +} + +template +typename T::reference deref(auto_any_base const& cur, T&) +{ + return *auto_any_cast(cur); +} + +} // end foreach_detail + +/////////////////////////////////////////////////////////////////////////////// +// FOREACH + +#define BOOST_FOREACH(item, container) \ + if(boost::foreach_detail::auto_any_base const& b = boost::foreach_detail::begin(container)) {} else \ + if(boost::foreach_detail::auto_any_base const& e = boost::foreach_detail::end(container)) {} else \ + for(;!boost::foreach_detail::done(b,e,container); boost::foreach_detail::next(b,container)) \ + if (bool ugly_and_unique_break = false) {} else \ + for(item = boost::foreach_detail::deref(b,container); !ugly_and_unique_break; ugly_and_unique_break = true) + +} // end boost + +#endif \ No newline at end of file diff --git a/include/BoostWorkaround/boost/random/mersenne_twister.hpp b/include/BoostWorkaround/boost/random/mersenne_twister.hpp index e69de29bb..07695b4f5 100644 --- a/include/BoostWorkaround/boost/random/mersenne_twister.hpp +++ b/include/BoostWorkaround/boost/random/mersenne_twister.hpp @@ -0,0 +1,30 @@ + +#ifndef BOOST_MT_INCLUDED +#define BOOST_MT_INCLUDED + +#if _MSC_VER >= 1400 +# pragma message( "AssimpBuild: Using CRT's rand() as replacement for mt19937" ) +#endif + +namespace boost +{ + + // A very minimal implementation. No mersenne_twister at all, + // but it should generate some randomness, though + class mt19937 + { + public: + + mt19937(unsigned int seed) + { + ::srand(seed); + } + + unsigned int operator () (void) + { + return ::rand(); + } + }; +}; + +#endif \ No newline at end of file diff --git a/include/BoostWorkaround/boost/random/uniform_int.hpp b/include/BoostWorkaround/boost/random/uniform_int.hpp index e69de29bb..052932e49 100644 --- a/include/BoostWorkaround/boost/random/uniform_int.hpp +++ b/include/BoostWorkaround/boost/random/uniform_int.hpp @@ -0,0 +1,30 @@ + +#ifndef BOOST_UNIFORM_INT_INCLUDED +#define BOOST_UNIFORM_INT_INCLUDED + +namespace boost +{ + template + class uniform_int + { + public: + + typedef IntType type; + + uniform_int (IntType _first, IntType _last) + : first (_first) + , last (_last) + {} + + IntType operator () (IntType in) + { + return (IntType)((in * ((last-first)/RAND_MAX)) + first); + } + + private: + + IntType first, last; + }; +}; + +#endif // BOOST_UNIFORM_INT_INCLUDED \ No newline at end of file diff --git a/include/BoostWorkaround/boost/random/variate_generator.hpp b/include/BoostWorkaround/boost/random/variate_generator.hpp index e69de29bb..85b15dd5e 100644 --- a/include/BoostWorkaround/boost/random/variate_generator.hpp +++ b/include/BoostWorkaround/boost/random/variate_generator.hpp @@ -0,0 +1,31 @@ + + +#ifndef BOOST_VG_INCLUDED +#define BOOST_VG_INCLUDED + +namespace boost +{ + +template +class variate_generator +{ +public: + + variate_generator (Random _rnd, Distribution _dist) + : rnd (_rnd) + , dist (_dist) + {} + + typename Distribution::type operator () () + { + return dist ( rnd () ); + } + +private: + + Random rnd; + Distribution dist; +}; +} // end namespace boost + +#endif \ No newline at end of file diff --git a/include/BoostWorkaround/boost/scoped_array.h b/include/BoostWorkaround/boost/scoped_array.hpp similarity index 100% rename from include/BoostWorkaround/boost/scoped_array.h rename to include/BoostWorkaround/boost/scoped_array.hpp diff --git a/include/aiConfig.h b/include/aiConfig.h index 99053eb8d..f09ea7fc0 100644 --- a/include/aiConfig.h +++ b/include/aiConfig.h @@ -39,10 +39,51 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------- */ -/** @file Defines constants for configurable properties */ +/** @file Defines constants for configurable properties and helper + functions to determine the version of the Assimp library being used */ #ifndef __AI_CONFIG_H_INC__ #define __AI_CONFIG_H_INC__ +#ifdef __cplusplus +extern "C" { +#endif + +// --------------------------------------------------------------------------- +/** Returns a string with legal copyright and licensing information + * about Assimp. + * + * @return Never NULL + */ +ASSIMP_API const char* aiGetLegalString (); + +// --------------------------------------------------------------------------- +/** Returns the current minor version number of Assimp. + * + * @return Minor version of the Assimp runtime the application was + * linked/built against + */ +ASSIMP_API unsigned int aiGetVersionMinor (); + +// --------------------------------------------------------------------------- +/** Returns the current major version number of Assimp. + * + * @return Major version of the Assimp runtime the application was + * linked/built against + */ +ASSIMP_API unsigned int aiGetVersionMajor (); + +// --------------------------------------------------------------------------- +/** Returns the repository revision of the Assimp runtime. + * + * @return Repository revision number of the Assimp runtime the application + * was linked/built against + */ +ASSIMP_API unsigned int aiGetVersionRevision (); + +#ifdef __cplusplus +} // end extern "C" +#endif + // --------------------------------------------------------------------------- /** \brief Set the maximum number of vertices in a mesh. * diff --git a/include/assimp.hpp b/include/assimp.hpp index 34b9e5e32..275c2b821 100644 --- a/include/assimp.hpp +++ b/include/assimp.hpp @@ -39,29 +39,30 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------- */ -/** @file Defines the CPP-API to the Open Asset Import Library. */ -#ifndef AI_ASSIMP_HPP_INC -#define AI_ASSIMP_HPP_INC +/** @file Defines the C++-API to the Open Asset Import Library. */ +#ifndef __AI_ASSIMP_HPP_INC__ +#define __AI_ASSIMP_HPP_INC__ #ifndef __cplusplus -# error This header requires C++ to be used. +# error This header requires C++ to be used. Use Assimp's C-API (assimp.h) \ + to access the library from C code. #endif - #include -// public ASSIMP headers + +// Public ASSIMP headers #include "aiTypes.h" #include "aiConfig.h" #include "aiAssert.h" namespace Assimp { - // public interface + // Public interface class Importer; class IOStream; class IOSystem; - // plugin development + // Plugin development class BaseImporter; class BaseProcess; class SharedPostProcessInfo; @@ -282,7 +283,7 @@ public: * If the call succeeds, the contents of the file are returned as a * pointer to an aiScene object. The returned data is intended to be * read-only, the importer object keeps ownership of the data and will - * destroy it upon destruction. If the import failes, NULL is returned. + * destroy it upon destruction. If the import failes, NULL is returned. * A human-readable error description can be retrieved by calling * GetErrorString(). The previous scene will be deleted during this call. * @param pFile Path and filename to the file to be imported. @@ -303,8 +304,7 @@ public: * @return A description of the last error, an empty string if no * error occured. */ - inline const std::string& GetErrorString() const - { return mErrorString; } + inline const std::string& GetErrorString() const; // ------------------------------------------------------------------- @@ -346,10 +346,7 @@ public: * * @return Current scene or NULL if there is currently no scene loaded */ - inline const aiScene* GetScene() - { - return mScene; - } + inline const aiScene* GetScene(); // ------------------------------------------------------------------- @@ -361,12 +358,7 @@ public: * * @return Current scene or NULL if there is currently no scene loaded */ - inline const aiScene* GetOrphanedScene() - { - aiScene* scene = mScene; - mScene = NULL; - return scene; - } + inline const aiScene* GetOrphanedScene(); // ------------------------------------------------------------------- @@ -383,8 +375,7 @@ public: * all steps behave consequently in the same manner when modifying * data structures. */ - inline void SetExtraVerbose(bool bDo) - {this->bExtraVerbose = bDo;} + inline void SetExtraVerbose(bool bDo); private: @@ -393,7 +384,6 @@ private: protected: - /** IO handler to use for all file accesses. */ IOSystem* mIOHandler; bool mIsDefaultHandler; @@ -430,6 +420,31 @@ protected: SharedPostProcessInfo* mPPShared; }; +// --------------------------------------------------------------------------- +// inline methods for Importer +inline const std::string& Importer::GetErrorString() const +{ + return mErrorString; +} + +inline void Importer::SetExtraVerbose(bool bDo) +{ + bExtraVerbose = bDo; +} + +inline const aiScene* Importer::GetOrphanedScene() +{ + aiScene* scene = mScene; + mScene = NULL; + return scene; +} + +inline const aiScene* Importer::GetScene() +{ + return mScene; +} + + } // End of namespace Assimp -#endif // AI_ASSIMP_HPP_INC +#endif // __AI_ASSIMP_HPP_INC diff --git a/test/ReferenceImages/MappingModes/cylindrical.png b/test/ReferenceImages/MappingModes/cylindrical.png new file mode 100644 index 000000000..a1ad5979b Binary files /dev/null and b/test/ReferenceImages/MappingModes/cylindrical.png differ diff --git a/test/ReferenceImages/MappingModes/spherical.png b/test/ReferenceImages/MappingModes/spherical.png new file mode 100644 index 000000000..c6d589832 Binary files /dev/null and b/test/ReferenceImages/MappingModes/spherical.png differ diff --git a/workspaces/vc8/UnitTest.vcproj b/workspaces/vc8/UnitTest.vcproj index 8591a9af0..47ed34d29 100644 --- a/workspaces/vc8/UnitTest.vcproj +++ b/workspaces/vc8/UnitTest.vcproj @@ -662,6 +662,328 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workspaces/vc8/assimp.sln b/workspaces/vc8/assimp.sln index 633a238c9..970a85fba 100644 --- a/workspaces/vc8/assimp.sln +++ b/workspaces/vc8/assimp.sln @@ -2,13 +2,13 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssimpView", "assimp_view.vcproj", "{B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}" - ProjectSection(ProjectDependencies) = postProject - {5691E159-2D9B-407F-971F-EA5C592DC524} = {5691E159-2D9B-407F-971F-EA5C592DC524} - EndProjectSection ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {5691E159-2D9B-407F-971F-EA5C592DC524} = {5691E159-2D9B-407F-971F-EA5C592DC524} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Assimp", "assimp.vcproj", "{5691E159-2D9B-407F-971F-EA5C592DC524}" ProjectSection(WebsiteProperties) = preProject @@ -17,13 +17,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Assimp", "assimp.vcproj", " EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest.vcproj", "{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}" - ProjectSection(ProjectDependencies) = postProject - {5691E159-2D9B-407F-971F-EA5C592DC524} = {5691E159-2D9B-407F-971F-EA5C592DC524} - EndProjectSection ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {5691E159-2D9B-407F-971F-EA5C592DC524} = {5691E159-2D9B-407F-971F-EA5C592DC524} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jAssimp_NOT_WORKING", "jAssimp.vcproj", "{FE78BFBA-4BA5-457D-8602-B800D498102D}" ProjectSection(WebsiteProperties) = preProject @@ -33,16 +33,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jAssimp_NOT_WORKING", "jAss EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug -noBoost|Win32 = Debug -noBoost|Win32 + Debug -noBoost|x64 = Debug -noBoost|x64 Debug_DLL|Win32 = Debug_DLL|Win32 Debug_DLL|x64 = Debug_DLL|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release -noBoost|Win32 = Release -noBoost|Win32 + Release -noBoost|x64 = Release -noBoost|x64 Release_DLL|Win32 = Release_DLL|Win32 Release_DLL|x64 = Release_DLL|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug -noBoost|Win32.ActiveCfg = Debug -noBoost|Win32 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug -noBoost|Win32.Build.0 = Debug -noBoost|Win32 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug -noBoost|x64.ActiveCfg = Debug -noBoost|x64 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug -noBoost|x64.Build.0 = Debug -noBoost|x64 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.ActiveCfg = Debug_DLL|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.Build.0 = Debug_DLL|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|x64.ActiveCfg = Debug_DLL|x64 @@ -51,6 +59,10 @@ Global {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|Win32.Build.0 = Debug|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|x64.ActiveCfg = Debug|x64 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|x64.Build.0 = Debug|x64 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release -noBoost|Win32.ActiveCfg = Release -noBoost|Win32 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release -noBoost|Win32.Build.0 = Release -noBoost|Win32 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release -noBoost|x64.ActiveCfg = Release -noBoost|x64 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release -noBoost|x64.Build.0 = Release -noBoost|x64 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.ActiveCfg = Release_DLL|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.Build.0 = Release_DLL|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|x64.ActiveCfg = Release_DLL|x64 @@ -59,6 +71,10 @@ Global {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|Win32.Build.0 = Release|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|x64.ActiveCfg = Release|x64 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|x64.Build.0 = Release|x64 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug -noBoost|Win32.ActiveCfg = Debug -noBoost|Win32 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug -noBoost|Win32.Build.0 = Debug -noBoost|Win32 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug -noBoost|x64.ActiveCfg = Debug -noBoost|x64 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug -noBoost|x64.Build.0 = Debug -noBoost|x64 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug_DLL|Win32.ActiveCfg = Debug_DLL|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug_DLL|Win32.Build.0 = Debug_DLL|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug_DLL|x64.ActiveCfg = Debug_DLL|x64 @@ -67,6 +83,10 @@ Global {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug|Win32.Build.0 = Debug|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug|x64.ActiveCfg = Debug|x64 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug|x64.Build.0 = Debug|x64 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Release -noBoost|Win32.ActiveCfg = Release -noBoost|Win32 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Release -noBoost|Win32.Build.0 = Release -noBoost|Win32 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Release -noBoost|x64.ActiveCfg = Release -noBoost|x64 + {5691E159-2D9B-407F-971F-EA5C592DC524}.Release -noBoost|x64.Build.0 = Release -noBoost|x64 {5691E159-2D9B-407F-971F-EA5C592DC524}.Release_DLL|Win32.ActiveCfg = Release_DLL|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Release_DLL|Win32.Build.0 = Release_DLL|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Release_DLL|x64.ActiveCfg = Release_DLL|x64 @@ -75,18 +95,26 @@ Global {5691E159-2D9B-407F-971F-EA5C592DC524}.Release|Win32.Build.0 = Release|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Release|x64.ActiveCfg = Release|x64 {5691E159-2D9B-407F-971F-EA5C592DC524}.Release|x64.Build.0 = Release|x64 + {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug -noBoost|Win32.ActiveCfg = Debug -noBoost|Win32 + {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug -noBoost|x64.ActiveCfg = Debug -noBoost|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug_DLL|Win32.ActiveCfg = Debug_DLL|Win32 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug_DLL|x64.ActiveCfg = Debug_DLL|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug|Win32.ActiveCfg = Debug|Win32 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug|x64.ActiveCfg = Debug|x64 + {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release -noBoost|Win32.ActiveCfg = Release -noBoost|Win32 + {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release -noBoost|x64.ActiveCfg = Release -noBoost|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release_DLL|Win32.ActiveCfg = Release_DLL|Win32 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release_DLL|x64.ActiveCfg = Release_DLL|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|Win32.ActiveCfg = Release|Win32 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|x64.ActiveCfg = Release|x64 + {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug -noBoost|Win32.ActiveCfg = Debug -noBoost|Win32 + {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug -noBoost|x64.ActiveCfg = Debug -noBoost|x64 {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug_DLL|Win32.ActiveCfg = Debug|Win32 {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug_DLL|x64.ActiveCfg = Debug|x64 {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug|Win32.ActiveCfg = Debug|Win32 {FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug|x64.ActiveCfg = Debug|x64 + {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release -noBoost|Win32.ActiveCfg = Release -noBoost|Win32 + {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release -noBoost|x64.ActiveCfg = Release -noBoost|x64 {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release_DLL|Win32.ActiveCfg = Release|Win32 {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release_DLL|x64.ActiveCfg = Release|x64 {FE78BFBA-4BA5-457D-8602-B800D498102D}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/workspaces/vc8/assimp.vcproj b/workspaces/vc8/assimp.vcproj index ef747ecd3..1d1d76eef 100644 --- a/workspaces/vc8/assimp.vcproj +++ b/workspaces/vc8/assimp.vcproj @@ -580,6 +580,263 @@ CommandLine="copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\unittest_$(ConfigurationName)_$(PlatformName)"" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -730,18 +987,38 @@ RelativePath="..\..\include\BoostWorkaround\boost\common_factor_rt.hpp" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -858,6 +1184,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +