diff --git a/code/AssimpPCH.cpp b/code/AssimpPCH.cpp index 3ae4ba60e..34dfd656c 100644 --- a/code/AssimpPCH.cpp +++ b/code/AssimpPCH.cpp @@ -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; } diff --git a/code/AssimpPCH.h b/code/AssimpPCH.h index 2b5f67939..0cd0861e9 100644 --- a/code/AssimpPCH.h +++ b/code/AssimpPCH.h @@ -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 + // Runtime/STL headers -// =================================================================== #include #include #include @@ -64,9 +96,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -// =================================================================== // 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" diff --git a/code/SortByPTypeProcess.cpp b/code/SortByPTypeProcess.cpp index af11e0346..9b7bbbbde 100644 --- a/code/SortByPTypeProcess.cpp +++ b/code/SortByPTypeProcess.cpp @@ -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& replaceMeshIndex, aiNode* node) { - std::vector::const_iterator it; +// std::vector::const_iterator it; if (node->mNumMeshes) { diff --git a/contrib/cppunit-1.12.1/src/CppUnitLibrariesVC9.sln b/contrib/cppunit-1.12.1/src/CppUnitLibrariesVC9.sln new file mode 100644 index 000000000..62417d477 --- /dev/null +++ b/contrib/cppunit-1.12.1/src/CppUnitLibrariesVC9.sln @@ -0,0 +1,50 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppunit", "cppunit\cppunitvc9.vcproj", "{98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Static|Win32 = Debug Static|Win32 + Debug Static|x64 = Debug Static|x64 + Debug Unicode|Win32 = Debug Unicode|Win32 + Debug Unicode|x64 = Debug Unicode|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release Static|Win32 = Release Static|Win32 + Release Static|x64 = Release Static|x64 + Release Unicode|Win32 = Release Unicode|Win32 + Release Unicode|x64 = Release Unicode|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug Static|Win32.ActiveCfg = Debug|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug Static|Win32.Build.0 = Debug|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug Static|x64.ActiveCfg = Debug|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug Static|x64.Build.0 = Debug|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug Unicode|Win32.Build.0 = Debug|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug Unicode|x64.ActiveCfg = Debug|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug Unicode|x64.Build.0 = Debug|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug|Win32.ActiveCfg = Debug|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug|Win32.Build.0 = Debug|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug|x64.ActiveCfg = Debug|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Debug|x64.Build.0 = Debug|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release Static|Win32.ActiveCfg = Release|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release Static|Win32.Build.0 = Release|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release Static|x64.ActiveCfg = Release|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release Static|x64.Build.0 = Release|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release Unicode|Win32.ActiveCfg = Release|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release Unicode|Win32.Build.0 = Release|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release Unicode|x64.ActiveCfg = Release|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release Unicode|x64.Build.0 = Release|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release|Win32.ActiveCfg = Release|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release|Win32.Build.0 = Release|Win32 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release|x64.ActiveCfg = Release|x64 + {98E0A8E6-D7B0-4683-9DDC-7E24535A17E6}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/contrib/cppunit-1.12.1/src/cppunit/cppunit.vcproj b/contrib/cppunit-1.12.1/src/cppunit/cppunit.vcproj index 6e99c51ac..e8247acbb 100644 --- a/contrib/cppunit-1.12.1/src/cppunit/cppunit.vcproj +++ b/contrib/cppunit-1.12.1/src/cppunit/cppunit.vcproj @@ -49,7 +49,7 @@ PreprocessorDefinitions="_DEBUG;_LIB;WIN32" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" RuntimeTypeInfo="true" PrecompiledHeaderFile=".\Debug/cppunit.pch" AssemblerListingLocation=".\Debug/" @@ -95,6 +95,85 @@ CommandLine="copy "$(TargetPath)" ..\..\lib\$(TargetName).lib" /> + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contrib/irrXML/fast_atof.h b/contrib/irrXML/fast_atof.h deleted file mode 100644 index da5c65f75..000000000 --- a/contrib/irrXML/fast_atof.h +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright (C) 2002-2005 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine" and the "irrXML" project. -// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h - -#ifndef __FAST_A_TO_F_H_INCLUDED__ -#define __FAST_A_TO_F_H_INCLUDED__ - -#include -#include - -namespace irr -{ -namespace core -{ - -const float fast_atof_table[] = { - 0.f, - 0.1f, - 0.01f, - 0.001f, - 0.0001f, - 0.00001f, - 0.000001f, - 0.0000001f, - 0.00000001f, - 0.000000001f, - 0.0000000001f, - 0.00000000001f, - 0.000000000001f, - 0.0000000000001f, - 0.00000000000001f, - 0.000000000000001f - }; - -//! Provides a fast function for converting a string into a float, -//! about 6 times faster than atof in win32. -// If you find any bugs, please send them to me, niko (at) irrlicht3d.org. -inline char* fast_atof_move(char* c, float& out) -{ - bool inv = false; - char *t; - float f; - - if (*c=='-') - { - c++; - inv = true; - } - - f = (float)strtol(c, &t, 10); - - c = t; - - if (*c == '.') - { - c++; - - float pl = (float)strtol(c, &t, 10); - pl *= fast_atof_table[t-c]; - - f += pl; - - c = t; - - if (*c == 'e') - { - ++c; - float exp = (float)strtol(c, &t, 10); - f *= (float)pow(10.0f, exp); - c = t; - } - } - - if (inv) - f *= -1.0f; - - out = f; - return c; -} - -//! Provides a fast function for converting a string into a float, -//! about 6 times faster than atof in win32. -// If you find any bugs, please send them to me, niko (at) irrlicht3d.org. -inline const char* fast_atof_move_const(const char* c, float& out) -{ - bool inv = false; - char *t; - float f; - - if (*c=='-') - { - c++; - inv = true; - } - - f = (float)strtol(c, &t, 10); - - c = t; - - if (*c == '.') - { - c++; - - float pl = (float)strtol(c, &t, 10); - pl *= fast_atof_table[t-c]; - - f += pl; - - c = t; - - if (*c == 'e') - { - ++c; - f32 exp = (f32)strtol(c, &t, 10); - f *= (f32)powf(10.0f, exp); - c = t; - } - } - - if (inv) - f *= -1.0f; - - out = f; - return c; -} - - -inline float fast_atof(const char* c) -{ - float ret; - fast_atof_move_const(c, ret); - return ret; -} - -} // end namespace core -}// end namespace irr - -#endif - diff --git a/contrib/zlib/zutil.h b/contrib/zlib/zutil.h index b7d5eff81..46acfa675 100644 --- a/contrib/zlib/zutil.h +++ b/contrib/zlib/zutil.h @@ -14,6 +14,12 @@ #define ZUTIL_H #define ZLIB_INTERNAL + +/* https://sourceforge.net/forum/forum.php?thread_id=2881869&forum_id=817653 + * Actually a smart workaround is to disable debug builds of zlib completely. + */ +#undef DEBUG + #include "zlib.h" #ifdef STDC diff --git a/contrib/zlib_note.txt b/contrib/zlib_note.txt index d653a3826..f97c85be2 100644 --- a/contrib/zlib_note.txt +++ b/contrib/zlib_note.txt @@ -5,6 +5,7 @@ This is a heavily modified and shrinked version of zlib 1.2.3 - Removed Compression part - Removed infback.c - Added Assimp #idefs to exclude it if not needed +- Disabled debug macros in zutil.h All inflateNNN functions are available, for the rest you need to try. If a function is needed but is not there, get zlib and add the diff --git a/include/IOSystem.h b/include/IOSystem.h index e15375235..c13679330 100644 --- a/include/IOSystem.h +++ b/include/IOSystem.h @@ -106,8 +106,7 @@ public: * @note When implementing this class to provide custom IO handling, * you probably have to supply an own implementation of IOStream as well. */ - virtual IOStream* Open( - const std::string& pFile, + virtual IOStream* Open(const std::string& pFile, const std::string& pMode = std::string("rb")) = 0; // ------------------------------------------------------------------- diff --git a/include/aiConfig.h b/include/aiConfig.h index 34299d82a..862e55ac5 100644 --- a/include/aiConfig.h +++ b/include/aiConfig.h @@ -40,51 +40,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** @file aiConfig.h - * @brief 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 - -// --------------------------------------------------------------------------- -/** @brief Returns a string with legal copyright and licensing information - * about Assimp. + * @brief Defines constants for configurable properties for the library * - * @return Never NULL - */ -ASSIMP_API const char* aiGetLegalString (); - -// --------------------------------------------------------------------------- -/** @brief Returns the current minor version number of Assimp. + * Typically these properties are set via + * #Importer::SetPropertyFloat, + * #Importer::SetPropertyInteger or + * #Importer::SetPropertyString, + * depending on the data type of a property. All properties have a + * default value. See the doc for the mentioned methods for more details. * - * @return Minor version of the Assimp runtime the application was - * linked/built against + * @note + * The functions for use with the plain-c API are: + * #aiSetImportPropertyInteger, + * #aiSetImportPropertyFloat, + * #aiSetImportPropertyString */ -ASSIMP_API unsigned int aiGetVersionMinor (); - -// --------------------------------------------------------------------------- -/** @brief 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 (); - -// --------------------------------------------------------------------------- -/** @brief 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 +#ifndef INCLUDED_AI_CONFIG_H +#define INCLUDED_AI_CONFIG_H // --------------------------------------------------------------------------- /** @brief Set the maximum number of vertices in a mesh. diff --git a/include/aiDefines.h b/include/aiDefines.h index 8a4e50947..4c40f9d06 100644 --- a/include/aiDefines.h +++ b/include/aiDefines.h @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INCLUDED_AI_DEFINES_H #define INCLUDED_AI_DEFINES_H - // ================================================================ + ////////////////////////////////////////////////////////////////////////// // Define ASSIMP_BUILD_NO_XX_IMPORTER to disable a specific // file format loader. The loader is be excluded from the // build in this case. 'XX' stands for the most common file @@ -59,12 +59,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // - Disable support for compressed X files, removes the // dependency from the zlib inflate algorithm. // - // ================================================================ #ifndef ASSIMP_BUILD_NO_COMPRESSED_X # define ASSIMP_BUILD_NEED_Z_INFLATE #endif - // ================================================================ + ////////////////////////////////////////////////////////////////////////// // Define ASSIMP_BUILD_NO_XX_PROCESS to disable a specific // post-processing step. The spe will be excluded from the // build in this case. 'XX' stands for the name of the loader. @@ -88,7 +87,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // FINDINVALIDDATA // TRANSFORMTEXCOORDS // GENUVCOORDS - // ================================================================ // Compiler specific includes and definitions #if (defined _MSC_VER) @@ -97,25 +95,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Include our workaround stdint.h - VC doesn't have one # include "./../include/Compiler/pstdint.h" - // 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) \ - && (defined ASSIMP_INTERNAL_BUILD) - -# define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1 -#endif - - // ================================================================ + ////////////////////////////////////////////////////////////////////////// // Define ASSIMP_BUILD_DLL_EXPORT to build a DLL of the library - // ================================================================ # if (defined ASSIMP_BUILD_DLL_EXPORT) # define ASSIMP_API __declspec(dllexport) # pragma warning (disable : 4251) - // ================================================================ + ////////////////////////////////////////////////////////////////////////// // Define ASSIMP_DLL before including Assimp to use ASSIMP in // an external DLL (otherwise a static library is used) - // ================================================================ # elif (defined ASSIMP_DLL) # define ASSIMP_API __declspec(dllimport) # else @@ -132,15 +120,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef __cplusplus // No explicit 'struct' and 'enum' tags for C++, we don't want to - // confuse the AI of our IDE. + // confuse the AI (:-)) of our IDE. # define C_STRUCT # define C_ENUM #else - // ================================================================ + ////////////////////////////////////////////////////////////////////////// // To build the documentation, make sure ASSIMP_DOXYGEN_BUILD // is defined by Doxygen's preprocessor. The corresponding // entries in the DoxyFile look like this: - // ================================================================ #if 0 ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES @@ -152,12 +139,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. EXPAND_AS_DEFINED = C_STRUCT C_ENUM SKIP_FUNCTION_MACROS = YES #endif - // ================================================================ + ////////////////////////////////////////////////////////////////////////// // Doxygen gets confused if we use c-struct typedefs to avoid // the explicit 'struct' notation. This trick here has the same // effect as the TYPEDEF_HIDES_STRUCT option, but we don't need // to typedef all structs/enums. - // ================================================================ # if (defined ASSIMP_DOXYGEN_BUILD) # define C_STRUCT # define C_ENUM @@ -169,16 +155,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if (defined(__BORLANDC__) || defined (__BCPLUSPLUS__)) +#error Currently Borland is unsupported. Feel free to port Assimp. + // "W8059 Packgröße der Struktur geändert" #endif - - // ================================================================ + ////////////////////////////////////////////////////////////////////////// // Define ASSIMP_BUILD_BOOST_WORKAROUND to compile assimp // without boost. This is done by using a few workaround // classes. However, some assimp features are not available // in this case. This implies the ASSIMP_BUILD_SINGLETHREADED option. - // ================================================================ #ifdef ASSIMP_BUILD_BOOST_WORKAROUND // threading support requires boost @@ -188,12 +174,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif - // ================================================================ + ////////////////////////////////////////////////////////////////////////// // Define ASSIMP_BUILD_SINGLETHREADED to compile assimp // without threading support. The library doesn't utilize // threads then, and is itself not threadsafe. // If this flag is specified, boost::threads is *not* required. - // ================================================================ // TODO #ifndef ASSIMP_BUILD_SINGLETHREADED @@ -204,25 +189,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # define AI_C_THREADSAFE #endif // !! ASSIMP_BUILD_SINGLETHREADED +#if (defined _DEBUG || defined DEBUG) // one of the two should be defined .. +# define ASSIMP_BUILD_DEBUG +#endif + // Make sure NULL is defined #ifndef NULL # define NULL 0 #endif -// 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 - // Use our own definition of PI here #define AI_MATH_PI (3.1415926538) #define AI_MATH_TWO_PI (AI_MATH_PI * 2.0) @@ -232,4 +207,4 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_DEG_TO_RAD(x) (x*0.0174532925f) #define AI_RAD_TO_DEG(x) (x*57.2957795f) -#endif // !! AI_DEFINES_H_INC +#endif // !! INCLUDED_AI_DEFINES_H diff --git a/include/aiVersion.h b/include/aiVersion.h new file mode 100644 index 000000000..d0b9cf8a3 --- /dev/null +++ b/include/aiVersion.h @@ -0,0 +1,104 @@ +/* +--------------------------------------------------------------------------- +Open Asset Import Library (ASSIMP) +--------------------------------------------------------------------------- + +Copyright (c) 2006-2008, ASSIMP Development Team + +All rights reserved. + +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following +conditions are met: + +* Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +* Neither the name of the ASSIMP team, nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior + written permission of the ASSIMP Development Team. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------------------------- +*/ + +/** @file aiVersion.h + * @brief Functions to query the version of the Assimp runtime, check + * compile flags, ... + */ +#ifndef INCLUDED_AI_VERSION_H +#define INCLUDED_AI_VERSION_H + +#ifdef __cplusplus +extern "C" { +#endif + +// --------------------------------------------------------------------------- +/** @brief Returns a string with legal copyright and licensing information + * about Assimp. The string may include multiple lines. + * @return Pointer to static string. + */ +ASSIMP_API const char* aiGetLegalString (void); + +// --------------------------------------------------------------------------- +/** @brief 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 (void); + +// --------------------------------------------------------------------------- +/** @brief 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 (void); + +// --------------------------------------------------------------------------- +/** @brief Returns the repository revision of the Assimp runtime. + * @return SVN Repository revision number of the Assimp runtime the + * application was linked/built against + */ +ASSIMP_API unsigned int aiGetVersionRevision (void); + + +//! Assimp was compiled as a shared object (Windows: DLL) +#define ASSIMP_CFLAGS_SHARED 0x1 +//! Assimp was compiled against STLport +#define ASSIMP_CFLAGS_STLPORT 0x2 +//! Assimp was compiled as a debug build +#define ASSIMP_CFLAGS_DEBUG 0x4 + +//! Assimp was compiled with ASSIMP_BUILD_BOOST_WORKAROUND defined +#define ASSIMP_CFLAGS_NOBOOST 0x8 +//! Assimp was compiled with ASSIMP_BUILD_SINGLETHREADED defined +#define ASSIMP_CFLAGS_SINGLETHREADED 0x10 + +// --------------------------------------------------------------------------- +/** @brief Returns assimp's compile flags + * @return Any bitwise combination of the ASSIMP_CFLAGS_xxx constants. + */ +ASSIMP_API unsigned int aiGetCompileFlags (void); + +#ifdef __cplusplus +} // end extern "C" +#endif + +#endif // !! #ifndef INCLUDED_AI_VERSION_H \ No newline at end of file diff --git a/test/models/3DS/jeep1.3ds b/test/models/3DS/jeep1.3ds new file mode 100644 index 000000000..9249f663a Binary files /dev/null and b/test/models/3DS/jeep1.3ds differ diff --git a/test/models/3DS/jeep1.3ds.readme.txt b/test/models/3DS/jeep1.3ds.readme.txt new file mode 100644 index 000000000..14b0bd9eb --- /dev/null +++ b/test/models/3DS/jeep1.3ds.readme.txt @@ -0,0 +1,15 @@ +Jeep designed, modelled and skinned by me, Psionic + +FREE for use however you like, credits are appreciated!!! + +It was modelled in Milkshape 3D and includes the MS3D files oriented for X or B3D format (BlitzBasic 3D), its 2032 polys with a 512x512 jpg texture map. There are two skin variations plus a UV template to help out if you want to create your own skin variations. + +I'd love to see a few screenshots of it being used in-game so feel free to stop by my site and maybe drop by my forums and show us all what your doing with it!!!!!!! + +Check out more of my work at:- + +http://xu1productions.com/3dstudio/index.html - 3D Game Resources + +http://www.psionicdesign.com - My Main 2D/3D Digital Art site + +Psionic 2002 \ No newline at end of file diff --git a/test/models/3DS/jeep1.jpg b/test/models/3DS/jeep1.jpg new file mode 100644 index 000000000..e28e3aad5 Binary files /dev/null and b/test/models/3DS/jeep1.jpg differ diff --git a/test/unit/CCompilerTest.c b/test/unit/CCompilerTest.c index 02ceb3043..ca9cf14ca 100644 --- a/test/unit/CCompilerTest.c +++ b/test/unit/CCompilerTest.c @@ -4,4 +4,6 @@ #include #include #include +#include +#include #include \ No newline at end of file diff --git a/test/unit/UnitTestPCH.h b/test/unit/UnitTestPCH.h index 5338e975e..152db986f 100644 --- a/test/unit/UnitTestPCH.h +++ b/test/unit/UnitTestPCH.h @@ -1,8 +1,8 @@ -#ifndef ASSIMP_BUILD_SINGLETHREADED -# include -#endif +// #ifndef ASSIMP_BUILD_SINGLETHREADED +// # include +// #endif // Assimp public API #include diff --git a/workspaces/vc8/UnitTest.vcproj b/workspaces/vc8/UnitTest.vcproj index e195c3752..f5361bb60 100644 --- a/workspaces/vc8/UnitTest.vcproj +++ b/workspaces/vc8/UnitTest.vcproj @@ -48,7 +48,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -131,7 +131,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -211,7 +211,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\code;..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -292,7 +292,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\code;..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -372,7 +372,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\code;..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -698,7 +698,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\code;..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -779,7 +779,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\code;..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -861,7 +861,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -944,7 +944,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -1026,7 +1026,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -1109,7 +1109,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -1189,7 +1189,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\code;..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -1270,7 +1270,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\code;..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" diff --git a/workspaces/vc8/assimp.vcproj b/workspaces/vc8/assimp.vcproj index 6882a19d9..0d03a0fb3 100644 --- a/workspaces/vc8/assimp.vcproj +++ b/workspaces/vc8/assimp.vcproj @@ -44,7 +44,7 @@ PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="AssimpPCH.h" @@ -109,7 +109,7 @@ PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" @@ -172,6 +172,7 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32" StringPooling="true" + RuntimeLibrary="2" BufferSecurityCheck="false" EnableEnhancedInstructionSet="2" UsePrecompiledHeader="2" @@ -237,7 +238,7 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32" StringPooling="true" - RuntimeLibrary="0" + RuntimeLibrary="2" BufferSecurityCheck="false" EnableEnhancedInstructionSet="0" UsePrecompiledHeader="2" @@ -301,7 +302,7 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT" StringPooling="true" - RuntimeLibrary="0" + RuntimeLibrary="2" BufferSecurityCheck="false" EnableEnhancedInstructionSet="2" UsePrecompiledHeader="2" @@ -603,6 +604,7 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND" StringPooling="true" + RuntimeLibrary="2" BufferSecurityCheck="false" EnableEnhancedInstructionSet="2" UsePrecompiledHeader="2" @@ -668,7 +670,7 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND" StringPooling="true" - RuntimeLibrary="0" + RuntimeLibrary="2" BufferSecurityCheck="false" EnableEnhancedInstructionSet="0" UsePrecompiledHeader="2" @@ -730,7 +732,7 @@ PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="AssimpPCH.h" @@ -794,7 +796,7 @@ PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" @@ -854,7 +856,7 @@ PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="AssimpPCH.h" @@ -918,7 +920,7 @@ PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" @@ -980,6 +982,7 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32" StringPooling="true" + RuntimeLibrary="2" BufferSecurityCheck="false" EnableEnhancedInstructionSet="2" UsePrecompiledHeader="2" @@ -1045,7 +1048,7 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32" StringPooling="true" - RuntimeLibrary="0" + RuntimeLibrary="2" BufferSecurityCheck="false" EnableEnhancedInstructionSet="0" UsePrecompiledHeader="2" @@ -1175,6 +1178,10 @@ RelativePath="..\..\include\aiVector3D.inl" > + + diff --git a/workspaces/vc8/assimp_view.vcproj b/workspaces/vc8/assimp_view.vcproj index 8053e39cb..f9bdb8757 100644 --- a/workspaces/vc8/assimp_view.vcproj +++ b/workspaces/vc8/assimp_view.vcproj @@ -48,7 +48,7 @@ MinimalRebuild="true" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" WarningLevel="3" @@ -130,7 +130,7 @@ MinimalRebuild="true" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" WarningLevel="3" @@ -208,7 +208,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(DXSDK_DIR)include";..\..\include;..\..\code" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -290,7 +290,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(DXSDK_DIR)include";..\..\include;..\..\code" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -698,7 +698,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(DXSDK_DIR)include";..\..\include;..\..\code" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -781,7 +781,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(DXSDK_DIR)include";..\..\include;..\..\code" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -866,7 +866,7 @@ MinimalRebuild="true" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" WarningLevel="3" @@ -949,7 +949,7 @@ MinimalRebuild="true" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" WarningLevel="3" @@ -1030,7 +1030,7 @@ MinimalRebuild="true" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" WarningLevel="3" @@ -1112,7 +1112,7 @@ MinimalRebuild="true" BasicRuntimeChecks="3" SmallerTypeCheck="true" - RuntimeLibrary="1" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" WarningLevel="3" @@ -1190,7 +1190,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(DXSDK_DIR)include";..\..\include;..\..\code" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -1272,7 +1272,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(DXSDK_DIR)include";..\..\include;..\..\code" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="3" Detect64BitPortabilityProblems="true" diff --git a/workspaces/vc9_AgainNotUpToDate/UnitTest.vcproj b/workspaces/vc9_AgainNotUpToDate/UnitTest.vcproj index 6fd8e768a..14a8bc2ae 100644 --- a/workspaces/vc9_AgainNotUpToDate/UnitTest.vcproj +++ b/workspaces/vc9_AgainNotUpToDate/UnitTest.vcproj @@ -49,7 +49,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderThrough="UnitTestPCH.h" WarningLevel="3" @@ -100,88 +100,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1478,14 +1486,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1494,14 +1494,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1510,14 +1502,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1526,14 +1510,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1542,14 +1518,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1558,14 +1526,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1575,7 +1535,7 @@ /> + + + + + + + + + + + + + + + + + + - - - @@ -1626,14 +1626,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1642,14 +1634,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1658,14 +1642,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1674,14 +1650,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1690,14 +1658,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1707,7 +1667,7 @@ /> + + + + + + + + + + + + + + + + + + - - - @@ -1767,14 +1767,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1783,14 +1775,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1799,14 +1783,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1815,14 +1791,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1831,14 +1799,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1848,7 +1808,7 @@ /> + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1393,7 +1402,7 @@ > - - - @@ -1446,14 +1447,6 @@ UsePrecompiledHeader="0" /> - - - @@ -1478,6 +1471,22 @@ UsePrecompiledHeader="0" /> + + + + + + @@ -1922,6 +1931,14 @@ RelativePath="..\..\code\IRRLoader.h" > + + + + - - - @@ -2215,14 +2224,6 @@ PrecompiledHeaderThrough="AssimpPCH.h" /> - - - @@ -2250,122 +2251,12 @@ PrecompiledHeaderThrough="AssimpPCH.h" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1443,14 +1451,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1459,14 +1459,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1475,14 +1467,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1491,14 +1475,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1507,14 +1483,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1523,14 +1491,6 @@ UsePrecompiledHeader="1" /> - - - @@ -1540,7 +1500,7 @@ /> + + + + + + + + + + + + + + + + + + + @@ -150,8 +150,6 @@ AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\" GenerateDebugInformation="true" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> + @@ -228,8 +229,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="1" /> + @@ -307,8 +309,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> + @@ -385,8 +388,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="1" /> + @@ -464,8 +468,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> + @@ -542,8 +547,6 @@ AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\" GenerateDebugInformation="true" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="1" /> + @@ -621,8 +627,6 @@ AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\" GenerateDebugInformation="true" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> + @@ -699,8 +706,6 @@ AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\" GenerateDebugInformation="true" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="1" /> + @@ -778,8 +786,6 @@ AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\" GenerateDebugInformation="true" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> + @@ -856,8 +865,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="1" /> + @@ -935,8 +945,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> + @@ -1013,8 +1024,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="1" /> + @@ -1092,8 +1104,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> + @@ -1170,8 +1183,6 @@ AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\" GenerateDebugInformation="true" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="1" /> + @@ -1249,8 +1263,6 @@ AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\" GenerateDebugInformation="true" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> + @@ -1327,8 +1342,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="1" /> + @@ -1406,8 +1422,6 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> + @@ -1484,8 +1501,6 @@ AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\" GenerateDebugInformation="true" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="1" /> + @@ -1563,8 +1581,6 @@ AdditionalLibraryDirectories="$(SolutionDir)..\..\lib\assimp_$(ConfigurationName)_DLL_$(PlatformName)\" GenerateDebugInformation="true" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" TargetMachine="17" /> +