Moved some defines into the core, away from the public stuff.
Fixed build error regarding zutil.c with vc9. Updated VC9 project files (again ...) Moved version getters to aiVersion.h. Deleted redundant fast_atof.h from irrXML. Added vc9 config for cppunit Fixed a missing include when building against stlport git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@307 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
+37
-16
@@ -1,47 +1,68 @@
|
||||
|
||||
|
||||
|
||||
// This is a dummy unit - it is used to generate the precompiled header file.
|
||||
// + it contains version management functions
|
||||
// Actually just a dummyy, used by the compiler to build the precompiled header.
|
||||
|
||||
#include "AssimpPCH.h"
|
||||
#include "./../include/aiVersion.h"
|
||||
|
||||
// ################################################################################
|
||||
// Legal information string
|
||||
// Note that this string must be contained in the compiled image.
|
||||
// --------------------------------------------------------------------------------
|
||||
// Legal information string - dont't remove from image!
|
||||
static const char* LEGAL_INFORMATION =
|
||||
|
||||
"Open Asset Import Library (ASSIMP).\n"
|
||||
"A free C/C++ library to import various 3D file formats into applications\n\n"
|
||||
|
||||
"(c) ASSIMP Development Team, 2008-2009\n"
|
||||
"License: modified BSD license (http://assimp.sourceforge.net/main_license.html)\n"
|
||||
"License: BSD\n"
|
||||
"Website: http://assimp.sourceforge.net\n"
|
||||
;
|
||||
// ################################################################################
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
ASSIMP_API const char* aiGetLegalString ()
|
||||
{
|
||||
// Get legal string
|
||||
ASSIMP_API const char* aiGetLegalString () {
|
||||
return LEGAL_INFORMATION;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
ASSIMP_API unsigned int aiGetVersionMinor ()
|
||||
{
|
||||
// Get Assimp minor version
|
||||
ASSIMP_API unsigned int aiGetVersionMinor () {
|
||||
return 5;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
ASSIMP_API unsigned int aiGetVersionMajor ()
|
||||
{
|
||||
// Get Assimp major version
|
||||
ASSIMP_API unsigned int aiGetVersionMajor () {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Get flags used for compilation
|
||||
ASSIMP_API unsigned int aiGetCompileFlags () {
|
||||
|
||||
unsigned int flags = 0;
|
||||
|
||||
#ifdef ASSIMP_BUILD_BOOST_WORKAROUND
|
||||
flags |= ASSIMP_CFLAGS_NOBOOST;
|
||||
#endif
|
||||
#ifdef ASSIMP_BUILD_SINGLETHREADED
|
||||
flags |= ASSIMP_CFLAGS_SINGLETHREADED;
|
||||
#endif
|
||||
#ifdef ASSIMP_BUILD_DEBUG
|
||||
flags |= ASSIMP_CFLAGS_DEBUG;
|
||||
#endif
|
||||
#ifdef ASSIMP_BUILD_DLL_EXPORT
|
||||
flags |= ASSIMP_CFLAGS_SHARED;
|
||||
#endif
|
||||
#ifdef _STLPORT_VERSION
|
||||
flags |= ASSIMP_CFLAGS_STLPORT;
|
||||
#endif
|
||||
|
||||
return flags;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
ASSIMP_API unsigned int aiGetVersionRevision ()
|
||||
{
|
||||
// TODO: find a way to update the revision number automatically
|
||||
return 254;
|
||||
return 306;
|
||||
}
|
||||
|
||||
|
||||
+34
-8
@@ -47,9 +47,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
// Compile config
|
||||
#include "../include/aiDefines.h"
|
||||
|
||||
// ===================================================================
|
||||
// Undefine the min/max macros defined by some platform headers
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
// Concatenate two tokens after evaluating them
|
||||
#define AI_CONCAT(a,b) a ## b
|
||||
|
||||
// Helper macro that sets a pointer to NULL in debug builds
|
||||
#if (defined _DEBUG)
|
||||
# define AI_DEBUG_INVALIDATE_PTR(x) x = NULL;
|
||||
#else
|
||||
# define AI_DEBUG_INVALIDATE_PTR(x)
|
||||
#endif
|
||||
|
||||
// We depend heavily on the STL's performance, so we need to make sure
|
||||
// that the M$ implementation isn't 'secure', but 'fast'
|
||||
#if 0 // this crashes! what the fuck???
|
||||
#if (defined _MSC_VER) && (!defined DEBUG)
|
||||
# define _SECURE_SCL 0
|
||||
# define _SCL_SECURE_NO_DEPRECATE
|
||||
# define _HAS_ITERATOR_DEBUGGING 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// If we have at least VC8 some C string manipulation functions
|
||||
// are mapped to their safe _s counterparts (e.g. _itoa_s).
|
||||
#if _MSC_VER >= 1400 && !(defined _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
|
||||
# define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
|
||||
#endif
|
||||
|
||||
// Actually that'snot required for MSVC (it is included somewhere in
|
||||
// the STL ..) but it is necessary for build with STLport.
|
||||
#include <ctype.h>
|
||||
|
||||
// Runtime/STL headers
|
||||
// ===================================================================
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#include <map>
|
||||
@@ -64,9 +96,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#include <numeric>
|
||||
#include <new>
|
||||
|
||||
// ===================================================================
|
||||
// Public ASSIMP headers
|
||||
// ===================================================================
|
||||
#include "../include/DefaultLogger.h"
|
||||
#include "../include/IOStream.h"
|
||||
#include "../include/IOSystem.h"
|
||||
@@ -74,18 +104,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#include "../include/aiPostProcess.h"
|
||||
#include "../include/assimp.hpp"
|
||||
|
||||
// ===================================================================
|
||||
// Internal utility headers
|
||||
// ===================================================================
|
||||
#include "BaseImporter.h"
|
||||
#include "MaterialSystem.h"
|
||||
#include "StringComparison.h"
|
||||
#include "StreamReader.h"
|
||||
#include "qnan.h"
|
||||
|
||||
// ===================================================================
|
||||
// boost headers - take them from the workaround dir if possible
|
||||
// ===================================================================
|
||||
#ifdef ASSIMP_BUILD_BOOST_WORKAROUND
|
||||
|
||||
# include "../include/BoostWorkaround/boost/scoped_ptr.hpp"
|
||||
|
||||
@@ -51,8 +51,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
using namespace Assimp;
|
||||
|
||||
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Constructor to be privately used by Importer
|
||||
SortByPTypeProcess::SortByPTypeProcess()
|
||||
@@ -84,7 +82,7 @@ void SortByPTypeProcess::SetupProperties(const Importer* pImp)
|
||||
// Update changed meshes in all nodes
|
||||
void UpdateNodes(const std::vector<unsigned int>& replaceMeshIndex, aiNode* node)
|
||||
{
|
||||
std::vector<unsigned int>::const_iterator it;
|
||||
// std::vector<unsigned int>::const_iterator it;
|
||||
|
||||
if (node->mNumMeshes)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user