diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd5ae571e225c7626abb7be2773e4379638deef2..9fa5043c46b63b895da15ef9ba57449f12de6627 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,6 +100,9 @@ IF ( NO_EXPORT )
MESSAGE( STATUS "Build an import-only version of Assimp." )
ENDIF( NO_EXPORT )
+## hide all not-exported symbols
+ADD_DEFINITIONS( -fvisibility=hidden )
+
ADD_SUBDIRECTORY( code/ )
SET ( BUILD_ASSIMP_TOOLS ON CACHE BOOL
"If the supplementary tools for Assimp are built in addition to the library."
diff --git a/code/3DSConverter.cpp b/code/3DSConverter.cpp
index f3d2bf6f85248fc8a602580533e39b183f2b113e..491f92e3028aedaeb5a8ea0ec170249a2501dce3 100644
--- a/code/3DSConverter.cpp
+++ b/code/3DSConverter.cpp
@@ -182,7 +182,7 @@ void Discreet3DSImporter::MakeUnique(D3DS::Mesh& sMesh)
// ------------------------------------------------------------------------------------------------
// Convert a 3DS texture to texture keys in an aiMaterial
-void CopyTexture(MaterialHelper& mat, D3DS::Texture& texture, aiTextureType type)
+void CopyTexture(aiMaterial& mat, D3DS::Texture& texture, aiTextureType type)
{
// Setup the texture name
aiString tex;
@@ -214,7 +214,7 @@ void CopyTexture(MaterialHelper& mat, D3DS::Texture& texture, aiTextureType type
// ------------------------------------------------------------------------------------------------
// Convert a 3DS material to an aiMaterial
void Discreet3DSImporter::ConvertMaterial(D3DS::Material& oldMat,
- MaterialHelper& mat)
+ aiMaterial& mat)
{
// NOTE: Pass the background image to the viewer by bypassing the
// material system. This is an evil hack, never do it again!
@@ -813,7 +813,7 @@ void Discreet3DSImporter::ConvertScene(aiScene* pcOut)
// ... and convert the 3DS materials to aiMaterial's
for (unsigned int i = 0; i < pcOut->mNumMaterials;++i)
{
- MaterialHelper* pcNew = new MaterialHelper();
+ aiMaterial* pcNew = new aiMaterial();
ConvertMaterial(mScene->mMaterials[i],*pcNew);
pcOut->mMaterials[i] = pcNew;
}
diff --git a/code/3DSLoader.h b/code/3DSLoader.h
index 186ecbae26697f12cb5d912f0f577cb455ab9c1d..a4f8483747b14eaddd61ca388e9541eb95f941aa 100644
--- a/code/3DSLoader.h
+++ b/code/3DSLoader.h
@@ -52,7 +52,7 @@ struct aiNode;
#include "3DSHelper.h"
namespace Assimp {
-class MaterialHelper;
+
using namespace D3DS;
@@ -101,7 +101,7 @@ protected:
/** Converts a temporary material to the outer representation
*/
void ConvertMaterial(D3DS::Material& p_cMat,
- MaterialHelper& p_pcOut);
+ aiMaterial& p_pcOut);
// -------------------------------------------------------------------
/** Read a chunk
diff --git a/code/ACLoader.cpp b/code/ACLoader.cpp
index 196ec5ac09ed2f52729f09020dda031d94635442..0e8cc87cb15066a8b7dc072941c320b15f437c9b 100644
--- a/code/ACLoader.cpp
+++ b/code/ACLoader.cpp
@@ -375,7 +375,7 @@ void AC3DImporter::LoadObjectSection(std::vector<Object>& objects)
// Convert a material from AC3DImporter::Material to aiMaterial
void AC3DImporter::ConvertMaterial(const Object& object,
const Material& matSrc,
- MaterialHelper& matDest)
+ aiMaterial& matDest)
{
aiString s;
@@ -422,7 +422,7 @@ void AC3DImporter::ConvertMaterial(const Object& object,
// Converts the loaded data to the internal verbose representation
aiNode* AC3DImporter::ConvertObjectSection(Object& object,
std::vector<aiMesh*>& meshes,
- std::vector<MaterialHelper*>& outMaterials,
+ std::vector<aiMaterial*>& outMaterials,
const std::vector<Material>& materials,
aiNode* parent)
{
@@ -463,7 +463,7 @@ aiNode* AC3DImporter::ConvertObjectSection(Object& object,
// default material if all objects of the file contain points
// and no faces.
mesh->mMaterialIndex = 0;
- outMaterials.push_back(new MaterialHelper());
+ outMaterials.push_back(new aiMaterial());
ConvertMaterial(object, materials[0], *outMaterials.back());
}
else
@@ -548,7 +548,7 @@ aiNode* AC3DImporter::ConvertObjectSection(Object& object,
meshes.push_back(mesh);
mesh->mMaterialIndex = (unsigned int)outMaterials.size();
- outMaterials.push_back(new MaterialHelper());
+ outMaterials.push_back(new aiMaterial());
ConvertMaterial(object, materials[mat], *outMaterials.back());
// allocate storage for vertices and normals
@@ -811,7 +811,7 @@ void AC3DImporter::InternReadFile( const std::string& pFile,
std::vector<aiMesh*> meshes;
meshes.reserve(mNumMeshes);
- std::vector<MaterialHelper*> omaterials;
+ std::vector<aiMaterial*> omaterials;
materials.reserve(mNumMeshes);
// generate a dummy root if there are multiple objects on the top layer
diff --git a/code/ACLoader.h b/code/ACLoader.h
index d5f38f850a54c29cd4c49995a2fedcbe23d75646..e4b1be486f44e47ea18afe70b91a45789a9f5aa5 100644
--- a/code/ACLoader.h
+++ b/code/ACLoader.h
@@ -222,7 +222,7 @@ private:
* @param Scenegraph node for the object */
aiNode* ConvertObjectSection(Object& object,
std::vector<aiMesh*>& meshes,
- std::vector<MaterialHelper*>& outMaterials,
+ std::vector<aiMaterial*>& outMaterials,
const std::vector<Material>& materials,
aiNode* parent = NULL);
@@ -233,7 +233,7 @@ private:
* @param matDest Destination material to be filled */
void ConvertMaterial(const Object& object,
const Material& matSrc,
- MaterialHelper& matDest);
+ aiMaterial& matDest);
private:
diff --git a/code/ASELoader.cpp b/code/ASELoader.cpp
index fa4b238ed4ec87f24dd44cfd90c238900c2844b8..cc15e664d22e742ca627110db861925f6d53e650 100644
--- a/code/ASELoader.cpp
+++ b/code/ASELoader.cpp
@@ -48,7 +48,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// internal headers
#include "ASELoader.h"
-#include "MaterialSystem.h"
#include "StringComparison.h"
#include "SkeletonMeshBuilder.h"
#include "TargetAnimation.h"
@@ -788,7 +787,7 @@ void ASEImporter::BuildUniqueRepresentation(ASE::Mesh& mesh) {
// ------------------------------------------------------------------------------------------------
// Copy a texture from the ASE structs to the output material
-void CopyASETexture(MaterialHelper& mat, ASE::Texture& texture, aiTextureType type)
+void CopyASETexture(aiMaterial& mat, ASE::Texture& texture, aiTextureType type)
{
// Setup the texture name
aiString tex;
@@ -810,7 +809,7 @@ void ASEImporter::ConvertMaterial(ASE::Material& mat)
// LARGE TODO: Much code her is copied from 3DS ... join them maybe?
// Allocate the output material
- mat.pcInstance = new MaterialHelper();
+ mat.pcInstance = new aiMaterial();
// At first add the base ambient color of the
// scene to the material
diff --git a/code/ASELoader.h b/code/ASELoader.h
index 17b0721f6587947584125e82d0571dfeb20ed1c7..c865e7ddb82326266fbcdf77eca6d5fa87861e02 100644
--- a/code/ASELoader.h
+++ b/code/ASELoader.h
@@ -51,7 +51,7 @@ struct aiNode;
#include "ASEParser.h"
namespace Assimp {
-class MaterialHelper;
+
// --------------------------------------------------------------------------------
/** Importer class for the 3DS ASE ASCII format.
@@ -125,7 +125,7 @@ private:
// -------------------------------------------------------------------
- /** Convert a material to a MaterialHelper object
+ /** Convert a material to a aiMaterial object
* \param mat Input material
*/
void ConvertMaterial(ASE::Material& mat);
diff --git a/code/ASEParser.h b/code/ASEParser.h
index 16f66348bbefa17697096b2a4200899872657a54..ca50a2a424bbd4bbe7b6275d193b1635db719eb4 100644
--- a/code/ASEParser.h
+++ b/code/ASEParser.h
@@ -76,8 +76,8 @@ struct Material : public D3DS::Material
//! Contains all sub materials of this material
std::vector<Material> avSubMaterials;
- //! MaterialHelper object
- MaterialHelper* pcInstance;
+ //! aiMaterial object
+ aiMaterial* pcInstance;
//! Can we remove this material?
bool bNeed;
diff --git a/code/AssimpPCH.h b/code/AssimpPCH.h
index 9dca078fed4829e50dcdd1e7453c73cd5523f66b..ad80509091c7b0ee02c3c1173c55dc27e8263503 100644
--- a/code/AssimpPCH.h
+++ b/code/AssimpPCH.h
@@ -141,7 +141,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Internal utility headers
#include "BaseImporter.h"
-#include "MaterialSystem.h"
#include "StringComparison.h"
#include "StreamReader.h"
#include "qnan.h"
diff --git a/code/B3DImporter.cpp b/code/B3DImporter.cpp
index d09149401cb9fd599b7702eaa022a8b51020dd44..f08f4a7fd15daf480c7fd837415a7adf85269827 100644
--- a/code/B3DImporter.cpp
+++ b/code/B3DImporter.cpp
@@ -254,7 +254,7 @@ void B3DImporter::ReadBRUS(){
/*int blend=**/ReadInt();
int fx=ReadInt();
- MaterialHelper *mat=new MaterialHelper;
+ aiMaterial *mat=new aiMaterial;
_materials.push_back( mat );
// Name
@@ -641,7 +641,7 @@ void B3DImporter::ReadBB3D( aiScene *scene ){
//material
if( !_materials.size() ){
- _materials.push_back( new MaterialHelper );
+ _materials.push_back( new aiMaterial );
}
scene->mNumMaterials=_materials.size();
scene->mMaterials=to_array( _materials );
diff --git a/code/BaseImporter.h b/code/BaseImporter.h
index d4b3f443210e7c88e7d51281e526bc2718ad744b..0422c65361f3951538ea56dd294882bed230fa1f 100644
--- a/code/BaseImporter.h
+++ b/code/BaseImporter.h
@@ -106,7 +106,7 @@ private:
* imports the given file. ReadFile is not overridable, it just calls
* InternReadFile() and catches any ImportErrorException that might occur.
*/
-class ASSIMP_API BaseImporter
+class BaseImporter
{
friend class Importer;
diff --git a/code/BaseProcess.h b/code/BaseProcess.h
index 0a21e2689987d949f5f7a21e719067812c780755..7d3ecb77d258a02f776ed5a007dd8a32935b7d95 100644
--- a/code/BaseProcess.h
+++ b/code/BaseProcess.h
@@ -60,7 +60,7 @@ class Importer;
* to provide additional information to other steps. This is primarily
* intended for cross-step optimizations.
*/
-class ASSIMP_API SharedPostProcessInfo
+class SharedPostProcessInfo
{
public:
@@ -211,7 +211,7 @@ private:
* should be executed. If the function returns true, the class' Execute()
* function is called subsequently.
*/
-class ASSIMP_API BaseProcess
+class ASSIMP_API_WINONLY BaseProcess
{
friend class Importer;
diff --git a/code/BlenderLoader.cpp b/code/BlenderLoader.cpp
index 9c233a64ef459bdf2e4f6f6db83b0a9b7a03bec5..f453931e3a7cbed5542a697bc44cd92330193019 100644
--- a/code/BlenderLoader.cpp
+++ b/code/BlenderLoader.cpp
@@ -398,7 +398,7 @@ void BlenderImporter::ConvertBlendFile(aiScene* out, const Scene& in,const FileD
}
// ------------------------------------------------------------------------------------------------
-void BlenderImporter::ResolveImage(MaterialHelper* out, const Material* mat, const MTex* tex, const Image* img, ConversionData& conv_data)
+void BlenderImporter::ResolveImage(aiMaterial* out, const Material* mat, const MTex* tex, const Image* img, ConversionData& conv_data)
{
(void)mat; (void)tex; (void)conv_data;
aiString name;
@@ -443,7 +443,7 @@ void BlenderImporter::ResolveImage(MaterialHelper* out, const Material* mat, con
}
// ------------------------------------------------------------------------------------------------
-void BlenderImporter::AddSentinelTexture(MaterialHelper* out, const Material* mat, const MTex* tex, ConversionData& conv_data)
+void BlenderImporter::AddSentinelTexture(aiMaterial* out, const Material* mat, const MTex* tex, ConversionData& conv_data)
{
(void)mat; (void)tex; (void)conv_data;
@@ -457,7 +457,7 @@ void BlenderImporter::AddSentinelTexture(MaterialHelper* out, const Material* ma
}
// ------------------------------------------------------------------------------------------------
-void BlenderImporter::ResolveTexture(MaterialHelper* out, const Material* mat, const MTex* tex, ConversionData& conv_data)
+void BlenderImporter::ResolveTexture(aiMaterial* out, const Material* mat, const MTex* tex, ConversionData& conv_data)
{
const Tex* rtex = tex->tex.get();
if(!rtex || !rtex->type) {
@@ -545,7 +545,7 @@ void BlenderImporter::BuildMaterials(ConversionData& conv_data)
conv_data.next_texture[i] = 0 ;
}
- MaterialHelper* mout = new MaterialHelper();
+ aiMaterial* mout = new aiMaterial();
conv_data.materials->push_back(mout);
// set material name
diff --git a/code/BlenderLoader.h b/code/BlenderLoader.h
index 74b5610ddb8953fd4a2a87e7da4af04a801e8fe9..5289a3a57a57461bbf8398f1077d5059ee75ed41 100644
--- a/code/BlenderLoader.h
+++ b/code/BlenderLoader.h
@@ -203,7 +203,7 @@ private:
// --------------------
void ResolveTexture(
- MaterialHelper* out,
+ aiMaterial* out,
const Blender::Material* mat,
const Blender::MTex* tex,
Blender::ConversionData& conv_data
@@ -211,7 +211,7 @@ private:
// --------------------
void ResolveImage(
- MaterialHelper* out,
+ aiMaterial* out,
const Blender::Material* mat,
const Blender::MTex* tex,
const Blender::Image* img,
@@ -219,7 +219,7 @@ private:
);
void AddSentinelTexture(
- MaterialHelper* out,
+ aiMaterial* out,
const Blender::Material* mat,
const Blender::MTex* tex,
Blender::ConversionData& conv_data
diff --git a/code/COBLoader.cpp b/code/COBLoader.cpp
index 43df8eb67d78b02960b53e6aedec96f0ab296536..caa2981273f5a9400e6dfa406b310168e9447c36 100644
--- a/code/COBLoader.cpp
+++ b/code/COBLoader.cpp
@@ -207,7 +207,7 @@ void COBImporter::InternReadFile( const std::string& pFile,
}
// ------------------------------------------------------------------------------------------------
-void ConvertTexture(boost::shared_ptr< Texture > tex, MaterialHelper* out, aiTextureType type)
+void ConvertTexture(boost::shared_ptr< Texture > tex, aiMaterial* out, aiTextureType type)
{
const aiString path( tex->path );
out->AddProperty(&path,AI_MATKEY_TEXTURE(type,0));
@@ -286,7 +286,7 @@ aiNode* COBImporter::BuildNodes(const Node& root,const Scene& scin,aiScene* fill
defmat.reset(min=new Material());
}
- MaterialHelper* mat = new MaterialHelper();
+ aiMaterial* mat = new aiMaterial();
fill->mMaterials[fill->mNumMaterials++] = mat;
const aiString s(format("#mat_")<<fill->mNumMeshes<<"_"<<min->matnum);
diff --git a/code/CalcTangentsProcess.h b/code/CalcTangentsProcess.h
index 06fef282aca55c54464123c765f905b71a4d8695..5ced8a23390bdf14fca18603fd83c1c4096b5413 100644
--- a/code/CalcTangentsProcess.h
+++ b/code/CalcTangentsProcess.h
@@ -57,7 +57,7 @@ namespace Assimp
* because the joining of vertices also considers tangents and bitangents for
* uniqueness.
*/
-class ASSIMP_API CalcTangentsProcess : public BaseProcess
+class ASSIMP_API_WINONLY CalcTangentsProcess : public BaseProcess
{
public:
diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h
index 8c0f2c7fc70f0a54a7cf3302f2f1d472f57cc578..689dca40cfa26a670e8092c008e64b786fab2ead 100644
--- a/code/ColladaExporter.h
+++ b/code/ColladaExporter.h
@@ -55,7 +55,7 @@ namespace Assimp
/// Helper class to export a given scene to a Collada file. Just for my personal
/// comfort when implementing it.
-class ASSIMP_API ColladaExporter
+class ColladaExporter
{
public:
/// Constructor for a specific scene to export
diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp
index 04da81923b22aa69828eec9365acd4b48195d6e6..a0c9f52bdfdd75c4183e2a3e018c0b3964df74af 100644
--- a/code/ColladaLoader.cpp
+++ b/code/ColladaLoader.cpp
@@ -1117,7 +1117,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
// ------------------------------------------------------------------------------------------------
// Add a texture to a material structure
-void ColladaLoader::AddTexture ( Assimp::MaterialHelper& mat, const ColladaParser& pParser,
+void ColladaLoader::AddTexture ( aiMaterial& mat, const ColladaParser& pParser,
const Collada::Effect& effect,
const Collada::Sampler& sampler,
aiTextureType type, unsigned int idx)
@@ -1185,7 +1185,7 @@ void ColladaLoader::FillMaterials( const ColladaParser& pParser, aiScene* /*pSce
for (std::vector<std::pair<Collada::Effect*, aiMaterial*> >::iterator it = newMats.begin(),
end = newMats.end(); it != end; ++it)
{
- MaterialHelper& mat = (MaterialHelper&)*it->second;
+ aiMaterial& mat = (aiMaterial&)*it->second;
Collada::Effect& effect = *it->first;
// resolve shading mode
@@ -1286,7 +1286,7 @@ void ColladaLoader::BuildMaterials( const ColladaParser& pParser, aiScene* /*pSc
const Collada::Effect& effect = effIt->second;
// create material
- Assimp::MaterialHelper* mat = new Assimp::MaterialHelper;
+ aiMaterial* mat = new aiMaterial;
aiString name( matIt->first);
mat->AddProperty(&name,AI_MATKEY_NAME);
@@ -1300,7 +1300,7 @@ void ColladaLoader::BuildMaterials( const ColladaParser& pParser, aiScene* /*pSc
#if 0
if( newMats.size() == 0)
{
- Assimp::MaterialHelper* mat = new Assimp::MaterialHelper;
+ aiMaterial* mat = new aiMaterial;
aiString name( AI_DEFAULT_MATERIAL_NAME );
mat->AddProperty( &name, AI_MATKEY_NAME);
diff --git a/code/ColladaLoader.h b/code/ColladaLoader.h
index 0bdd4a759459db590418f18cccdf6cc2ac98a0ab..6d1132ae4597612a3ede435b6790a844f43906f6 100644
--- a/code/ColladaLoader.h
+++ b/code/ColladaLoader.h
@@ -163,7 +163,7 @@ protected:
const Collada::SemanticMappingTable& table);
/** Add a texture and all of its sampling properties to a material*/
- void AddTexture ( Assimp::MaterialHelper& mat, const ColladaParser& pParser,
+ void AddTexture ( aiMaterial& mat, const ColladaParser& pParser,
const Collada::Effect& effect,
const Collada::Sampler& sampler,
aiTextureType type, unsigned int idx = 0);
diff --git a/code/ComputeUVMappingProcess.cpp b/code/ComputeUVMappingProcess.cpp
index f632ed8a979a1dd8a4d68340b0a57a6dc39759f8..dbb57aa73f642c5d9829126a4070d88104b1f0b1 100644
--- a/code/ComputeUVMappingProcess.cpp
+++ b/code/ComputeUVMappingProcess.cpp
@@ -495,7 +495,7 @@ void ComputeUVMappingProcess::Execute( aiScene* pScene)
// Update the material property list
mapping = aiTextureMapping_UV;
- ((MaterialHelper*)mat)->AddProperty(&idx,1,AI_MATKEY_UVWSRC(prop->mSemantic,prop->mIndex));
+ ((aiMaterial*)mat)->AddProperty(&idx,1,AI_MATKEY_UVWSRC(prop->mSemantic,prop->mIndex));
}
}
}
diff --git a/code/ComputeUVMappingProcess.h b/code/ComputeUVMappingProcess.h
index 1026e30d4e14faec13a0d95c74c8f98d00288e35..b32612153ae3ef4cf7b7dfc249839953fff1cfb5 100644
--- a/code/ComputeUVMappingProcess.h
+++ b/code/ComputeUVMappingProcess.h
@@ -54,7 +54,7 @@ namespace Assimp
/** ComputeUVMappingProcess - converts special mappings, such as spherical,
* cylindrical or boxed to proper UV coordinates for rendering.
*/
-class ASSIMP_API ComputeUVMappingProcess : public BaseProcess
+class ComputeUVMappingProcess : public BaseProcess
{
public:
ComputeUVMappingProcess();
diff --git a/code/ConvertToLHProcess.cpp b/code/ConvertToLHProcess.cpp
index a0b5e86c21c5f181875dae4e4c91e661175553c4..5a9a8d07b57b2321f06822129e759dbf6b80f608 100644
--- a/code/ConvertToLHProcess.cpp
+++ b/code/ConvertToLHProcess.cpp
@@ -166,7 +166,7 @@ void MakeLeftHandedProcess::ProcessMesh( aiMesh* pMesh)
// Converts a single material to left handed coordinates.
void MakeLeftHandedProcess::ProcessMaterial( aiMaterial* _mat)
{
- MaterialHelper* mat = (MaterialHelper*)_mat;
+ aiMaterial* mat = (aiMaterial*)_mat;
for (unsigned int a = 0; a < mat->mNumProperties;++a) {
aiMaterialProperty* prop = mat->mProperties[a];
@@ -241,7 +241,7 @@ void FlipUVsProcess::Execute( aiScene* pScene)
// Converts a single material
void FlipUVsProcess::ProcessMaterial (aiMaterial* _mat)
{
- MaterialHelper* mat = (MaterialHelper*)_mat;
+ aiMaterial* mat = (aiMaterial*)_mat;
for (unsigned int a = 0; a < mat->mNumProperties;++a) {
aiMaterialProperty* prop = mat->mProperties[a];
diff --git a/code/ConvertToLHProcess.h b/code/ConvertToLHProcess.h
index 0753aa7e5e45beeb91c9b15c7508ef2dcd52ab76..1c048ada7a867cbbf4e5891d14acd834791836e5 100644
--- a/code/ConvertToLHProcess.h
+++ b/code/ConvertToLHProcess.h
@@ -67,7 +67,7 @@ namespace Assimp {
*
* @note RH-LH and LH-RH is the same, so this class can be used for both
*/
-class ASSIMP_API MakeLeftHandedProcess : public BaseProcess
+class MakeLeftHandedProcess : public BaseProcess
{
@@ -115,7 +115,7 @@ protected:
// ---------------------------------------------------------------------------
/** Postprocessing step to flip the face order of the imported data
*/
-class ASSIMP_API FlipWindingOrderProcess : public BaseProcess
+class FlipWindingOrderProcess : public BaseProcess
{
friend class Importer;
@@ -139,7 +139,7 @@ protected:
// ---------------------------------------------------------------------------
/** Postprocessing step to flip the UV coordinate system of the import data
*/
-class ASSIMP_API FlipUVsProcess : public BaseProcess
+class FlipUVsProcess : public BaseProcess
{
friend class Importer;
diff --git a/code/DXFLoader.cpp b/code/DXFLoader.cpp
index f63fd2427986c33500352133d3b89212fcacc85d..eee0cdec84594ab9cbc1dfc989a31d5b6e02e682 100644
--- a/code/DXFLoader.cpp
+++ b/code/DXFLoader.cpp
@@ -387,7 +387,7 @@ void DXFImporter::GenerateMaterials(aiScene* pScene, DXF::FileData& /*output*/)
// the default vertex color is GREY, so we are
// already at Assimp's usual default color.
// generate a default material
- MaterialHelper* pcMat = new MaterialHelper();
+ aiMaterial* pcMat = new aiMaterial();
aiString s;
s.Set(AI_DEFAULT_MATERIAL_NAME);
pcMat->AddProperty(&s, AI_MATKEY_NAME);
diff --git a/code/DeboneProcess.h b/code/DeboneProcess.h
index 1d0c34154b72bcf2dd9b68c4b5c701b0d51a5c5c..faf95a3b85bfd707a9b3312eae4f7df6c611ce63 100644
--- a/code/DeboneProcess.h
+++ b/code/DeboneProcess.h
@@ -64,7 +64,7 @@ namespace Assimp
* the bone are split from the mesh. The split off (new) mesh is boneless. At any
* point in time, bones without affect upon a given mesh are to be removed.
*/
-class ASSIMP_API DeboneProcess : public BaseProcess
+class DeboneProcess : public BaseProcess
{
public:
diff --git a/code/DefaultProgressHandler.h b/code/DefaultProgressHandler.h
index e3b60930ea1b7f78a27b9a8485815eebb6dd6827..cf40fb01028253ba4dd60344c818f08bb23ff4b5 100644
--- a/code/DefaultProgressHandler.h
+++ b/code/DefaultProgressHandler.h
@@ -49,7 +49,7 @@ namespace Assimp {
// ------------------------------------------------------------------------------------
/** @brief Internal default implementation of the #ProgressHandler interface. */
-class ASSIMP_API DefaultProgressHandler
+class DefaultProgressHandler
: public ProgressHandler {
diff --git a/code/Exceptional.h b/code/Exceptional.h
index 46c355a3459b7401fa471125fe6792a971f84517..8fab83bb6ca0c5c48c9d8ebabd64e2945a87a226 100644
--- a/code/Exceptional.h
+++ b/code/Exceptional.h
@@ -52,7 +52,7 @@ using std::runtime_error;
/** FOR IMPORTER PLUGINS ONLY: Simple exception class to be thrown if an
* unrecoverable error occurs while importing. Loading APIs return
* NULL instead of a valid aiScene then. */
-class ASSIMP_API DeadlyImportError
+class DeadlyImportError
: public runtime_error
{
public:
diff --git a/code/FindDegenerates.h b/code/FindDegenerates.h
index 9d57dd89dedc56f2c8d7d22a37dd4dc20f14b965..a0421c08377ac5a6f06bb1a6ffc0ceff18cad408 100644
--- a/code/FindDegenerates.h
+++ b/code/FindDegenerates.h
@@ -53,7 +53,7 @@ namespace Assimp {
// ---------------------------------------------------------------------------
/** FindDegeneratesProcess: Searches a mesh for degenerated triangles.
*/
-class ASSIMP_API FindDegeneratesProcess : public BaseProcess
+class FindDegeneratesProcess : public BaseProcess
{
public:
diff --git a/code/FindInstancesProcess.h b/code/FindInstancesProcess.h
index eaad91ce735482177a44c665666f0b19769180d5..7d5990c9de3dfda8ab84f86698dd65fb3bd74788 100644
--- a/code/FindInstancesProcess.h
+++ b/code/FindInstancesProcess.h
@@ -105,7 +105,7 @@ inline bool CompareArrays(const aiColor4D* first, const aiColor4D* second,
// ---------------------------------------------------------------------------
/** @brief A post-processing steps to search for instanced meshes
*/
-class ASSIMP_API FindInstancesProcess : public BaseProcess
+class FindInstancesProcess : public BaseProcess
{
public:
diff --git a/code/FindInvalidDataProcess.h b/code/FindInvalidDataProcess.h
index afa6f30f7c05c3d3d53c642c4826d12562922869..56e9af0f122da32536f211811995288a97c82d32 100644
--- a/code/FindInvalidDataProcess.h
+++ b/code/FindInvalidDataProcess.h
@@ -56,7 +56,7 @@ namespace Assimp {
*
* Originally this was a workaround for some models written by Blender
* which have zero normal vectors. */
-class ASSIMP_API FindInvalidDataProcess
+class FindInvalidDataProcess
: public BaseProcess
{
public:
diff --git a/code/FixNormalsStep.h b/code/FixNormalsStep.h
index 1018a6304fa8abe39762d98dc5128ab524e1d652..c9641dd45d6b58794ae12b5a8297b8e118c9292d 100644
--- a/code/FixNormalsStep.h
+++ b/code/FixNormalsStep.h
@@ -55,7 +55,7 @@ namespace Assimp
* vectors of an object are facing inwards. In this case they will be
* flipped.
*/
-class ASSIMP_API FixInfacingNormalsProcess : public BaseProcess
+class FixInfacingNormalsProcess : public BaseProcess
{
public:
diff --git a/code/GenFaceNormalsProcess.h b/code/GenFaceNormalsProcess.h
index 596a34b7a2d0bba83ebc0b468b609eb91c25565c..a72610f4d88c716e8086a8d6dd00b487fc6b89bf 100644
--- a/code/GenFaceNormalsProcess.h
+++ b/code/GenFaceNormalsProcess.h
@@ -51,7 +51,7 @@ namespace Assimp
// ---------------------------------------------------------------------------
/** The GenFaceNormalsProcess computes face normals for all faces of all meshes
*/
-class ASSIMP_API GenFaceNormalsProcess : public BaseProcess
+class ASSIMP_API_WINONLY GenFaceNormalsProcess : public BaseProcess
{
public:
diff --git a/code/GenVertexNormalsProcess.h b/code/GenVertexNormalsProcess.h
index 19ecd75ba4d3c3657cefcf0e7dbda0066fa4cca0..528f4154e66d394f77ff04945c521e1497a04f33 100644
--- a/code/GenVertexNormalsProcess.h
+++ b/code/GenVertexNormalsProcess.h
@@ -53,7 +53,7 @@ namespace Assimp {
// ---------------------------------------------------------------------------
/** The GenFaceNormalsProcess computes vertex normals for all vertizes
*/
-class ASSIMP_API GenVertexNormalsProcess : public BaseProcess
+class ASSIMP_API_WINONLY GenVertexNormalsProcess : public BaseProcess
{
public:
diff --git a/code/HMPLoader.cpp b/code/HMPLoader.cpp
index f811ded556f1d6fda36e0ca77400fabc1e547b63..c1b0868d6ebd5f1c48b573e72171954b3604f28a 100644
--- a/code/HMPLoader.cpp
+++ b/code/HMPLoader.cpp
@@ -45,7 +45,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_HMP_IMPORTER
// internal headers
-#include "MaterialSystem.h"
#include "HMPLoader.h"
#include "MD2FileData.h"
@@ -339,7 +338,7 @@ void HMPImporter::CreateMaterial(const unsigned char* szCurrent,
{
// generate a default material
const int iMode = (int)aiShadingMode_Gouraud;
- MaterialHelper* pcHelper = new MaterialHelper();
+ aiMaterial* pcHelper = new aiMaterial();
pcHelper->AddProperty<int>(&iMode, 1, AI_MATKEY_SHADING_MODEL);
aiColor3D clr;
@@ -447,7 +446,7 @@ void HMPImporter::ReadFirstSkin(unsigned int iNumSkins, const unsigned char* szC
uint32_t iHeight = *((uint32_t*)szCursor); szCursor += sizeof(uint32_t);
// allocate an output material
- MaterialHelper* pcMat = new MaterialHelper();
+ aiMaterial* pcMat = new aiMaterial();
// read the skin, this works exactly as for MDL7
ParseSkinLump_3DGS_MDL7(szCursor,&szCursor,
diff --git a/code/IFCMaterial.cpp b/code/IFCMaterial.cpp
index c1ce879e33b20d17b08c43d439863998fb3fd24e..a507b1bc319d91de214831e2ae04667ff27cbbd1 100644
--- a/code/IFCMaterial.cpp
+++ b/code/IFCMaterial.cpp
@@ -67,7 +67,7 @@ int ConvertShadingMode(const std::string& name)
}
// ------------------------------------------------------------------------------------------------
-void FillMaterial(MaterialHelper* mat,const IFC::IfcSurfaceStyle* surf,ConversionData& conv)
+void FillMaterial(aiMaterial* mat,const IFC::IfcSurfaceStyle* surf,ConversionData& conv)
{
aiString name;
name.Set((surf->Name? surf->Name.Get() : "IfcSurfaceStyle_Unnamed"));
@@ -136,7 +136,7 @@ unsigned int ProcessMaterials(const IFC::IfcRepresentationItem& item, Conversion
{
if (conv.materials.empty()) {
aiString name;
- std::auto_ptr<MaterialHelper> mat(new MaterialHelper());
+ std::auto_ptr<aiMaterial> mat(new aiMaterial());
name.Set("<IFCDefault>");
mat->AddProperty(&name,AI_MATKEY_NAME);
@@ -159,7 +159,7 @@ unsigned int ProcessMaterials(const IFC::IfcRepresentationItem& item, Conversion
IFCImporter::LogWarn("ignoring surface side marker on IFC::IfcSurfaceStyle: " + side);
}
- std::auto_ptr<MaterialHelper> mat(new MaterialHelper());
+ std::auto_ptr<aiMaterial> mat(new aiMaterial());
FillMaterial(mat.get(),surf,conv);
diff --git a/code/IRRLoader.cpp b/code/IRRLoader.cpp
index 8ee81c24d882f2e4217f81c7381ce59f0a6a8027..61d40fe126b19f36a54334bce88a66e72d23f378 100644
--- a/code/IRRLoader.cpp
+++ b/code/IRRLoader.cpp
@@ -170,7 +170,7 @@ void IRRImporter::BuildSkybox(std::vector<aiMesh*>& meshes, std::vector<aiMateri
{
// Update the material of the skybox - replace the name and disable shading for skyboxes.
for (unsigned int i = 0; i < 6;++i) {
- MaterialHelper* out = ( MaterialHelper* ) (*(materials.end()-(6-i)));
+ aiMaterial* out = ( aiMaterial* ) (*(materials.end()-(6-i)));
aiString s;
s.length = ::sprintf( s.data, "SkyboxSide_%i",i );
@@ -246,7 +246,7 @@ void IRRImporter::CopyMaterial(std::vector<aiMaterial*>& materials,
if (UINT_MAX == defMatIdx)
{
defMatIdx = (unsigned int)materials.size();
- MaterialHelper* mat = new MaterialHelper();
+ aiMaterial* mat = new aiMaterial();
aiString s;
s.Set(AI_DEFAULT_MATERIAL_NAME);
@@ -564,7 +564,7 @@ void IRRImporter::ComputeAnimations(Node* root, aiNode* real, std::vector<aiNode
// ------------------------------------------------------------------------------------------------
// This function is maybe more generic than we'd need it here
-void SetupMapping (MaterialHelper* mat, aiTextureMapping mode, const aiVector3D& axis = aiVector3D(0.f,0.f,-1.f))
+void SetupMapping (aiMaterial* mat, aiTextureMapping mode, const aiVector3D& axis = aiVector3D(0.f,0.f,-1.f))
{
// Check whether there are texture properties defined - setup
// the desired texture mapping mode for all of them and ignore
@@ -687,7 +687,7 @@ void IRRImporter::GenerateGraph(Node* root,aiNode* rootOut ,aiScene* scene,
// often the case so we can simply extract it to a shared oacity
// value.
std::pair<aiMaterial*, unsigned int>& src = root->materials[mesh->mMaterialIndex];
- MaterialHelper* mat = (MaterialHelper*)src.first;
+ aiMaterial* mat = (aiMaterial*)src.first;
if (mesh->HasVertexColors(0) && src.second & AI_IRRMESH_MAT_trans_vertex_alpha)
{
@@ -757,7 +757,7 @@ void IRRImporter::GenerateGraph(Node* root,aiNode* rootOut ,aiScene* scene,
// Now adjust this output material - if there is a first texture
// set, setup spherical UV mapping around the Y axis.
- SetupMapping ( (MaterialHelper*) materials.back(), aiTextureMapping_SPHERE);
+ SetupMapping ( (aiMaterial*) materials.back(), aiTextureMapping_SPHERE);
}
break;
@@ -775,7 +775,7 @@ void IRRImporter::GenerateGraph(Node* root,aiNode* rootOut ,aiScene* scene,
// Now adjust this output material - if there is a first texture
// set, setup cubic UV mapping
- SetupMapping ( (MaterialHelper*) materials.back(), aiTextureMapping_BOX );
+ SetupMapping ( (aiMaterial*) materials.back(), aiTextureMapping_BOX );
}
break;
diff --git a/code/IRRMeshLoader.cpp b/code/IRRMeshLoader.cpp
index 6966e02592a577ac448e3e9a854e228119c4e216..12ad80779484a2785d8b0652a7a1d2e50fc05354 100644
--- a/code/IRRMeshLoader.cpp
+++ b/code/IRRMeshLoader.cpp
@@ -199,7 +199,7 @@ void IRRMeshImporter::InternReadFile( const std::string& pFile,
// map (normal_..., parallax_...)
// *********************************************************
int idx = 1;
- MaterialHelper* mat = ( MaterialHelper* ) curMat;
+ aiMaterial* mat = ( aiMaterial* ) curMat;
if (curMatFlags & AI_IRRMESH_MAT_lightmap){
mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_LIGHTMAP(0));
@@ -440,7 +440,7 @@ void IRRMeshImporter::InternReadFile( const std::string& pFile,
if (curMatFlags & AI_IRRMESH_MAT_trans_vertex_alpha && !useColors) {
// Take the opacity value of the current material
// from the common vertex color alpha
- MaterialHelper* mat = (MaterialHelper*)curMat;
+ aiMaterial* mat = (aiMaterial*)curMat;
mat->AddProperty(&curColors[0].a,1,AI_MATKEY_OPACITY);
}
}}
diff --git a/code/IRRShared.cpp b/code/IRRShared.cpp
index cf1b82848e96da9ca97b5f8e488092873d4ccceb..1b87ebac1e7ae6505f947f43ccd3666dd3acb717 100644
--- a/code/IRRShared.cpp
+++ b/code/IRRShared.cpp
@@ -204,7 +204,7 @@ int ConvertMappingMode(const std::string& mode)
// Parse a material from the XML file
aiMaterial* IrrlichtBase::ParseMaterial(unsigned int& matFlags)
{
- MaterialHelper* mat = new MaterialHelper();
+ aiMaterial* mat = new aiMaterial();
aiColor4D clr;
aiString s;
diff --git a/code/Importer.h b/code/Importer.h
index 1a885dd785f5052c98bb016e40c66ef073bf5d1b..3c1ca3b86cb30b17aa951a89a500eda817346b1e 100644
--- a/code/Importer.h
+++ b/code/Importer.h
@@ -56,7 +56,7 @@ namespace Assimp {
* std::vector and std::map in the public headers. Furthermore we are dropping
* any STL interface problems caused by mismatching STL settings. All
* size calculation are now done by us, not the app heap. */
-class ASSIMP_API ImporterPimpl
+class ImporterPimpl
{
public:
@@ -120,7 +120,7 @@ struct BatchData;
* could, this has not yet been implemented at the moment).
*
* @note The class may not be used by more than one thread*/
-class ASSIMP_API BatchLoader
+class BatchLoader
{
// friend of Importer
diff --git a/code/ImproveCacheLocality.h b/code/ImproveCacheLocality.h
index 4e73dd1fa92617540c52a7f97aff352a6e267b2b..47cd34e9a91f411ebd9fff1778e427fd9a774450 100644
--- a/code/ImproveCacheLocality.h
+++ b/code/ImproveCacheLocality.h
@@ -58,7 +58,7 @@ namespace Assimp
*
* @note This step expects triagulated input data.
*/
-class ASSIMP_API ImproveCacheLocalityProcess : public BaseProcess
+class ImproveCacheLocalityProcess : public BaseProcess
{
public:
diff --git a/code/JoinVerticesProcess.h b/code/JoinVerticesProcess.h
index 3f264e563911bd1cd1c1eae92474d4b56d4c0cb2..525dee8f9fc65285611645d70a2b1e64aaedc536 100644
--- a/code/JoinVerticesProcess.h
+++ b/code/JoinVerticesProcess.h
@@ -46,8 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseProcess.h"
#include "../include/aiTypes.h"
-struct aiMesh;
-
namespace Assimp
{
@@ -61,7 +59,7 @@ class JoinVerticesTest;
* erases all but one of the copies. This usually reduces the number of vertices
* in a mesh by a serious amount and is the standard form to render a mesh.
*/
-class ASSIMP_API JoinVerticesProcess : public BaseProcess
+class ASSIMP_API_WINONLY JoinVerticesProcess : public BaseProcess
{
public:
diff --git a/code/LWOLoader.cpp b/code/LWOLoader.cpp
index a1f998dc4970aa876f268dfd07404fd565725d62..3ba9de9ed6c93b714cee8191c2a4cee792b773e2 100644
--- a/code/LWOLoader.cpp
+++ b/code/LWOLoader.cpp
@@ -48,7 +48,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// internal headers
#include "LWOLoader.h"
-#include "MaterialSystem.h"
#include "StringComparison.h"
#include "SGSpatialSort.h"
#include "ByteSwap.h"
@@ -404,7 +403,7 @@ void LWOImporter::InternReadFile( const std::string& pFile,
// The RemoveRedundantMaterials step will clean this up later
pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials = (unsigned int)mSurfaces->size()];
for (unsigned int mat = 0; mat < pScene->mNumMaterials;++mat) {
- MaterialHelper* pcMat = new MaterialHelper();
+ aiMaterial* pcMat = new aiMaterial();
pScene->mMaterials[mat] = pcMat;
ConvertMaterial((*mSurfaces)[mat],pcMat);
}
diff --git a/code/LWOLoader.h b/code/LWOLoader.h
index f48f205215a24ab6df84742b374d4f41baaa411d..156b3680c29876c0bae484658fbafa22519a8616 100644
--- a/code/LWOLoader.h
+++ b/code/LWOLoader.h
@@ -47,7 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "LWOFileData.h"
#include "BaseImporter.h"
-#include "MaterialSystem.h"
struct aiTexture;
struct aiNode;
@@ -262,7 +261,7 @@ private:
* @param in Input texture list
* @param type Type identifier of the texture list
*/
- bool HandleTextures(MaterialHelper* pcMat, const TextureList& in,
+ bool HandleTextures(aiMaterial* pcMat, const TextureList& in,
aiTextureType type);
// -------------------------------------------------------------------
@@ -273,7 +272,7 @@ private:
// -------------------------------------------------------------------
/** Convert a LWO surface description to an ASSIMP material
*/
- void ConvertMaterial(const LWO::Surface& surf,MaterialHelper* pcMat);
+ void ConvertMaterial(const LWO::Surface& surf,aiMaterial* pcMat);
// -------------------------------------------------------------------
diff --git a/code/LWOMaterial.cpp b/code/LWOMaterial.cpp
index 441f1530b8d7a750d559e4ef2d668c8b5cf74506..e0cfdcbd211051b5655ca3db50d0ca1daa290a83 100644
--- a/code/LWOMaterial.cpp
+++ b/code/LWOMaterial.cpp
@@ -47,7 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// internal headers
#include "LWOLoader.h"
-#include "MaterialSystem.h"
#include "ByteSwap.h"
using namespace Assimp;
@@ -82,7 +81,7 @@ inline aiTextureMapMode GetMapMode(LWO::Texture::Wrap in)
}
// ------------------------------------------------------------------------------------------------
-bool LWOImporter::HandleTextures(MaterialHelper* pcMat, const TextureList& in, aiTextureType type)
+bool LWOImporter::HandleTextures(aiMaterial* pcMat, const TextureList& in, aiTextureType type)
{
ai_assert(NULL != pcMat);
@@ -265,7 +264,7 @@ bool LWOImporter::HandleTextures(MaterialHelper* pcMat, const TextureList& in, a
}
// ------------------------------------------------------------------------------------------------
-void LWOImporter::ConvertMaterial(const LWO::Surface& surf,MaterialHelper* pcMat)
+void LWOImporter::ConvertMaterial(const LWO::Surface& surf,aiMaterial* pcMat)
{
// copy the name of the surface
aiString st;
diff --git a/code/LimitBoneWeightsProcess.h b/code/LimitBoneWeightsProcess.h
index c8aa9084e36f6e13601f9ecd2653a03eb4d7fdf0..40768eccd2b6cf15aa845e9becafa36066a99610 100644
--- a/code/LimitBoneWeightsProcess.h
+++ b/code/LimitBoneWeightsProcess.h
@@ -69,7 +69,7 @@ namespace Assimp
* The other weights on this bone are then renormalized to assure the sum weight
* to be 1.
*/
-class ASSIMP_API LimitBoneWeightsProcess : public BaseProcess
+class LimitBoneWeightsProcess : public BaseProcess
{
public:
diff --git a/code/MD2Loader.cpp b/code/MD2Loader.cpp
index 150d8aaa81b5722c81a642852e42f97f88647774..841b5b0f854e5b6aa6e3f652d76ae30aa79a6ad8 100644
--- a/code/MD2Loader.cpp
+++ b/code/MD2Loader.cpp
@@ -44,7 +44,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** @file Implementation of the MD2 importer class */
#include "MD2Loader.h"
-#include "MaterialSystem.h"
#include "ByteSwap.h"
#include "MD2NormalTable.h" // shouldn't be included by other units
@@ -221,7 +220,7 @@ void MD2Importer::InternReadFile( const std::string& pFile,
pScene->mRootNode->mMeshes = new unsigned int[1];
pScene->mRootNode->mMeshes[0] = 0;
pScene->mMaterials = new aiMaterial*[1];
- pScene->mMaterials[0] = new MaterialHelper();
+ pScene->mMaterials[0] = new aiMaterial();
pScene->mNumMeshes = 1;
pScene->mMeshes = new aiMesh*[1];
@@ -278,7 +277,7 @@ void MD2Importer::InternReadFile( const std::string& pFile,
// Not sure whether there are MD2 files without texture coordinates
// NOTE: texture coordinates can be there without a texture,
// but a texture can't be there without a valid UV channel
- MaterialHelper* pcHelper = (MaterialHelper*)pScene->mMaterials[0];
+ aiMaterial* pcHelper = (aiMaterial*)pScene->mMaterials[0];
const int iMode = (int)aiShadingMode_Gouraud;
pcHelper->AddProperty<int>(&iMode, 1, AI_MATKEY_SHADING_MODEL);
diff --git a/code/MD2Loader.h b/code/MD2Loader.h
index 28bc83bd8e221a2d8570e950332658fabb1b0861..5e9ca7f2e61f08620e3a30468ecb34459480cec9 100644
--- a/code/MD2Loader.h
+++ b/code/MD2Loader.h
@@ -51,7 +51,7 @@ struct aiNode;
#include "MD2FileData.h"
namespace Assimp {
-class MaterialHelper;
+
using namespace MD2;
diff --git a/code/MD3Loader.cpp b/code/MD3Loader.cpp
index f7768ec8d0ef0a3a8009e49ff99a71e87176971c..028706988fa65c4fb46f7ba486bf845d225bb2e0 100644
--- a/code/MD3Loader.cpp
+++ b/code/MD3Loader.cpp
@@ -250,7 +250,7 @@ bool Q3Shader::LoadSkin(SkinData& fill, const std::string& pFile,IOSystem* io)
// ------------------------------------------------------------------------------------------------
// Convert Q3Shader to material
-void Q3Shader::ConvertShaderToMaterial(MaterialHelper* out, const ShaderDataBlock& shader)
+void Q3Shader::ConvertShaderToMaterial(aiMaterial* out, const ShaderDataBlock& shader)
{
ai_assert(NULL != out);
@@ -877,7 +877,7 @@ void MD3Importer::InternReadFile( const std::string& pFile,
else DefaultLogger::get()->warn("Unable to find shader record for " +without_ext );
}
- MaterialHelper* pcHelper = new MaterialHelper();
+ aiMaterial* pcHelper = new aiMaterial();
const int iMode = (int)aiShadingMode_Gouraud;
pcHelper->AddProperty<int>(&iMode, 1, AI_MATKEY_SHADING_MODEL);
diff --git a/code/MD3Loader.h b/code/MD3Loader.h
index 82c4b2b4d55d2b410e65f1f19430e2ee8a030194..f364a3fdda6b79dbc6452d321f3e258e0306af5a 100644
--- a/code/MD3Loader.h
+++ b/code/MD3Loader.h
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "MD3FileData.h"
namespace Assimp {
-class MaterialHelper;
+
using namespace MD3;
namespace Q3Shader {
@@ -191,7 +191,7 @@ bool LoadShader(ShaderData& fill, const std::string& file,IOSystem* io);
* @param[out] out Material structure to be filled.
* @param[in] shader Input shader
*/
-void ConvertShaderToMaterial(MaterialHelper* out, const ShaderDataBlock& shader);
+void ConvertShaderToMaterial(aiMaterial* out, const ShaderDataBlock& shader);
// ---------------------------------------------------------------------------
/** @brief Load a skin file
diff --git a/code/MD5Loader.cpp b/code/MD5Loader.cpp
index cdd1ab4831709a9f398413c953ba593254f94a0c..97da85fea988c4d874bb022a39ede807d37a45e5 100644
--- a/code/MD5Loader.cpp
+++ b/code/MD5Loader.cpp
@@ -47,7 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_MD5_IMPORTER
// internal headers
-#include "MaterialSystem.h"
#include "RemoveComments.h"
#include "MD5Loader.h"
#include "StringComparison.h"
@@ -507,7 +506,7 @@ void MD5Importer::LoadMD5MeshFile ()
}
// generate a material for the mesh
- MaterialHelper* mat = new MaterialHelper();
+ aiMaterial* mat = new aiMaterial();
pScene->mMaterials[n] = mat;
// insert the typical doom3 textures:
diff --git a/code/MDCLoader.cpp b/code/MDCLoader.cpp
index 1b35a832258f41b1429e30df5bf3d77cb8ec2d3d..d6d654fea8f3c1e63e4922a9fc86b6c5dc5964e6 100644
--- a/code/MDCLoader.cpp
+++ b/code/MDCLoader.cpp
@@ -439,7 +439,7 @@ void MDCImporter::InternReadFile(
pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials];
for (unsigned int i = 0; i < pScene->mNumMaterials;++i)
{
- MaterialHelper* pcMat = new MaterialHelper();
+ aiMaterial* pcMat = new aiMaterial();
pScene->mMaterials[i] = pcMat;
const std::string& name = aszShaders[i];
diff --git a/code/MDLFileData.h b/code/MDLFileData.h
index bc5e589f9c88a7a463dfd48825ae358014762e95..f4b3d678e42e0d1b24323a061f1119f703ecd24f 100644
--- a/code/MDLFileData.h
+++ b/code/MDLFileData.h
@@ -763,7 +763,7 @@ struct IntMaterial_MDL7
}
//! Material instance
- MaterialHelper* pcMat;
+ aiMaterial* pcMat;
//! Old material indices
unsigned int iOldMatIndices[2];
@@ -909,7 +909,7 @@ struct IntSharedData_MDL7
std::vector<bool> abNeedMaterials;
//! List of all materials
- std::vector<MaterialHelper*> pcMats;
+ std::vector<aiMaterial*> pcMats;
//! List of all bones
IntBone_MDL7** apcOutBones;
diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp
index f2e7178f23ea220cd2a3bd220370cccd046fea27..b5a575f36cdc7c5a572e660824cc50ec15d30b32 100644
--- a/code/MDLLoader.cpp
+++ b/code/MDLLoader.cpp
@@ -494,12 +494,12 @@ void MDLImporter::SetupMaterialProperties_3DGS_MDL5_Quake1( )
// allocate ONE material
pScene->mMaterials = new aiMaterial*[1];
- pScene->mMaterials[0] = new MaterialHelper();
+ pScene->mMaterials[0] = new aiMaterial();
pScene->mNumMaterials = 1;
// setup the material's properties
const int iMode = (int)aiShadingMode_Gouraud;
- MaterialHelper* const pcHelper = (MaterialHelper*)pScene->mMaterials[0];
+ aiMaterial* const pcHelper = (aiMaterial*)pScene->mMaterials[0];
pcHelper->AddProperty<int>(&iMode, 1, AI_MATKEY_SHADING_MODEL);
aiColor4D clr;
@@ -1268,7 +1268,7 @@ void MDLImporter::SortByMaterials_3DGS_MDL7(
if (!bFound) {
// build a new material ...
MDL::IntMaterial_MDL7 sHelper;
- sHelper.pcMat = new MaterialHelper();
+ sHelper.pcMat = new aiMaterial();
sHelper.iOldMatIndices[0] = iMatIndex;
sHelper.iOldMatIndices[1] = iMatIndex2;
JoinSkins_3DGS_MDL7(splitGroupData.shared.pcMats[iMatIndex],
@@ -1394,8 +1394,8 @@ void MDLImporter::InternReadFile_3DGS_MDL7( )
// if we have absolutely no skin loaded we need to generate a default material
if (sharedData.pcMats.empty()) {
const int iMode = (int)aiShadingMode_Gouraud;
- sharedData.pcMats.push_back(new MaterialHelper());
- MaterialHelper* pcHelper = (MaterialHelper*)sharedData.pcMats[0];
+ sharedData.pcMats.push_back(new aiMaterial());
+ aiMaterial* pcHelper = (aiMaterial*)sharedData.pcMats[0];
pcHelper->AddProperty<int>(&iMode, 1, AI_MATKEY_SHADING_MODEL);
aiColor3D clr;
@@ -1781,7 +1781,7 @@ void MDLImporter::GenerateOutputMeshes_3DGS_MDL7(
const MDL::Header_MDL7* const pcHeader = (const MDL::Header_MDL7*)this->mBuffer;
const unsigned int iNumOutBones = pcHeader->bones_num;
- for (std::vector<MaterialHelper*>::size_type i = 0; i < shared.pcMats.size();++i) {
+ for (std::vector<aiMaterial*>::size_type i = 0; i < shared.pcMats.size();++i) {
if (!splitGroupData.aiSplit[i]->empty()) {
// allocate the output mesh
@@ -1895,15 +1895,15 @@ void MDLImporter::GenerateOutputMeshes_3DGS_MDL7(
// ------------------------------------------------------------------------------------------------
// Join to materials
void MDLImporter::JoinSkins_3DGS_MDL7(
- MaterialHelper* pcMat1,
- MaterialHelper* pcMat2,
- MaterialHelper* pcMatOut)
+ aiMaterial* pcMat1,
+ aiMaterial* pcMat2,
+ aiMaterial* pcMatOut)
{
ai_assert(NULL != pcMat1 && NULL != pcMat2 && NULL != pcMatOut);
// first create a full copy of the first skin property set
// and assign it to the output material
- MaterialHelper::CopyPropertyList(pcMatOut,pcMat1);
+ aiMaterial::CopyPropertyList(pcMatOut,pcMat1);
int iVal = 0;
pcMatOut->AddProperty<int>(&iVal,1,AI_MATKEY_UVWSRC_DIFFUSE(0));
diff --git a/code/MDLLoader.h b/code/MDLLoader.h
index b5a5f8418e5b716b4ff2bcb295a3f9a5f6d315f8..6f1a47c8d9f200358e1d071af0139e8991773e87 100644
--- a/code/MDLLoader.h
+++ b/code/MDLLoader.h
@@ -53,7 +53,7 @@ struct aiNode;
#include "HalfLifeFileData.h"
namespace Assimp {
-class MaterialHelper;
+
using namespace MDL;
@@ -253,7 +253,7 @@ protected:
void ParseSkinLump_3DGS_MDL7(
const unsigned char* szCurrent,
const unsigned char** szCurrentOut,
- std::vector<MaterialHelper*>& pcMats);
+ std::vector<aiMaterial*>& pcMats);
// -------------------------------------------------------------------
/** Parse a skin lump in a MDL7/HMP7 file with all of its features
@@ -268,7 +268,7 @@ protected:
void ParseSkinLump_3DGS_MDL7(
const unsigned char* szCurrent,
const unsigned char** szCurrentOut,
- MaterialHelper* pcMatOut,
+ aiMaterial* pcMatOut,
unsigned int iType,
unsigned int iWidth,
unsigned int iHeight);
@@ -309,9 +309,9 @@ protected:
* \param pcMat2 Second input material
* \param pcMatOut Output material instance to be filled. Must be empty
*/
- void JoinSkins_3DGS_MDL7(MaterialHelper* pcMat1,
- MaterialHelper* pcMat2,
- MaterialHelper* pcMatOut);
+ void JoinSkins_3DGS_MDL7(aiMaterial* pcMat1,
+ aiMaterial* pcMat2,
+ aiMaterial* pcMatOut);
// -------------------------------------------------------------------
/** Add a bone transformation key to an animation
diff --git a/code/MDLMaterialLoader.cpp b/code/MDLMaterialLoader.cpp
index 716d9afb534777da7f2b863f10c4b0273f655ca1..aa73eddb5098e3475c9dd27fc036f7459cdc41ec 100644
--- a/code/MDLMaterialLoader.cpp
+++ b/code/MDLMaterialLoader.cpp
@@ -475,7 +475,7 @@ void MDLImporter::CreateTexture_3DGS_MDL5(const unsigned char* szData,
void MDLImporter::ParseSkinLump_3DGS_MDL7(
const unsigned char* szCurrent,
const unsigned char** szCurrentOut,
- MaterialHelper* pcMatOut,
+ aiMaterial* pcMatOut,
unsigned int iType,
unsigned int iWidth,
unsigned int iHeight)
@@ -791,7 +791,7 @@ void MDLImporter::SkipSkinLump_3DGS_MDL7(
void MDLImporter::ParseSkinLump_3DGS_MDL7(
const unsigned char* szCurrent,
const unsigned char** szCurrentOut,
- std::vector<MaterialHelper*>& pcMats)
+ std::vector<aiMaterial*>& pcMats)
{
ai_assert(NULL != szCurrent);
ai_assert(NULL != szCurrentOut);
@@ -803,7 +803,7 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
szCurrent += 12;
// allocate an output material
- MaterialHelper* pcMatOut = new MaterialHelper();
+ aiMaterial* pcMatOut = new aiMaterial();
pcMats.push_back(pcMatOut);
// skip length of file name
diff --git a/code/MS3DLoader.cpp b/code/MS3DLoader.cpp
index 370f0fb6cba8dc96f22ad9ecac5409f9680c8332..1e3f72f2f88c334bf0f81510d926db4596f179fc 100644
--- a/code/MS3DLoader.cpp
+++ b/code/MS3DLoader.cpp
@@ -414,7 +414,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile,
pScene->mMaterials = new aiMaterial*[materials.size()];
for (size_t i = 0; i < materials.size(); ++i) {
- MaterialHelper* mo = new MaterialHelper();
+ aiMaterial* mo = new aiMaterial();
pScene->mMaterials[pScene->mNumMaterials++] = mo;
const TempMaterial& mi = materials[i];
diff --git a/code/MakeVerboseFormat.h b/code/MakeVerboseFormat.h
index b92d86c30f2c25576c6f12331d5b1e254e07d707..740c43a357211e2a07b1d374f13f6f0da8c48769 100644
--- a/code/MakeVerboseFormat.h
+++ b/code/MakeVerboseFormat.h
@@ -61,15 +61,12 @@ namespace Assimp {
* The step has been added because it was required by the viewer, however
* it has been moved to the main library since others might find it
* useful, too. */
-class ASSIMP_API MakeVerboseFormatProcess : public BaseProcess
+class ASSIMP_API_WINONLY MakeVerboseFormatProcess : public BaseProcess
{
public:
- /** Constructor to be privately used by Importer, or by applications
- which know what they are doing if they modify the aiScene object */
+
MakeVerboseFormatProcess();
-
- /** Destructor, private as well */
~MakeVerboseFormatProcess();
public:
diff --git a/code/MaterialSystem.cpp b/code/MaterialSystem.cpp
index b928ab1bf02feac6de5acb49a5ed8a68492abcb3..8bb95ede7e4fd42452f869291486e3dd29762d9a 100644
--- a/code/MaterialSystem.cpp
+++ b/code/MaterialSystem.cpp
@@ -47,6 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "Hash.h"
#include "fast_atof.h"
#include "ParsingUtils.h"
+#include "MaterialSystem.h"
using namespace Assimp;
@@ -353,7 +354,7 @@ aiReturn aiGetMaterialTexture(const C_STRUCT aiMaterial* mat,
// ------------------------------------------------------------------------------------------------
// Construction. Actually the one and only way to get an aiMaterial instance
-MaterialHelper::MaterialHelper()
+aiMaterial::aiMaterial()
{
// Allocate 5 entries by default
mNumProperties = 0;
@@ -361,39 +362,16 @@ MaterialHelper::MaterialHelper()
mProperties = new aiMaterialProperty*[5];
}
-// ------------------------------------------------------------------------------------------------
-MaterialHelper::~MaterialHelper()
-{
- _InternDestruct();
-}
-
// ------------------------------------------------------------------------------------------------
aiMaterial::~aiMaterial()
{
- // HACK (Aramis): This is safe: aiMaterial has a private constructor,
- // so instances must be created indirectly via MaterialHelper. We can't
- // use a virtual d'tor because we need to preserve binary compatibility
- // with good old C ...
- ((MaterialHelper*)this)->_InternDestruct();
-}
-
-// ------------------------------------------------------------------------------------------------
-// Manual destructor
-void MaterialHelper::_InternDestruct()
-{
- // First clean up all properties
Clear();
- // Then delete the array that stored them
delete[] mProperties;
- AI_DEBUG_INVALIDATE_PTR(mProperties);
-
- // Update members
- mNumAllocated = 0;
}
// ------------------------------------------------------------------------------------------------
-void MaterialHelper::Clear()
+void aiMaterial::Clear()
{
for (unsigned int i = 0; i < mNumProperties;++i) {
// delete this entry
@@ -406,29 +384,7 @@ void MaterialHelper::Clear()
}
// ------------------------------------------------------------------------------------------------
-uint32_t MaterialHelper::ComputeHash(bool includeMatName /*= false*/)
-{
- uint32_t hash = 1503; // magic start value, choosen to be my birthday :-)
- for (unsigned int i = 0; i < mNumProperties;++i) {
- aiMaterialProperty* prop;
-
- // Exclude all properties whose first character is '?' from the hash
- // See doc for aiMaterialProperty.
- if ((prop = mProperties[i]) && (includeMatName || prop->mKey.data[0] != '?')) {
-
- hash = SuperFastHash(prop->mKey.data,(unsigned int)prop->mKey.length,hash);
- hash = SuperFastHash(prop->mData,prop->mDataLength,hash);
-
- // Combine the semantic and the index with the hash
- hash = SuperFastHash((const char*)&prop->mSemantic,sizeof(unsigned int),hash);
- hash = SuperFastHash((const char*)&prop->mIndex,sizeof(unsigned int),hash);
- }
- }
- return hash;
-}
-
-// ------------------------------------------------------------------------------------------------
-aiReturn MaterialHelper::RemoveProperty (const char* pKey,unsigned int type,
+aiReturn aiMaterial::RemoveProperty (const char* pKey,unsigned int type,
unsigned int index
)
{
@@ -456,7 +412,7 @@ aiReturn MaterialHelper::RemoveProperty (const char* pKey,unsigned int type,
}
// ------------------------------------------------------------------------------------------------
-aiReturn MaterialHelper::AddBinaryProperty (const void* pInput,
+aiReturn aiMaterial::AddBinaryProperty (const void* pInput,
unsigned int pSizeInBytes,
const char* pKey,
unsigned int type,
@@ -526,7 +482,7 @@ aiReturn MaterialHelper::AddBinaryProperty (const void* pInput,
}
// ------------------------------------------------------------------------------------------------
-aiReturn MaterialHelper::AddProperty (const aiString* pInput,
+aiReturn aiMaterial::AddProperty (const aiString* pInput,
const char* pKey,
unsigned int type,
unsigned int index)
@@ -557,8 +513,30 @@ aiReturn MaterialHelper::AddProperty (const aiString* pInput,
}
// ------------------------------------------------------------------------------------------------
-void MaterialHelper::CopyPropertyList(MaterialHelper* pcDest,
- const MaterialHelper* pcSrc
+uint32_t Assimp :: ComputeMaterialHash(const aiMaterial* mat, bool includeMatName /*= false*/)
+{
+ uint32_t hash = 1503; // magic start value, chosen to be my birthday :-)
+ for (unsigned int i = 0; i < mat->mNumProperties;++i) {
+ aiMaterialProperty* prop;
+
+ // Exclude all properties whose first character is '?' from the hash
+ // See doc for aiMaterialProperty.
+ if ((prop = mat->mProperties[i]) && (includeMatName || prop->mKey.data[0] != '?')) {
+
+ hash = SuperFastHash(prop->mKey.data,(unsigned int)prop->mKey.length,hash);
+ hash = SuperFastHash(prop->mData,prop->mDataLength,hash);
+
+ // Combine the semantic and the index with the hash
+ hash = SuperFastHash((const char*)&prop->mSemantic,sizeof(unsigned int),hash);
+ hash = SuperFastHash((const char*)&prop->mIndex,sizeof(unsigned int),hash);
+ }
+ }
+ return hash;
+}
+
+// ------------------------------------------------------------------------------------------------
+void aiMaterial::CopyPropertyList(aiMaterial* pcDest,
+ const aiMaterial* pcSrc
)
{
ai_assert(NULL != pcDest);
diff --git a/code/MaterialSystem.h b/code/MaterialSystem.h
index 2d4854a1cba0d9a8c571f1436424abe98094e45e..17a98a356099cf35204450e34651c1af49a8288b 100644
--- a/code/MaterialSystem.h
+++ b/code/MaterialSystem.h
@@ -39,208 +39,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @file MaterialSystem.h
- * Definition of the #MaterialHelper utility class.
+ * Now that #MaterialHelper is gone, this file only contains some
+ * internal material utility functions.
*/
#ifndef AI_MATERIALSYSTEM_H_INC
#define AI_MATERIALSYSTEM_H_INC
-#include "../include/aiMaterial.h"
namespace Assimp {
-// ----------------------------------------------------------------------------------------
-/** Internal material helper class deriving from aiMaterial.
+// ------------------------------------------------------------------------------
+/** Computes a hash (hopefully unique) from all material properties
+ * The hash value reflects the current property state, so if you add any
+ * property and call this method again, the resulting hash value will be
+ * different. The hash is not persistent across different builds and platforms.
*
- * Intended to be used to fill an aiMaterial structure more easily.
+ * @param includeMatName Set to 'true' to take all properties with
+ * '?' as initial character in their name into account.
+ * Currently #AI_MATKEY_NAME is the only example.
+ * @return 32 Bit jash value for the material
*/
-class ASSIMP_API MaterialHelper : public ::aiMaterial
-{
-public:
+uint32_t ComputeMaterialHash(const aiMaterial* mat, bool includeMatName = false);
- // Construction and destruction
- MaterialHelper();
- ~MaterialHelper();
- // ------------------------------------------------------------------------------
- /** @brief Add a property with a given key and type info to the material
- * structure
- *
- * @param pInput Pointer to input data
- * @param pSizeInBytes Size of input data
- * @param pKey Key/Usage of the property (AI_MATKEY_XXX)
- * @param type Set by the AI_MATKEY_XXX macro
- * @param index Set by the AI_MATKEY_XXX macro
- * @param pType Type information hint
- */
- aiReturn AddBinaryProperty (const void* pInput,
- unsigned int pSizeInBytes,
- const char* pKey,
- unsigned int type ,
- unsigned int index ,
- aiPropertyTypeInfo pType);
-
- // ------------------------------------------------------------------------------
- /** @brief Add a string property with a given key and type info to the
- * material structure
- *
- * @param pInput Input string
- * @param pKey Key/Usage of the property (AI_MATKEY_XXX)
- * @param type Set by the AI_MATKEY_XXX macro
- * @param index Set by the AI_MATKEY_XXX macro
- */
- aiReturn AddProperty (const aiString* pInput,
- const char* pKey,
- unsigned int type = 0,
- unsigned int index = 0);
-
- // ------------------------------------------------------------------------------
- /** @brief Add a property with a given key to the material structure
- * @param pInput Pointer to the input data
- * @param pNumValues Number of values in the array
- * @param pKey Key/Usage of the property (AI_MATKEY_XXX)
- * @param type Set by the AI_MATKEY_XXX macro
- * @param index Set by the AI_MATKEY_XXX macro
- */
- template<class TYPE>
- aiReturn AddProperty (const TYPE* pInput,
- unsigned int pNumValues,
- const char* pKey,
- unsigned int type = 0,
- unsigned int index = 0);
-
- // ------------------------------------------------------------------------------
- /** @brief Remove a given key from the list.
- *
- * The function fails if the key isn't found
- * @param pKey Key to be deleted
- */
- aiReturn RemoveProperty (const char* pKey,
- unsigned int type = 0,
- unsigned int index = 0);
-
- // ------------------------------------------------------------------------------
- /** @brief Removes all properties from the material.
- *
- * The data array remains allocated so adding new properties is quite fast.
- */
- void Clear();
-
- // ------------------------------------------------------------------------------
- /** Computes a hash (hopefully unique) from all material properties
- * The hash value reflects the current property state, so if you add any
- * proprty and call this method again, the resulting hash value will be
- * different.
- *
- * @param includeMatName Set to 'true' to take all properties with
- * '?' as initial character in their name into account.
- * Currently #AI_MATKEY_NAME is the only example.
- * @return Unique hash
- */
- uint32_t ComputeHash(bool includeMatName = false);
-
- // ------------------------------------------------------------------------------
- /** Copy the property list of a material
- * @param pcDest Destination material
- * @param pcSrc Source material
- */
- static void CopyPropertyList(MaterialHelper* pcDest,
- const MaterialHelper* pcSrc);
-
-public:
- // For internal use. That's why it's public.
- void _InternDestruct();
-};
-
-
-// ----------------------------------------------------------------------------------------
-template<class TYPE>
-aiReturn MaterialHelper::AddProperty (const TYPE* pInput,
- const unsigned int pNumValues,
- const char* pKey,
- unsigned int type,
- unsigned int index)
-{
- return AddBinaryProperty((const void*)pInput,
- pNumValues * sizeof(TYPE),
- pKey,type,index,aiPTI_Buffer);
-}
-
-// ----------------------------------------------------------------------------------------
-template<>
-inline aiReturn MaterialHelper::AddProperty<float> (const float* pInput,
- const unsigned int pNumValues,
- const char* pKey,
- unsigned int type,
- unsigned int index)
-{
- return AddBinaryProperty((const void*)pInput,
- pNumValues * sizeof(float),
- pKey,type,index,aiPTI_Float);
-}
-
-// ----------------------------------------------------------------------------------------
-template<>
-inline aiReturn MaterialHelper::AddProperty<aiUVTransform> (const aiUVTransform* pInput,
- const unsigned int pNumValues,
- const char* pKey,
- unsigned int type,
- unsigned int index)
-{
- return AddBinaryProperty((const void*)pInput,
- pNumValues * sizeof(aiUVTransform),
- pKey,type,index,aiPTI_Float);
-}
-
-// ----------------------------------------------------------------------------------------
-template<>
-inline aiReturn MaterialHelper::AddProperty<aiColor4D> (const aiColor4D* pInput,
- const unsigned int pNumValues,
- const char* pKey,
- unsigned int type,
- unsigned int index)
-{
- return AddBinaryProperty((const void*)pInput,
- pNumValues * sizeof(aiColor4D),
- pKey,type,index,aiPTI_Float);
-}
-
-// ----------------------------------------------------------------------------------------
-template<>
-inline aiReturn MaterialHelper::AddProperty<aiColor3D> (const aiColor3D* pInput,
- const unsigned int pNumValues,
- const char* pKey,
- unsigned int type,
- unsigned int index)
-{
- return AddBinaryProperty((const void*)pInput,
- pNumValues * sizeof(aiColor3D),
- pKey,type,index,aiPTI_Float);
-}
-
-// ----------------------------------------------------------------------------------------
-template<>
-inline aiReturn MaterialHelper::AddProperty<aiVector3D> (const aiVector3D* pInput,
- const unsigned int pNumValues,
- const char* pKey,
- unsigned int type,
- unsigned int index)
-{
- return AddBinaryProperty((const void*)pInput,
- pNumValues * sizeof(aiVector3D),
- pKey,type,index,aiPTI_Float);
-}
-
-// ----------------------------------------------------------------------------------------
-template<>
-inline aiReturn MaterialHelper::AddProperty<int> (const int* pInput,
- const unsigned int pNumValues,
- const char* pKey,
- unsigned int type,
- unsigned int index)
-{
- return AddBinaryProperty((const void*)pInput,
- pNumValues * sizeof(int),
- pKey,type,index,aiPTI_Integer);
-}
} // ! namespace Assimp
#endif //!! AI_MATERIALSYSTEM_H_INC
diff --git a/code/NFFLoader.cpp b/code/NFFLoader.cpp
index e978069eb25e7b548650536527fbe248fa49fe6d..a92e6218050265c849b9e1c7365bd2e13a3f5a7b 100644
--- a/code/NFFLoader.cpp
+++ b/code/NFFLoader.cpp
@@ -1195,7 +1195,7 @@ void NFFImporter::InternReadFile( const std::string& pFile,
}
// generate a material for the mesh
- MaterialHelper* pcMat = (MaterialHelper*)(pScene->mMaterials[m] = new MaterialHelper());
+ aiMaterial* pcMat = (aiMaterial*)(pScene->mMaterials[m] = new aiMaterial());
mesh->mMaterialIndex = m++;
diff --git a/code/OFFLoader.cpp b/code/OFFLoader.cpp
index ef574dee20586bc252f8159a4d991f07766172fb..1bcae35965d008ba8551645a8a61e4ae7047e449 100644
--- a/code/OFFLoader.cpp
+++ b/code/OFFLoader.cpp
@@ -198,7 +198,7 @@ void OFFImporter::InternReadFile( const std::string& pFile,
// generate a default material
pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials = 1];
- MaterialHelper* pcMat = new MaterialHelper();
+ aiMaterial* pcMat = new aiMaterial();
aiColor4D clr(0.6f,0.6f,0.6f,1.0f);
pcMat->AddProperty(&clr,1,AI_MATKEY_COLOR_DIFFUSE);
diff --git a/code/ObjExporter.h b/code/ObjExporter.h
index ae951e64fe7ad840b92e3f89d2fc2066dfbf1ec8..c56a23d42e19acf6df42e8f0a4eb0acc15bd6eb1 100644
--- a/code/ObjExporter.h
+++ b/code/ObjExporter.h
@@ -55,7 +55,7 @@ namespace Assimp
// ------------------------------------------------------------------------------------------------
/** Helper class to export a given scene to an OBJ file. */
// ------------------------------------------------------------------------------------------------
-class ASSIMP_API ObjExporter
+class ObjExporter
{
public:
/// Constructor for a specific scene to export
diff --git a/code/ObjFileImporter.cpp b/code/ObjFileImporter.cpp
index a165c94ebc928b75679befa1e7bc502c8647fb37..d444fbdd53832aacf4ced6fbecf1d57f35f18d6d 100644
--- a/code/ObjFileImporter.cpp
+++ b/code/ObjFileImporter.cpp
@@ -415,7 +415,7 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
pScene->mMaterials = new aiMaterial*[ numMaterials ];
for ( unsigned int matIndex = 0; matIndex < numMaterials; matIndex++ )
{
- Assimp::MaterialHelper* mat = new Assimp::MaterialHelper;
+ aiMaterial* mat = new aiMaterial;
// Store material name
std::map<std::string, ObjFile::Material*>::const_iterator it;
diff --git a/code/OgreImporterMaterial.cpp b/code/OgreImporterMaterial.cpp
index ed85e3856e935ce49774f9cccdd455f686b3d0ce..44a7bef8cfe922321b08530817fee1814f26d175 100644
--- a/code/OgreImporterMaterial.cpp
+++ b/code/OgreImporterMaterial.cpp
@@ -71,7 +71,7 @@ aiMaterial* OgreImporter::LoadMaterial(const std::string MaterialName) const
const aiScene* const m_CurrentScene=this->m_CurrentScene;//make sure, that we can access but not change the scene
(void)m_CurrentScene;
- MaterialHelper *NewMaterial=new MaterialHelper();
+ aiMaterial *NewMaterial=new aiMaterial();
aiString ts(MaterialName.c_str());
NewMaterial->AddProperty(&ts, AI_MATKEY_NAME);
diff --git a/code/OptimizeGraph.h b/code/OptimizeGraph.h
index 18ce238cf485e6caaa9df74401272035d9f2fb91..883f620d650208242e16204cbaf41bd23a250acd 100644
--- a/code/OptimizeGraph.h
+++ b/code/OptimizeGraph.h
@@ -61,7 +61,7 @@ namespace Assimp {
* @see aiProcess_OptimizeGraph for a detailed description of the
* algorithm being applied.
*/
-class ASSIMP_API OptimizeGraphProcess : public BaseProcess
+class OptimizeGraphProcess : public BaseProcess
{
public:
diff --git a/code/OptimizeMeshes.h b/code/OptimizeMeshes.h
index 2c31fc56942e52897d82521d4a93c9a28f79874e..df3340600da8fd6121ad4b46aeaf665bf3bd59ea 100644
--- a/code/OptimizeMeshes.h
+++ b/code/OptimizeMeshes.h
@@ -59,7 +59,7 @@ namespace Assimp {
*
* @note Instanced meshes are currently not processed.
*/
-class ASSIMP_API OptimizeMeshesProcess : public BaseProcess
+class OptimizeMeshesProcess : public BaseProcess
{
public:
diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp
index 11c2305cfb5b2507bbcdfa69731fc53c578e82bb..79102fa93d6015ab8300f238d02224fc7e1332f8 100644
--- a/code/PlyLoader.cpp
+++ b/code/PlyLoader.cpp
@@ -48,7 +48,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// internal headers
#include "PlyLoader.h"
-#include "MaterialSystem.h"
using namespace Assimp;
@@ -188,7 +187,7 @@ void PLYImporter::InternReadFile( const std::string& pFile,
}
// now load a list of all materials
- std::vector<MaterialHelper*> avMaterials;
+ std::vector<aiMaterial*> avMaterials;
LoadMaterial(&avMaterials);
// now load a list of all vertex color channels
@@ -241,7 +240,7 @@ void PLYImporter::ConvertMeshes(std::vector<PLY::Face>* avFaces,
const std::vector<aiVector3D>* avNormals,
const std::vector<aiColor4D>* avColors,
const std::vector<aiVector2D>* avTexCoords,
- const std::vector<MaterialHelper*>* avMaterials,
+ const std::vector<aiMaterial*>* avMaterials,
std::vector<aiMesh*>* avOut)
{
ai_assert(NULL != avFaces);
@@ -327,7 +326,7 @@ void PLYImporter::ConvertMeshes(std::vector<PLY::Face>* avFaces,
// ------------------------------------------------------------------------------------------------
// Generate a default material if none was specified and apply it to all vanilla faces
void PLYImporter::ReplaceDefaultMaterial(std::vector<PLY::Face>* avFaces,
- std::vector<MaterialHelper*>* avMaterials)
+ std::vector<aiMaterial*>* avMaterials)
{
bool bNeedDefaultMat = false;
@@ -344,7 +343,7 @@ void PLYImporter::ReplaceDefaultMaterial(std::vector<PLY::Face>* avFaces,
if (bNeedDefaultMat) {
// generate a default material
- MaterialHelper* pcHelper = new MaterialHelper();
+ aiMaterial* pcHelper = new aiMaterial();
// fill in a default material
int iMode = (int)aiShadingMode_Gouraud;
@@ -869,7 +868,7 @@ void PLYImporter::GetMaterialColor(const std::vector<PLY::PropertyInstance>& avL
// ------------------------------------------------------------------------------------------------
// Extract a material from the PLY DOM
-void PLYImporter::LoadMaterial(std::vector<MaterialHelper*>* pvOut)
+void PLYImporter::LoadMaterial(std::vector<aiMaterial*>* pvOut)
{
ai_assert(NULL != pvOut);
@@ -997,7 +996,7 @@ void PLYImporter::LoadMaterial(std::vector<MaterialHelper*>* pvOut)
if (NULL != pcList) {
for (std::vector<ElementInstance>::const_iterator i = pcList->alInstances.begin();i != pcList->alInstances.end();++i) {
aiColor4D clrOut;
- MaterialHelper* pcHelper = new MaterialHelper();
+ aiMaterial* pcHelper = new aiMaterial();
// build the diffuse material color
GetMaterialColor((*i).alProperties,aaiPositions[0],aaiTypes[0],&clrOut);
diff --git a/code/PlyLoader.h b/code/PlyLoader.h
index fa75d390d091f895510adde9bf52e2cba8687044..96105fe0dcb6c940dd9b31ad9b5ea4b27ede2a40 100644
--- a/code/PlyLoader.h
+++ b/code/PlyLoader.h
@@ -52,7 +52,7 @@ struct aiNode;
#include "PlyParser.h"
namespace Assimp {
-class MaterialHelper;
+
using namespace PLY;
@@ -117,14 +117,14 @@ protected:
// -------------------------------------------------------------------
/** Extract a material list from the DOM
*/
- void LoadMaterial(std::vector<MaterialHelper*>* pvOut);
+ void LoadMaterial(std::vector<aiMaterial*>* pvOut);
// -------------------------------------------------------------------
/** Validate material indices, replace default material identifiers
*/
void ReplaceDefaultMaterial(std::vector<PLY::Face>* avFaces,
- std::vector<MaterialHelper*>* avMaterials);
+ std::vector<aiMaterial*>* avMaterials);
// -------------------------------------------------------------------
@@ -135,7 +135,7 @@ protected:
const std::vector<aiVector3D>* avNormals,
const std::vector<aiColor4D>* avColors,
const std::vector<aiVector2D>* avTexCoords,
- const std::vector<MaterialHelper*>* avMaterials,
+ const std::vector<aiMaterial*>* avMaterials,
std::vector<aiMesh*>* avOut);
diff --git a/code/PretransformVertices.h b/code/PretransformVertices.h
index 9948f433bdd2467fd5961052672f55dade7cf938..558c1c0d62c2853020e54a7e62088a2136bf0abb 100644
--- a/code/PretransformVertices.h
+++ b/code/PretransformVertices.h
@@ -56,7 +56,7 @@ namespace Assimp {
* and removes the whole graph. The output is a list of meshes, one for
* each material.
*/
-class ASSIMP_API PretransformVertices : public BaseProcess
+class PretransformVertices : public BaseProcess
{
public:
diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp
index 82eb6b7c5968027279136326aeebebb57297098b..32a620096abfbe71da5fda8b366a3496cd01153b 100644
--- a/code/Q3BSPFileImporter.cpp
+++ b/code/Q3BSPFileImporter.cpp
@@ -481,7 +481,7 @@ void Q3BSPFileImporter::createMaterials( const Q3BSP::Q3BSPModel *pModel, aiScen
}
aiMatName.Set( matName );
- Assimp::MaterialHelper *pMatHelper = new Assimp::MaterialHelper;
+ aiMaterial *pMatHelper = new aiMaterial;
pMatHelper->AddProperty( &aiMatName, AI_MATKEY_NAME );
extractIds( matName, textureId, lightmapId );
@@ -623,7 +623,7 @@ aiFace *Q3BSPFileImporter::getNextFace( aiMesh *pMesh, unsigned int &rFaceIdx )
// Imports a texture file.
bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pModel,
Q3BSP::Q3BSPZipArchive *pArchive, aiScene* /*pScene*/,
- Assimp::MaterialHelper *pMatHelper, int textureId )
+ aiMaterial *pMatHelper, int textureId )
{
std::vector<std::string> supportedExtensions;
supportedExtensions.push_back( ".jpg" );
@@ -690,7 +690,7 @@ bool Q3BSPFileImporter::importTextureFromArchive( const Q3BSP::Q3BSPModel *pMode
// ------------------------------------------------------------------------------------------------
// Imports a light map file.
bool Q3BSPFileImporter::importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene,
- Assimp::MaterialHelper *pMatHelper, int lightmapId )
+ aiMaterial *pMatHelper, int lightmapId )
{
if ( NULL == pModel || NULL == pScene || NULL == pMatHelper )
{
diff --git a/code/Q3BSPFileImporter.h b/code/Q3BSPFileImporter.h
index 872a281cccf5313c566a49ec0c6ccebf5367c397..98f3dd566f908e755b40d0bdfd2c29e514419a44 100644
--- a/code/Q3BSPFileImporter.h
+++ b/code/Q3BSPFileImporter.h
@@ -95,8 +95,8 @@ private:
void createMaterialMap( const Q3BSP::Q3BSPModel *pModel);
aiFace *getNextFace( aiMesh *pMesh, unsigned int &rFaceIdx );
bool importTextureFromArchive( const Q3BSP::Q3BSPModel *pModel, Q3BSP::Q3BSPZipArchive *pArchive, aiScene* pScene,
- Assimp::MaterialHelper *pMatHelper, int textureId );
- bool importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, Assimp::MaterialHelper *pMatHelper, int lightmapId );
+ aiMaterial *pMatHelper, int textureId );
+ bool importLightmap( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene, aiMaterial *pMatHelper, int lightmapId );
bool importEntities( const Q3BSP::Q3BSPModel *pModel, aiScene* pScene );
bool expandFile( Q3BSP::Q3BSPZipArchive *pArchive, const std::string &rFilename, const std::vector<std::string> &rExtList,
std::string &rFile, std::string &rExt );
diff --git a/code/Q3DLoader.cpp b/code/Q3DLoader.cpp
index 15257c019d8bdbf8e2c40e3d0532ef4c50a08ec1..2b69dce61802c849e0bc82a0a427a7447590549c 100644
--- a/code/Q3DLoader.cpp
+++ b/code/Q3DLoader.cpp
@@ -433,7 +433,7 @@ outer:
// Allocate a mesh and a material
aiMesh* mesh = pScene->mMeshes[real] = new aiMesh();
- MaterialHelper* mat = new MaterialHelper();
+ aiMaterial* mat = new aiMaterial();
pScene->mMaterials[real] = mat;
mesh->mMaterialIndex = real;
diff --git a/code/RawLoader.cpp b/code/RawLoader.cpp
index 0b48286b0f24eac8d51fff74a31e8fdc485e734a..2959e24e665a30c36b84d7c7f4220742e050ee78 100644
--- a/code/RawLoader.cpp
+++ b/code/RawLoader.cpp
@@ -290,7 +290,7 @@ void RAWImporter::InternReadFile( const std::string& pFile,
}
// generate a material for the mesh
- MaterialHelper* mat = new MaterialHelper();
+ aiMaterial* mat = new aiMaterial();
aiColor4D clr(1.0f,1.0f,1.0f,1.0f);
if ("%default%" == (*it2).name) // a gray default material
diff --git a/code/RemoveComments.h b/code/RemoveComments.h
index bda76989ff55ca57176298b74df7f15ae0efe247..c9cd27194bebfa8209b181dae472f9293ebbf173 100644
--- a/code/RemoveComments.h
+++ b/code/RemoveComments.h
@@ -55,7 +55,7 @@ namespace Assimp {
* to those in C or C++ so this code has been moved to a separate
* module.
*/
-class ASSIMP_API CommentRemover
+class CommentRemover
{
// class cannot be instanced
CommentRemover() {}
diff --git a/code/RemoveRedundantMaterials.cpp b/code/RemoveRedundantMaterials.cpp
index 33b77667e491ddd284377b342792f781ee5e0a62..c9495cfd393c2e633865a8063acef49580693ae8 100644
--- a/code/RemoveRedundantMaterials.cpp
+++ b/code/RemoveRedundantMaterials.cpp
@@ -47,6 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "RemoveRedundantMaterials.h"
#include "ParsingUtils.h"
#include "ProcessHelper.h"
+#include "MaterialSystem.h"
using namespace Assimp;
@@ -114,7 +115,7 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene)
// Our brilliant 'salt': A single material property with ~ as first
// character to mark it as internal and temporary.
const int dummy = 1;
- ((MaterialHelper*)mat)->AddProperty(&dummy,1,"~RRM.UniqueMaterial",0,0);
+ ((aiMaterial*)mat)->AddProperty(&dummy,1,"~RRM.UniqueMaterial",0,0);
// Keep this material even if no mesh references it
abReferenced[i] = true;
@@ -144,7 +145,7 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene)
continue;
}
- uint32_t me = aiHashes[i] = ((MaterialHelper*)pScene->mMaterials[i])->ComputeHash();
+ uint32_t me = aiHashes[i] = ComputeMaterialHash(pScene->mMaterials[i]);
for (unsigned int a = 0; a < i;++a)
{
if (abReferenced[a] && me == aiHashes[a]) {
@@ -175,7 +176,7 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene)
{
aiString sz;
sz.length = ::sprintf(sz.data,"JoinedMaterial_#%i",p);
- ((MaterialHelper*)ppcMaterials[idx])->AddProperty(&sz,AI_MATKEY_NAME);
+ ((aiMaterial*)ppcMaterials[idx])->AddProperty(&sz,AI_MATKEY_NAME);
}
else ppcMaterials[idx] = pScene->mMaterials[p];
}
diff --git a/code/RemoveRedundantMaterials.h b/code/RemoveRedundantMaterials.h
index 15b3d5fa5cc6eb3330ec805bd6aa6ea2982b5e39..02f950c57f3b48aaaeb393856fe0c7b486a96251 100644
--- a/code/RemoveRedundantMaterials.h
+++ b/code/RemoveRedundantMaterials.h
@@ -54,7 +54,7 @@ namespace Assimp {
/** RemoveRedundantMatsProcess: Postprocessing steo to remove redundant
* materials from the imported scene.
*/
-class ASSIMP_API RemoveRedundantMatsProcess : public BaseProcess
+class RemoveRedundantMatsProcess : public BaseProcess
{
public:
diff --git a/code/RemoveVCProcess.cpp b/code/RemoveVCProcess.cpp
index e412e3fd769a2c2d4cdbef04d8a1465a5dfc4741..8c4841d72048ae194c78de5571698aaed08e1e96 100644
--- a/code/RemoveVCProcess.cpp
+++ b/code/RemoveVCProcess.cpp
@@ -167,7 +167,7 @@ void RemoveVCProcess::Execute( aiScene* pScene)
delete pScene->mMaterials[i];
pScene->mNumMaterials = 1;
- MaterialHelper* helper = (MaterialHelper*) pScene->mMaterials[0];
+ aiMaterial* helper = (aiMaterial*) pScene->mMaterials[0];
ai_assert(NULL != helper);
helper->Clear();
diff --git a/code/RemoveVCProcess.h b/code/RemoveVCProcess.h
index 5531ce7bec6174e28c375cadae919f8fbb9b57ac..97ff28c75c717f9385a7d769c3761ad0b397e489 100644
--- a/code/RemoveVCProcess.h
+++ b/code/RemoveVCProcess.h
@@ -52,7 +52,7 @@ namespace Assimp {
/** RemoveVCProcess: Class to exclude specific parts of the data structure
* from further processing by removing them,
*/
-class ASSIMP_API RemoveVCProcess : public BaseProcess
+class RemoveVCProcess : public BaseProcess
{
public:
diff --git a/code/SMDLoader.cpp b/code/SMDLoader.cpp
index 7cc2e6a0cf9fa40e740105a77e093d166eebd72a..5f441ee495fdbc4886bb69273b9868dab5a1ee9d 100644
--- a/code/SMDLoader.cpp
+++ b/code/SMDLoader.cpp
@@ -625,7 +625,7 @@ void SMDImporter::CreateOutputMaterials()
for (unsigned int iMat = 0; iMat < pScene->mNumMaterials;++iMat)
{
- MaterialHelper* pcMat = new MaterialHelper();
+ aiMaterial* pcMat = new aiMaterial();
pScene->mMaterials[iMat] = pcMat;
aiString szName;
@@ -645,7 +645,7 @@ void SMDImporter::CreateOutputMaterials()
{
pScene->mNumMaterials = 1;
- MaterialHelper* pcHelper = new MaterialHelper();
+ aiMaterial* pcHelper = new aiMaterial();
pScene->mMaterials[0] = pcHelper;
int iMode = (int)aiShadingMode_Gouraud;
diff --git a/code/SMDLoader.h b/code/SMDLoader.h
index 36b71bf0572a79d516537e3df91e6c96e9fcfe8e..e216d2d338132da74a37a4c31b50bd416b4fd5d2 100644
--- a/code/SMDLoader.h
+++ b/code/SMDLoader.h
@@ -60,7 +60,7 @@ struct aiNode;
#include <vector>
namespace Assimp {
-class MaterialHelper;
+
namespace SMD {
diff --git a/code/STLExporter.h b/code/STLExporter.h
index c44de7663450dd23974f50c92b5c5a8c156ec9c8..37fc1dd49c1d88ad45b99ce18758af01ecd46923 100644
--- a/code/STLExporter.h
+++ b/code/STLExporter.h
@@ -55,7 +55,7 @@ namespace Assimp
// ------------------------------------------------------------------------------------------------
/** Helper class to export a given scene to a STL file. */
// ------------------------------------------------------------------------------------------------
-class ASSIMP_API STLExporter
+class STLExporter
{
public:
/// Constructor for a specific scene to export
diff --git a/code/STLLoader.cpp b/code/STLLoader.cpp
index 4543a5dafba6c7e63f77cfc433384ea92561888f..9a84dd7536d6c09a2fe78c4da11effb025136c2a 100644
--- a/code/STLLoader.cpp
+++ b/code/STLLoader.cpp
@@ -143,7 +143,7 @@ void STLImporter::InternReadFile( const std::string& pFile,
}
// create a single default material - everything white, as we have vertex colors
- MaterialHelper* pcMat = new MaterialHelper();
+ aiMaterial* pcMat = new aiMaterial();
aiString s;
s.Set(AI_DEFAULT_MATERIAL_NAME);
pcMat->AddProperty(&s, AI_MATKEY_NAME);
diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp
index d553c099364254ad18cf9c916849185ff5a1e34d..8a061609ab635cb2f2dd3f05f0e2c395be2c24c8 100644
--- a/code/SceneCombiner.cpp
+++ b/code/SceneCombiner.cpp
@@ -245,7 +245,6 @@ void SceneCombiner::MergeScenes(aiScene** _dest, aiScene* master,
// if _dest points to NULL allocate a new scene. Otherwise clear the old and reuse it
if (srcList.empty()) {
if (*_dest) {
- (*_dest)->~aiScene();
SceneCombiner::CopySceneFlat(_dest,master);
}
else *_dest = master;
@@ -253,6 +252,7 @@ void SceneCombiner::MergeScenes(aiScene** _dest, aiScene* master,
}
if (*_dest) {
(*_dest)->~aiScene();
+ new (*_dest) aiScene();
}
else *_dest = new aiScene();
@@ -910,7 +910,10 @@ inline void GetArrayCopy (Type*& dest, unsigned int num )
void SceneCombiner::CopySceneFlat(aiScene** _dest,const aiScene* src)
{
// reuse the old scene or allocate a new?
- if (*_dest)(*_dest)->~aiScene();
+ if (*_dest) {
+ (*_dest)->~aiScene();
+ new (*_dest) aiScene();
+ }
else *_dest = new aiScene();
::memcpy(*_dest,src,sizeof(aiScene));
@@ -1008,7 +1011,7 @@ void SceneCombiner::Copy (aiMaterial** _dest, const aiMaterial* src)
{
ai_assert(NULL != _dest && NULL != src);
- MaterialHelper* dest = (MaterialHelper*) ( *_dest = new MaterialHelper() );
+ aiMaterial* dest = (aiMaterial*) ( *_dest = new aiMaterial() );
dest->mNumAllocated = src->mNumAllocated;
dest->mNumProperties = src->mNumProperties;
dest->mProperties = new aiMaterialProperty* [dest->mNumAllocated];
diff --git a/code/SceneCombiner.h b/code/SceneCombiner.h
index 77579d0c032dd252059b8979c717c1995aa75de4..e6a5035cdcbde1763cd143cc4cb0934bf5e8147b 100644
--- a/code/SceneCombiner.h
+++ b/code/SceneCombiner.h
@@ -178,7 +178,7 @@ struct SceneHelper
* The class is currently being used by various postprocessing steps
* and loaders (ie. LWS).
*/
-class ASSIMP_API SceneCombiner
+class SceneCombiner
{
// class cannot be instanced
SceneCombiner() {}
diff --git a/code/ScenePreprocessor.cpp b/code/ScenePreprocessor.cpp
index cb52abbb31f7be96f746842114c20009c6b72c9f..4752b380405b53b25f0dba8dfb5427c30bfb3809 100644
--- a/code/ScenePreprocessor.cpp
+++ b/code/ScenePreprocessor.cpp
@@ -64,7 +64,7 @@ void ScenePreprocessor::ProcessScene ()
// Generate a default material if none was specified
if (!scene->mNumMaterials && scene->mNumMeshes) {
scene->mMaterials = new aiMaterial*[2];
- MaterialHelper* helper;
+ aiMaterial* helper;
aiString name;
@@ -76,7 +76,7 @@ void ScenePreprocessor::ProcessScene ()
if (mat0 == UINT_MAX) {
- scene->mMaterials[scene->mNumMaterials] = helper = new MaterialHelper();
+ scene->mMaterials[scene->mNumMaterials] = helper = new aiMaterial();
name.Set("$texture.png");
helper->AddProperty(&name,AI_MATKEY_TEXTURE_DIFFUSE(0));
@@ -91,7 +91,7 @@ void ScenePreprocessor::ProcessScene ()
else {
if (mat1 == UINT_MAX) {
- scene->mMaterials[scene->mNumMaterials] = helper = new MaterialHelper();
+ scene->mMaterials[scene->mNumMaterials] = helper = new aiMaterial();
aiColor3D clr(0.6f,0.6f,0.6f);
helper->AddProperty(&clr,1,AI_MATKEY_COLOR_DIFFUSE);
diff --git a/code/ScenePreprocessor.h b/code/ScenePreprocessor.h
index 60c9ae9f5beda4dbdbf9890496deaa17ebfcffe7..850e2bc09984be423f65ad11990b2be9ddb64ce8 100644
--- a/code/ScenePreprocessor.h
+++ b/code/ScenePreprocessor.h
@@ -54,7 +54,7 @@ namespace Assimp {
* importer, such as aiMesh::mPrimitiveTypes.
*/
// ----------------------------------------------------------------------------------
-class ASSIMP_API ScenePreprocessor
+class ScenePreprocessor
{
// Make ourselves a friend of the corresponding test unit.
friend class ::ScenePreprocessorTest;
diff --git a/code/SkeletonMeshBuilder.cpp b/code/SkeletonMeshBuilder.cpp
index 4a3cfe405032292812762343f6e19aadf11eaf05..6348e193e00068022c93bada42c0635b24e1a926 100644
--- a/code/SkeletonMeshBuilder.cpp
+++ b/code/SkeletonMeshBuilder.cpp
@@ -253,7 +253,7 @@ aiMesh* SkeletonMeshBuilder::CreateMesh()
// Creates a dummy material and returns it.
aiMaterial* SkeletonMeshBuilder::CreateMaterial()
{
- Assimp::MaterialHelper* matHelper = new Assimp::MaterialHelper;
+ aiMaterial* matHelper = new aiMaterial;
// Name
aiString matName( std::string( "SkeletonMaterial"));
diff --git a/code/SkeletonMeshBuilder.h b/code/SkeletonMeshBuilder.h
index ea78aecf966ed34e985e8d344debe0d013e399d4..37bbe73fef8a671a57c83cfa685abe7d5076d9e3 100644
--- a/code/SkeletonMeshBuilder.h
+++ b/code/SkeletonMeshBuilder.h
@@ -62,7 +62,7 @@ namespace Assimp {
* the resembles the node hierarchy. This is useful for file formats
* that don't carry any mesh data but only animation data.
*/
-class ASSIMP_API SkeletonMeshBuilder
+class SkeletonMeshBuilder
{
public:
diff --git a/code/SortByPTypeProcess.h b/code/SortByPTypeProcess.h
index 5297a59d5d19642c2a521661c77c508bcddbd287..4ac750eefd66c5110e7eddc4b1c836813b174f3b 100644
--- a/code/SortByPTypeProcess.h
+++ b/code/SortByPTypeProcess.h
@@ -55,7 +55,7 @@ namespace Assimp {
* A mesh with 5 lines, 3 points and 145 triangles would be split in 3
* submeshes.
*/
-class ASSIMP_API SortByPTypeProcess : public BaseProcess
+class SortByPTypeProcess : public BaseProcess
{
public:
diff --git a/code/SpatialSort.h b/code/SpatialSort.h
index 09aa1f44c822379393cfe3eb1916113064a9d7b4..71efd545e3fd34f27cd791203b3d8f8fdb285e6c 100644
--- a/code/SpatialSort.h
+++ b/code/SpatialSort.h
@@ -56,7 +56,7 @@ namespace Assimp
* time, with O(n) worst case complexity when all vertices lay on the plane. The plane is chosen
* so that it avoids common planes in usual data sets. */
// ------------------------------------------------------------------------------------------------
-class ASSIMP_API SpatialSort
+class SpatialSort
{
public:
diff --git a/code/SplitByBoneCountProcess.h b/code/SplitByBoneCountProcess.h
index 3be117fa3f1a455e401cd8a1b0067b34d81877ee..576a79f05eead66e4b64f5c6bb94a0c3874f47c9 100644
--- a/code/SplitByBoneCountProcess.h
+++ b/code/SplitByBoneCountProcess.h
@@ -59,7 +59,7 @@ namespace Assimp
* Applied BEFORE the JoinVertices-Step occurs.
* Returns NON-UNIQUE vertices, splits by bone count.
*/
-class ASSIMP_API SplitByBoneCountProcess : public BaseProcess
+class SplitByBoneCountProcess : public BaseProcess
{
public:
diff --git a/code/SplitLargeMeshes.h b/code/SplitLargeMeshes.h
index 25f2e31ddcd4813bf6c1800145d671ebcc9cfc24..2239fd99b89cbb7b522d078e9ca15a1ea7612967 100644
--- a/code/SplitLargeMeshes.h
+++ b/code/SplitLargeMeshes.h
@@ -81,7 +81,7 @@ class SplitLargeMeshesProcess_Vertex;
* Applied BEFORE the JoinVertices-Step occurs.
* Returns NON-UNIQUE vertices, splits by triangle number.
*/
-class ASSIMP_API SplitLargeMeshesProcess_Triangle : public BaseProcess
+class SplitLargeMeshesProcess_Triangle : public BaseProcess
{
friend class SplitLargeMeshesProcess_Vertex;
@@ -149,7 +149,7 @@ public:
* Applied AFTER the JoinVertices-Step occurs.
* Returns UNIQUE vertices, splits by vertex number.
*/
-class ASSIMP_API SplitLargeMeshesProcess_Vertex : public BaseProcess
+class SplitLargeMeshesProcess_Vertex : public BaseProcess
{
public:
diff --git a/code/StandardShapes.h b/code/StandardShapes.h
index 83439b7738e0eb8724c8be65cd91f024c49fb0cc..76350c66e5ad69057a45827e7cccefc04bd4b7bb 100644
--- a/code/StandardShapes.h
+++ b/code/StandardShapes.h
@@ -53,7 +53,7 @@ namespace Assimp {
/** \brief Helper class to generate vertex buffers for standard geometric
* shapes, such as cylinders, cones, boxes, spheres, elipsoids ... .
*/
-class ASSIMP_API StandardShapes
+class StandardShapes
{
// class cannot be instanced
StandardShapes() {}
diff --git a/code/Subdivision.h b/code/Subdivision.h
index f3e3bf4eb3af4434a956227e45764aa3ad3718d9..d78ba3afea33ee41e9e41cb4df14d86dfd988544 100644
--- a/code/Subdivision.h
+++ b/code/Subdivision.h
@@ -47,7 +47,7 @@ namespace Assimp {
/** Helper class to evaluate subdivision surfaces. Different algorithms
* are provided for choice. */
// ------------------------------------------------------------------------------
-class ASSIMP_API Subdivider
+class Subdivider
{
public:
diff --git a/code/TargetAnimation.h b/code/TargetAnimation.h
index 047a3dd014a2c3a97e7e7fff19b2fd4842e350d2..63cca30d6057146d5a49da0783c52b37577498c7 100644
--- a/code/TargetAnimation.h
+++ b/code/TargetAnimation.h
@@ -54,7 +54,7 @@ namespace Assimp {
* Missing tracks are interpolated. This is a helper class for
* TargetAnimationHelper, but it can be freely used for other purposes.
*/
-class ASSIMP_API KeyIterator
+class KeyIterator
{
public:
@@ -126,7 +126,7 @@ private:
* channel for the camera/spot light itself and a separate position
* animation channels specifying the position of the camera/spot light
* look-at target */
-class ASSIMP_API TargetAnimationHelper
+class TargetAnimationHelper
{
public:
diff --git a/code/TextureTransform.cpp b/code/TextureTransform.cpp
index dbf2528490af5ba42530e654963697daa760e038..ae8fcbe0999224578706df1bc1c11d3eda34ae8f 100644
--- a/code/TextureTransform.cpp
+++ b/code/TextureTransform.cpp
@@ -236,7 +236,7 @@ void TextureTransformStep::Execute( aiScene* pScene)
// Setup a shortcut structure to allow for a fast updating
// of the UV index later
TTUpdateInfo update;
- update.mat = (MaterialHelper*) mat;
+ update.mat = (aiMaterial*) mat;
update.semantic = prop->mSemantic;
update.index = prop->mIndex;
diff --git a/code/TextureTransform.h b/code/TextureTransform.h
index 1d70f2cd0dd31da924f33031a77c94a3907ee6f1..89fe877c6b487983aaa9e5c574633defbf343c3d 100644
--- a/code/TextureTransform.h
+++ b/code/TextureTransform.h
@@ -72,7 +72,7 @@ struct TTUpdateInfo
unsigned int* directShortcut;
//! Material
- MaterialHelper *mat;
+ aiMaterial *mat;
//! Texture type and index
unsigned int semantic, index;
@@ -188,7 +188,7 @@ struct STransformVecInfo : public aiUVTransform
/** Helper step to compute final UV coordinate sets if there are scalings
* or rotations in the original data read from the file.
*/
-class ASSIMP_API TextureTransformStep : public BaseProcess
+class TextureTransformStep : public BaseProcess
{
public:
diff --git a/code/TriangulateProcess.h b/code/TriangulateProcess.h
index f6fcd6dfbce7c6c25fb9da2090e80eb3f212e511..f26b1ae97b18d0310616d2f1ef5caad32c3b5934 100644
--- a/code/TriangulateProcess.h
+++ b/code/TriangulateProcess.h
@@ -57,7 +57,7 @@ namespace Assimp
* into triangles. You usually want this to happen because the graphics cards
* need their data as triangles.
*/
-class ASSIMP_API TriangulateProcess : public BaseProcess
+class TriangulateProcess : public BaseProcess
{
public:
diff --git a/code/UnrealLoader.cpp b/code/UnrealLoader.cpp
index f69f74206f1f8d0cf2cfe1594813d754c8b34fb3..1f9075045643b18a06265d6a561168af3859e838 100644
--- a/code/UnrealLoader.cpp
+++ b/code/UnrealLoader.cpp
@@ -350,7 +350,7 @@ void UnrealImporter::InternReadFile( const std::string& pFile,
nd->mMeshes[i] = i;
// create materials, too
- MaterialHelper* mat = new MaterialHelper();
+ aiMaterial* mat = new aiMaterial();
pScene->mMaterials[i] = mat;
// all white by default - texture rulez
diff --git a/code/ValidateDataStructure.h b/code/ValidateDataStructure.h
index cd6d56424949d6d580405d97ba7476fa80f84431..8ee05893bbde3e63bc2121d792af246c1278e066 100644
--- a/code/ValidateDataStructure.h
+++ b/code/ValidateDataStructure.h
@@ -62,7 +62,7 @@ namespace Assimp {
/** Validates the whole ASSIMP scene data structure for correctness.
* ImportErrorException is thrown of the scene is corrupt.*/
// --------------------------------------------------------------------------------------
-class ASSIMP_API ValidateDSProcess : public BaseProcess
+class ValidateDSProcess : public BaseProcess
{
public:
diff --git a/code/VertexTriangleAdjacency.h b/code/VertexTriangleAdjacency.h
index 2cf1772ee724f9c65901569a9dc30dc7ab154007..6396334f4bb050750b23f89b465faee2a2181df3 100644
--- a/code/VertexTriangleAdjacency.h
+++ b/code/VertexTriangleAdjacency.h
@@ -56,7 +56,7 @@ namespace Assimp {
* @note Although it is called #VertexTriangleAdjacency, the current version does also
* support arbitrary polygons. */
// --------------------------------------------------------------------------------------------
-class ASSIMP_API VertexTriangleAdjacency
+class VertexTriangleAdjacency
{
public:
diff --git a/code/XFileImporter.cpp b/code/XFileImporter.cpp
index 4c8703ce3a7dbe1db030c978d340b181789f5761..ab9a650ac1861dd784ec24526367008d4341e18a 100644
--- a/code/XFileImporter.cpp
+++ b/code/XFileImporter.cpp
@@ -158,7 +158,7 @@ void XFileImporter::CreateDataRepresentationFromImport( aiScene* pScene, const X
{
pScene->mNumMaterials = 1;
// create the Material
- Assimp::MaterialHelper* mat = new Assimp::MaterialHelper;
+ aiMaterial* mat = new aiMaterial;
int shadeMode = (int) aiShadingMode_Gouraud;
mat->AddProperty<int>( &shadeMode, 1, AI_MATKEY_SHADING_MODEL);
// material colours
@@ -567,7 +567,7 @@ void XFileImporter::ConvertMaterials( aiScene* pScene, const std::vector<XFile::
if( oldMat.mIsReference)
continue;
- Assimp::MaterialHelper* mat = new Assimp::MaterialHelper;
+ aiMaterial* mat = new aiMaterial;
aiString name;
name.Set( oldMat.mName);
mat->AddProperty( &name, AI_MATKEY_NAME);
diff --git a/code/makefile b/code/makefile
index 1ea29fc6e2a2c22784cdf7bf45c8b9cf6fa3c8ee..334d7d3b54d2f46086c5cdfb1115950ff1874658 100644
--- a/code/makefile
+++ b/code/makefile
@@ -39,10 +39,10 @@ RM = /usr/bin/cmake -E remove -f
CMAKE_EDIT_COMMAND = /usr/bin/cmake-gui
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /mnt/hgfs/dev/assimp4.svnc
+CMAKE_SOURCE_DIR = /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /mnt/hgfs/dev/assimp4.svnc
+CMAKE_BINARY_DIR = /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc
#=============================================================================
# Targets provided globally by CMake.
@@ -110,14 +110,14 @@ rebuild_cache/fast: rebuild_cache
# The main all target
all: cmake_check_build_system
- cd /mnt/hgfs/dev/assimp4.svnc && $(CMAKE_COMMAND) -E cmake_progress_start /mnt/hgfs/dev/assimp4.svnc/CMakeFiles /mnt/hgfs/dev/assimp4.svnc/code/CMakeFiles/progress.marks
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/all
- $(CMAKE_COMMAND) -E cmake_progress_start /mnt/hgfs/dev/assimp4.svnc/CMakeFiles 0
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(CMAKE_COMMAND) -E cmake_progress_start /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc/CMakeFiles /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc/code/CMakeFiles/progress.marks
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/clean
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/clean
.PHONY : clean
# The main clean target
@@ -126,22 +126,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/preinstall
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/preinstall
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /mnt/hgfs/dev/assimp4.svnc && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
code/CMakeFiles/assimp.dir/rule:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/CMakeFiles/assimp.dir/rule
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f CMakeFiles/Makefile2 code/CMakeFiles/assimp.dir/rule
.PHONY : code/CMakeFiles/assimp.dir/rule
# Convenience name for target.
@@ -150,7 +150,7 @@ assimp: code/CMakeFiles/assimp.dir/rule
# fast build rule for target.
assimp/fast:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/build
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/build
.PHONY : assimp/fast
3DSConverter.o: 3DSConverter.cpp.o
@@ -158,7 +158,7 @@ assimp/fast:
# target to build an object file
3DSConverter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSConverter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSConverter.cpp.o
.PHONY : 3DSConverter.cpp.o
3DSConverter.i: 3DSConverter.cpp.i
@@ -166,7 +166,7 @@ assimp/fast:
# target to preprocess a source file
3DSConverter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSConverter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSConverter.cpp.i
.PHONY : 3DSConverter.cpp.i
3DSConverter.s: 3DSConverter.cpp.s
@@ -174,7 +174,7 @@ assimp/fast:
# target to generate assembly for a file
3DSConverter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSConverter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSConverter.cpp.s
.PHONY : 3DSConverter.cpp.s
3DSLoader.o: 3DSLoader.cpp.o
@@ -182,7 +182,7 @@ assimp/fast:
# target to build an object file
3DSLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSLoader.cpp.o
.PHONY : 3DSLoader.cpp.o
3DSLoader.i: 3DSLoader.cpp.i
@@ -190,7 +190,7 @@ assimp/fast:
# target to preprocess a source file
3DSLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSLoader.cpp.i
.PHONY : 3DSLoader.cpp.i
3DSLoader.s: 3DSLoader.cpp.s
@@ -198,7 +198,7 @@ assimp/fast:
# target to generate assembly for a file
3DSLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/3DSLoader.cpp.s
.PHONY : 3DSLoader.cpp.s
ACLoader.o: ACLoader.cpp.o
@@ -206,7 +206,7 @@ ACLoader.o: ACLoader.cpp.o
# target to build an object file
ACLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ACLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ACLoader.cpp.o
.PHONY : ACLoader.cpp.o
ACLoader.i: ACLoader.cpp.i
@@ -214,7 +214,7 @@ ACLoader.i: ACLoader.cpp.i
# target to preprocess a source file
ACLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ACLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ACLoader.cpp.i
.PHONY : ACLoader.cpp.i
ACLoader.s: ACLoader.cpp.s
@@ -222,7 +222,7 @@ ACLoader.s: ACLoader.cpp.s
# target to generate assembly for a file
ACLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ACLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ACLoader.cpp.s
.PHONY : ACLoader.cpp.s
ASELoader.o: ASELoader.cpp.o
@@ -230,7 +230,7 @@ ASELoader.o: ASELoader.cpp.o
# target to build an object file
ASELoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASELoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASELoader.cpp.o
.PHONY : ASELoader.cpp.o
ASELoader.i: ASELoader.cpp.i
@@ -238,7 +238,7 @@ ASELoader.i: ASELoader.cpp.i
# target to preprocess a source file
ASELoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASELoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASELoader.cpp.i
.PHONY : ASELoader.cpp.i
ASELoader.s: ASELoader.cpp.s
@@ -246,7 +246,7 @@ ASELoader.s: ASELoader.cpp.s
# target to generate assembly for a file
ASELoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASELoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASELoader.cpp.s
.PHONY : ASELoader.cpp.s
ASEParser.o: ASEParser.cpp.o
@@ -254,7 +254,7 @@ ASEParser.o: ASEParser.cpp.o
# target to build an object file
ASEParser.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASEParser.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASEParser.cpp.o
.PHONY : ASEParser.cpp.o
ASEParser.i: ASEParser.cpp.i
@@ -262,7 +262,7 @@ ASEParser.i: ASEParser.cpp.i
# target to preprocess a source file
ASEParser.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASEParser.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASEParser.cpp.i
.PHONY : ASEParser.cpp.i
ASEParser.s: ASEParser.cpp.s
@@ -270,7 +270,7 @@ ASEParser.s: ASEParser.cpp.s
# target to generate assembly for a file
ASEParser.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASEParser.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ASEParser.cpp.s
.PHONY : ASEParser.cpp.s
Assimp.o: Assimp.cpp.o
@@ -278,7 +278,7 @@ Assimp.o: Assimp.cpp.o
# target to build an object file
Assimp.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Assimp.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Assimp.cpp.o
.PHONY : Assimp.cpp.o
Assimp.i: Assimp.cpp.i
@@ -286,7 +286,7 @@ Assimp.i: Assimp.cpp.i
# target to preprocess a source file
Assimp.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Assimp.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Assimp.cpp.i
.PHONY : Assimp.cpp.i
Assimp.s: Assimp.cpp.s
@@ -294,7 +294,7 @@ Assimp.s: Assimp.cpp.s
# target to generate assembly for a file
Assimp.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Assimp.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Assimp.cpp.s
.PHONY : Assimp.cpp.s
AssimpCExport.o: AssimpCExport.cpp.o
@@ -302,7 +302,7 @@ AssimpCExport.o: AssimpCExport.cpp.o
# target to build an object file
AssimpCExport.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpCExport.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpCExport.cpp.o
.PHONY : AssimpCExport.cpp.o
AssimpCExport.i: AssimpCExport.cpp.i
@@ -310,7 +310,7 @@ AssimpCExport.i: AssimpCExport.cpp.i
# target to preprocess a source file
AssimpCExport.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpCExport.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpCExport.cpp.i
.PHONY : AssimpCExport.cpp.i
AssimpCExport.s: AssimpCExport.cpp.s
@@ -318,7 +318,7 @@ AssimpCExport.s: AssimpCExport.cpp.s
# target to generate assembly for a file
AssimpCExport.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpCExport.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpCExport.cpp.s
.PHONY : AssimpCExport.cpp.s
AssimpPCH.o: AssimpPCH.cpp.o
@@ -326,7 +326,7 @@ AssimpPCH.o: AssimpPCH.cpp.o
# target to build an object file
AssimpPCH.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpPCH.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpPCH.cpp.o
.PHONY : AssimpPCH.cpp.o
AssimpPCH.i: AssimpPCH.cpp.i
@@ -334,7 +334,7 @@ AssimpPCH.i: AssimpPCH.cpp.i
# target to preprocess a source file
AssimpPCH.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpPCH.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpPCH.cpp.i
.PHONY : AssimpPCH.cpp.i
AssimpPCH.s: AssimpPCH.cpp.s
@@ -342,7 +342,7 @@ AssimpPCH.s: AssimpPCH.cpp.s
# target to generate assembly for a file
AssimpPCH.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpPCH.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/AssimpPCH.cpp.s
.PHONY : AssimpPCH.cpp.s
B3DImporter.o: B3DImporter.cpp.o
@@ -350,7 +350,7 @@ B3DImporter.o: B3DImporter.cpp.o
# target to build an object file
B3DImporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/B3DImporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/B3DImporter.cpp.o
.PHONY : B3DImporter.cpp.o
B3DImporter.i: B3DImporter.cpp.i
@@ -358,7 +358,7 @@ B3DImporter.i: B3DImporter.cpp.i
# target to preprocess a source file
B3DImporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/B3DImporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/B3DImporter.cpp.i
.PHONY : B3DImporter.cpp.i
B3DImporter.s: B3DImporter.cpp.s
@@ -366,7 +366,7 @@ B3DImporter.s: B3DImporter.cpp.s
# target to generate assembly for a file
B3DImporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/B3DImporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/B3DImporter.cpp.s
.PHONY : B3DImporter.cpp.s
BVHLoader.o: BVHLoader.cpp.o
@@ -374,7 +374,7 @@ BVHLoader.o: BVHLoader.cpp.o
# target to build an object file
BVHLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BVHLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BVHLoader.cpp.o
.PHONY : BVHLoader.cpp.o
BVHLoader.i: BVHLoader.cpp.i
@@ -382,7 +382,7 @@ BVHLoader.i: BVHLoader.cpp.i
# target to preprocess a source file
BVHLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BVHLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BVHLoader.cpp.i
.PHONY : BVHLoader.cpp.i
BVHLoader.s: BVHLoader.cpp.s
@@ -390,7 +390,7 @@ BVHLoader.s: BVHLoader.cpp.s
# target to generate assembly for a file
BVHLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BVHLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BVHLoader.cpp.s
.PHONY : BVHLoader.cpp.s
BaseImporter.o: BaseImporter.cpp.o
@@ -398,7 +398,7 @@ BaseImporter.o: BaseImporter.cpp.o
# target to build an object file
BaseImporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseImporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseImporter.cpp.o
.PHONY : BaseImporter.cpp.o
BaseImporter.i: BaseImporter.cpp.i
@@ -406,7 +406,7 @@ BaseImporter.i: BaseImporter.cpp.i
# target to preprocess a source file
BaseImporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseImporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseImporter.cpp.i
.PHONY : BaseImporter.cpp.i
BaseImporter.s: BaseImporter.cpp.s
@@ -414,7 +414,7 @@ BaseImporter.s: BaseImporter.cpp.s
# target to generate assembly for a file
BaseImporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseImporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseImporter.cpp.s
.PHONY : BaseImporter.cpp.s
BaseProcess.o: BaseProcess.cpp.o
@@ -422,7 +422,7 @@ BaseProcess.o: BaseProcess.cpp.o
# target to build an object file
BaseProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseProcess.cpp.o
.PHONY : BaseProcess.cpp.o
BaseProcess.i: BaseProcess.cpp.i
@@ -430,7 +430,7 @@ BaseProcess.i: BaseProcess.cpp.i
# target to preprocess a source file
BaseProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseProcess.cpp.i
.PHONY : BaseProcess.cpp.i
BaseProcess.s: BaseProcess.cpp.s
@@ -438,7 +438,7 @@ BaseProcess.s: BaseProcess.cpp.s
# target to generate assembly for a file
BaseProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BaseProcess.cpp.s
.PHONY : BaseProcess.cpp.s
BlenderDNA.o: BlenderDNA.cpp.o
@@ -446,7 +446,7 @@ BlenderDNA.o: BlenderDNA.cpp.o
# target to build an object file
BlenderDNA.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderDNA.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderDNA.cpp.o
.PHONY : BlenderDNA.cpp.o
BlenderDNA.i: BlenderDNA.cpp.i
@@ -454,7 +454,7 @@ BlenderDNA.i: BlenderDNA.cpp.i
# target to preprocess a source file
BlenderDNA.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderDNA.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderDNA.cpp.i
.PHONY : BlenderDNA.cpp.i
BlenderDNA.s: BlenderDNA.cpp.s
@@ -462,7 +462,7 @@ BlenderDNA.s: BlenderDNA.cpp.s
# target to generate assembly for a file
BlenderDNA.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderDNA.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderDNA.cpp.s
.PHONY : BlenderDNA.cpp.s
BlenderLoader.o: BlenderLoader.cpp.o
@@ -470,7 +470,7 @@ BlenderLoader.o: BlenderLoader.cpp.o
# target to build an object file
BlenderLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderLoader.cpp.o
.PHONY : BlenderLoader.cpp.o
BlenderLoader.i: BlenderLoader.cpp.i
@@ -478,7 +478,7 @@ BlenderLoader.i: BlenderLoader.cpp.i
# target to preprocess a source file
BlenderLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderLoader.cpp.i
.PHONY : BlenderLoader.cpp.i
BlenderLoader.s: BlenderLoader.cpp.s
@@ -486,7 +486,7 @@ BlenderLoader.s: BlenderLoader.cpp.s
# target to generate assembly for a file
BlenderLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderLoader.cpp.s
.PHONY : BlenderLoader.cpp.s
BlenderModifier.o: BlenderModifier.cpp.o
@@ -494,7 +494,7 @@ BlenderModifier.o: BlenderModifier.cpp.o
# target to build an object file
BlenderModifier.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderModifier.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderModifier.cpp.o
.PHONY : BlenderModifier.cpp.o
BlenderModifier.i: BlenderModifier.cpp.i
@@ -502,7 +502,7 @@ BlenderModifier.i: BlenderModifier.cpp.i
# target to preprocess a source file
BlenderModifier.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderModifier.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderModifier.cpp.i
.PHONY : BlenderModifier.cpp.i
BlenderModifier.s: BlenderModifier.cpp.s
@@ -510,7 +510,7 @@ BlenderModifier.s: BlenderModifier.cpp.s
# target to generate assembly for a file
BlenderModifier.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderModifier.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderModifier.cpp.s
.PHONY : BlenderModifier.cpp.s
BlenderScene.o: BlenderScene.cpp.o
@@ -518,7 +518,7 @@ BlenderScene.o: BlenderScene.cpp.o
# target to build an object file
BlenderScene.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderScene.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderScene.cpp.o
.PHONY : BlenderScene.cpp.o
BlenderScene.i: BlenderScene.cpp.i
@@ -526,7 +526,7 @@ BlenderScene.i: BlenderScene.cpp.i
# target to preprocess a source file
BlenderScene.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderScene.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderScene.cpp.i
.PHONY : BlenderScene.cpp.i
BlenderScene.s: BlenderScene.cpp.s
@@ -534,7 +534,7 @@ BlenderScene.s: BlenderScene.cpp.s
# target to generate assembly for a file
BlenderScene.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderScene.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/BlenderScene.cpp.s
.PHONY : BlenderScene.cpp.s
COBLoader.o: COBLoader.cpp.o
@@ -542,7 +542,7 @@ COBLoader.o: COBLoader.cpp.o
# target to build an object file
COBLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/COBLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/COBLoader.cpp.o
.PHONY : COBLoader.cpp.o
COBLoader.i: COBLoader.cpp.i
@@ -550,7 +550,7 @@ COBLoader.i: COBLoader.cpp.i
# target to preprocess a source file
COBLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/COBLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/COBLoader.cpp.i
.PHONY : COBLoader.cpp.i
COBLoader.s: COBLoader.cpp.s
@@ -558,7 +558,7 @@ COBLoader.s: COBLoader.cpp.s
# target to generate assembly for a file
COBLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/COBLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/COBLoader.cpp.s
.PHONY : COBLoader.cpp.s
CSMLoader.o: CSMLoader.cpp.o
@@ -566,7 +566,7 @@ CSMLoader.o: CSMLoader.cpp.o
# target to build an object file
CSMLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CSMLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CSMLoader.cpp.o
.PHONY : CSMLoader.cpp.o
CSMLoader.i: CSMLoader.cpp.i
@@ -574,7 +574,7 @@ CSMLoader.i: CSMLoader.cpp.i
# target to preprocess a source file
CSMLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CSMLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CSMLoader.cpp.i
.PHONY : CSMLoader.cpp.i
CSMLoader.s: CSMLoader.cpp.s
@@ -582,7 +582,7 @@ CSMLoader.s: CSMLoader.cpp.s
# target to generate assembly for a file
CSMLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CSMLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CSMLoader.cpp.s
.PHONY : CSMLoader.cpp.s
CalcTangentsProcess.o: CalcTangentsProcess.cpp.o
@@ -590,7 +590,7 @@ CalcTangentsProcess.o: CalcTangentsProcess.cpp.o
# target to build an object file
CalcTangentsProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CalcTangentsProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CalcTangentsProcess.cpp.o
.PHONY : CalcTangentsProcess.cpp.o
CalcTangentsProcess.i: CalcTangentsProcess.cpp.i
@@ -598,7 +598,7 @@ CalcTangentsProcess.i: CalcTangentsProcess.cpp.i
# target to preprocess a source file
CalcTangentsProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CalcTangentsProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CalcTangentsProcess.cpp.i
.PHONY : CalcTangentsProcess.cpp.i
CalcTangentsProcess.s: CalcTangentsProcess.cpp.s
@@ -606,7 +606,7 @@ CalcTangentsProcess.s: CalcTangentsProcess.cpp.s
# target to generate assembly for a file
CalcTangentsProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CalcTangentsProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/CalcTangentsProcess.cpp.s
.PHONY : CalcTangentsProcess.cpp.s
ColladaExporter.o: ColladaExporter.cpp.o
@@ -614,7 +614,7 @@ ColladaExporter.o: ColladaExporter.cpp.o
# target to build an object file
ColladaExporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaExporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaExporter.cpp.o
.PHONY : ColladaExporter.cpp.o
ColladaExporter.i: ColladaExporter.cpp.i
@@ -622,7 +622,7 @@ ColladaExporter.i: ColladaExporter.cpp.i
# target to preprocess a source file
ColladaExporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaExporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaExporter.cpp.i
.PHONY : ColladaExporter.cpp.i
ColladaExporter.s: ColladaExporter.cpp.s
@@ -630,7 +630,7 @@ ColladaExporter.s: ColladaExporter.cpp.s
# target to generate assembly for a file
ColladaExporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaExporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaExporter.cpp.s
.PHONY : ColladaExporter.cpp.s
ColladaLoader.o: ColladaLoader.cpp.o
@@ -638,7 +638,7 @@ ColladaLoader.o: ColladaLoader.cpp.o
# target to build an object file
ColladaLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaLoader.cpp.o
.PHONY : ColladaLoader.cpp.o
ColladaLoader.i: ColladaLoader.cpp.i
@@ -646,7 +646,7 @@ ColladaLoader.i: ColladaLoader.cpp.i
# target to preprocess a source file
ColladaLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaLoader.cpp.i
.PHONY : ColladaLoader.cpp.i
ColladaLoader.s: ColladaLoader.cpp.s
@@ -654,7 +654,7 @@ ColladaLoader.s: ColladaLoader.cpp.s
# target to generate assembly for a file
ColladaLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaLoader.cpp.s
.PHONY : ColladaLoader.cpp.s
ColladaParser.o: ColladaParser.cpp.o
@@ -662,7 +662,7 @@ ColladaParser.o: ColladaParser.cpp.o
# target to build an object file
ColladaParser.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaParser.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaParser.cpp.o
.PHONY : ColladaParser.cpp.o
ColladaParser.i: ColladaParser.cpp.i
@@ -670,7 +670,7 @@ ColladaParser.i: ColladaParser.cpp.i
# target to preprocess a source file
ColladaParser.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaParser.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaParser.cpp.i
.PHONY : ColladaParser.cpp.i
ColladaParser.s: ColladaParser.cpp.s
@@ -678,7 +678,7 @@ ColladaParser.s: ColladaParser.cpp.s
# target to generate assembly for a file
ColladaParser.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaParser.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ColladaParser.cpp.s
.PHONY : ColladaParser.cpp.s
ComputeUVMappingProcess.o: ComputeUVMappingProcess.cpp.o
@@ -686,7 +686,7 @@ ComputeUVMappingProcess.o: ComputeUVMappingProcess.cpp.o
# target to build an object file
ComputeUVMappingProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ComputeUVMappingProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ComputeUVMappingProcess.cpp.o
.PHONY : ComputeUVMappingProcess.cpp.o
ComputeUVMappingProcess.i: ComputeUVMappingProcess.cpp.i
@@ -694,7 +694,7 @@ ComputeUVMappingProcess.i: ComputeUVMappingProcess.cpp.i
# target to preprocess a source file
ComputeUVMappingProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ComputeUVMappingProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ComputeUVMappingProcess.cpp.i
.PHONY : ComputeUVMappingProcess.cpp.i
ComputeUVMappingProcess.s: ComputeUVMappingProcess.cpp.s
@@ -702,7 +702,7 @@ ComputeUVMappingProcess.s: ComputeUVMappingProcess.cpp.s
# target to generate assembly for a file
ComputeUVMappingProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ComputeUVMappingProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ComputeUVMappingProcess.cpp.s
.PHONY : ComputeUVMappingProcess.cpp.s
ConvertToLHProcess.o: ConvertToLHProcess.cpp.o
@@ -710,7 +710,7 @@ ConvertToLHProcess.o: ConvertToLHProcess.cpp.o
# target to build an object file
ConvertToLHProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ConvertToLHProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ConvertToLHProcess.cpp.o
.PHONY : ConvertToLHProcess.cpp.o
ConvertToLHProcess.i: ConvertToLHProcess.cpp.i
@@ -718,7 +718,7 @@ ConvertToLHProcess.i: ConvertToLHProcess.cpp.i
# target to preprocess a source file
ConvertToLHProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ConvertToLHProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ConvertToLHProcess.cpp.i
.PHONY : ConvertToLHProcess.cpp.i
ConvertToLHProcess.s: ConvertToLHProcess.cpp.s
@@ -726,7 +726,7 @@ ConvertToLHProcess.s: ConvertToLHProcess.cpp.s
# target to generate assembly for a file
ConvertToLHProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ConvertToLHProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ConvertToLHProcess.cpp.s
.PHONY : ConvertToLHProcess.cpp.s
DXFLoader.o: DXFLoader.cpp.o
@@ -734,7 +734,7 @@ DXFLoader.o: DXFLoader.cpp.o
# target to build an object file
DXFLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DXFLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DXFLoader.cpp.o
.PHONY : DXFLoader.cpp.o
DXFLoader.i: DXFLoader.cpp.i
@@ -742,7 +742,7 @@ DXFLoader.i: DXFLoader.cpp.i
# target to preprocess a source file
DXFLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DXFLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DXFLoader.cpp.i
.PHONY : DXFLoader.cpp.i
DXFLoader.s: DXFLoader.cpp.s
@@ -750,7 +750,7 @@ DXFLoader.s: DXFLoader.cpp.s
# target to generate assembly for a file
DXFLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DXFLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DXFLoader.cpp.s
.PHONY : DXFLoader.cpp.s
DeboneProcess.o: DeboneProcess.cpp.o
@@ -758,7 +758,7 @@ DeboneProcess.o: DeboneProcess.cpp.o
# target to build an object file
DeboneProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DeboneProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DeboneProcess.cpp.o
.PHONY : DeboneProcess.cpp.o
DeboneProcess.i: DeboneProcess.cpp.i
@@ -766,7 +766,7 @@ DeboneProcess.i: DeboneProcess.cpp.i
# target to preprocess a source file
DeboneProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DeboneProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DeboneProcess.cpp.i
.PHONY : DeboneProcess.cpp.i
DeboneProcess.s: DeboneProcess.cpp.s
@@ -774,7 +774,7 @@ DeboneProcess.s: DeboneProcess.cpp.s
# target to generate assembly for a file
DeboneProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DeboneProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DeboneProcess.cpp.s
.PHONY : DeboneProcess.cpp.s
DefaultIOStream.o: DefaultIOStream.cpp.o
@@ -782,7 +782,7 @@ DefaultIOStream.o: DefaultIOStream.cpp.o
# target to build an object file
DefaultIOStream.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOStream.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOStream.cpp.o
.PHONY : DefaultIOStream.cpp.o
DefaultIOStream.i: DefaultIOStream.cpp.i
@@ -790,7 +790,7 @@ DefaultIOStream.i: DefaultIOStream.cpp.i
# target to preprocess a source file
DefaultIOStream.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOStream.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOStream.cpp.i
.PHONY : DefaultIOStream.cpp.i
DefaultIOStream.s: DefaultIOStream.cpp.s
@@ -798,7 +798,7 @@ DefaultIOStream.s: DefaultIOStream.cpp.s
# target to generate assembly for a file
DefaultIOStream.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOStream.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOStream.cpp.s
.PHONY : DefaultIOStream.cpp.s
DefaultIOSystem.o: DefaultIOSystem.cpp.o
@@ -806,7 +806,7 @@ DefaultIOSystem.o: DefaultIOSystem.cpp.o
# target to build an object file
DefaultIOSystem.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOSystem.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOSystem.cpp.o
.PHONY : DefaultIOSystem.cpp.o
DefaultIOSystem.i: DefaultIOSystem.cpp.i
@@ -814,7 +814,7 @@ DefaultIOSystem.i: DefaultIOSystem.cpp.i
# target to preprocess a source file
DefaultIOSystem.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOSystem.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOSystem.cpp.i
.PHONY : DefaultIOSystem.cpp.i
DefaultIOSystem.s: DefaultIOSystem.cpp.s
@@ -822,7 +822,7 @@ DefaultIOSystem.s: DefaultIOSystem.cpp.s
# target to generate assembly for a file
DefaultIOSystem.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOSystem.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultIOSystem.cpp.s
.PHONY : DefaultIOSystem.cpp.s
DefaultLogger.o: DefaultLogger.cpp.o
@@ -830,7 +830,7 @@ DefaultLogger.o: DefaultLogger.cpp.o
# target to build an object file
DefaultLogger.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultLogger.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultLogger.cpp.o
.PHONY : DefaultLogger.cpp.o
DefaultLogger.i: DefaultLogger.cpp.i
@@ -838,7 +838,7 @@ DefaultLogger.i: DefaultLogger.cpp.i
# target to preprocess a source file
DefaultLogger.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultLogger.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultLogger.cpp.i
.PHONY : DefaultLogger.cpp.i
DefaultLogger.s: DefaultLogger.cpp.s
@@ -846,7 +846,7 @@ DefaultLogger.s: DefaultLogger.cpp.s
# target to generate assembly for a file
DefaultLogger.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultLogger.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/DefaultLogger.cpp.s
.PHONY : DefaultLogger.cpp.s
Exporter.o: Exporter.cpp.o
@@ -854,7 +854,7 @@ Exporter.o: Exporter.cpp.o
# target to build an object file
Exporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Exporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Exporter.cpp.o
.PHONY : Exporter.cpp.o
Exporter.i: Exporter.cpp.i
@@ -862,7 +862,7 @@ Exporter.i: Exporter.cpp.i
# target to preprocess a source file
Exporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Exporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Exporter.cpp.i
.PHONY : Exporter.cpp.i
Exporter.s: Exporter.cpp.s
@@ -870,7 +870,7 @@ Exporter.s: Exporter.cpp.s
# target to generate assembly for a file
Exporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Exporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Exporter.cpp.s
.PHONY : Exporter.cpp.s
FindDegenerates.o: FindDegenerates.cpp.o
@@ -878,7 +878,7 @@ FindDegenerates.o: FindDegenerates.cpp.o
# target to build an object file
FindDegenerates.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindDegenerates.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindDegenerates.cpp.o
.PHONY : FindDegenerates.cpp.o
FindDegenerates.i: FindDegenerates.cpp.i
@@ -886,7 +886,7 @@ FindDegenerates.i: FindDegenerates.cpp.i
# target to preprocess a source file
FindDegenerates.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindDegenerates.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindDegenerates.cpp.i
.PHONY : FindDegenerates.cpp.i
FindDegenerates.s: FindDegenerates.cpp.s
@@ -894,7 +894,7 @@ FindDegenerates.s: FindDegenerates.cpp.s
# target to generate assembly for a file
FindDegenerates.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindDegenerates.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindDegenerates.cpp.s
.PHONY : FindDegenerates.cpp.s
FindInstancesProcess.o: FindInstancesProcess.cpp.o
@@ -902,7 +902,7 @@ FindInstancesProcess.o: FindInstancesProcess.cpp.o
# target to build an object file
FindInstancesProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInstancesProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInstancesProcess.cpp.o
.PHONY : FindInstancesProcess.cpp.o
FindInstancesProcess.i: FindInstancesProcess.cpp.i
@@ -910,7 +910,7 @@ FindInstancesProcess.i: FindInstancesProcess.cpp.i
# target to preprocess a source file
FindInstancesProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInstancesProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInstancesProcess.cpp.i
.PHONY : FindInstancesProcess.cpp.i
FindInstancesProcess.s: FindInstancesProcess.cpp.s
@@ -918,7 +918,7 @@ FindInstancesProcess.s: FindInstancesProcess.cpp.s
# target to generate assembly for a file
FindInstancesProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInstancesProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInstancesProcess.cpp.s
.PHONY : FindInstancesProcess.cpp.s
FindInvalidDataProcess.o: FindInvalidDataProcess.cpp.o
@@ -926,7 +926,7 @@ FindInvalidDataProcess.o: FindInvalidDataProcess.cpp.o
# target to build an object file
FindInvalidDataProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInvalidDataProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInvalidDataProcess.cpp.o
.PHONY : FindInvalidDataProcess.cpp.o
FindInvalidDataProcess.i: FindInvalidDataProcess.cpp.i
@@ -934,7 +934,7 @@ FindInvalidDataProcess.i: FindInvalidDataProcess.cpp.i
# target to preprocess a source file
FindInvalidDataProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInvalidDataProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInvalidDataProcess.cpp.i
.PHONY : FindInvalidDataProcess.cpp.i
FindInvalidDataProcess.s: FindInvalidDataProcess.cpp.s
@@ -942,7 +942,7 @@ FindInvalidDataProcess.s: FindInvalidDataProcess.cpp.s
# target to generate assembly for a file
FindInvalidDataProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInvalidDataProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FindInvalidDataProcess.cpp.s
.PHONY : FindInvalidDataProcess.cpp.s
FixNormalsStep.o: FixNormalsStep.cpp.o
@@ -950,7 +950,7 @@ FixNormalsStep.o: FixNormalsStep.cpp.o
# target to build an object file
FixNormalsStep.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FixNormalsStep.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FixNormalsStep.cpp.o
.PHONY : FixNormalsStep.cpp.o
FixNormalsStep.i: FixNormalsStep.cpp.i
@@ -958,7 +958,7 @@ FixNormalsStep.i: FixNormalsStep.cpp.i
# target to preprocess a source file
FixNormalsStep.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FixNormalsStep.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FixNormalsStep.cpp.i
.PHONY : FixNormalsStep.cpp.i
FixNormalsStep.s: FixNormalsStep.cpp.s
@@ -966,7 +966,7 @@ FixNormalsStep.s: FixNormalsStep.cpp.s
# target to generate assembly for a file
FixNormalsStep.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FixNormalsStep.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/FixNormalsStep.cpp.s
.PHONY : FixNormalsStep.cpp.s
GenFaceNormalsProcess.o: GenFaceNormalsProcess.cpp.o
@@ -974,7 +974,7 @@ GenFaceNormalsProcess.o: GenFaceNormalsProcess.cpp.o
# target to build an object file
GenFaceNormalsProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenFaceNormalsProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenFaceNormalsProcess.cpp.o
.PHONY : GenFaceNormalsProcess.cpp.o
GenFaceNormalsProcess.i: GenFaceNormalsProcess.cpp.i
@@ -982,7 +982,7 @@ GenFaceNormalsProcess.i: GenFaceNormalsProcess.cpp.i
# target to preprocess a source file
GenFaceNormalsProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenFaceNormalsProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenFaceNormalsProcess.cpp.i
.PHONY : GenFaceNormalsProcess.cpp.i
GenFaceNormalsProcess.s: GenFaceNormalsProcess.cpp.s
@@ -990,7 +990,7 @@ GenFaceNormalsProcess.s: GenFaceNormalsProcess.cpp.s
# target to generate assembly for a file
GenFaceNormalsProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenFaceNormalsProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenFaceNormalsProcess.cpp.s
.PHONY : GenFaceNormalsProcess.cpp.s
GenVertexNormalsProcess.o: GenVertexNormalsProcess.cpp.o
@@ -998,7 +998,7 @@ GenVertexNormalsProcess.o: GenVertexNormalsProcess.cpp.o
# target to build an object file
GenVertexNormalsProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenVertexNormalsProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenVertexNormalsProcess.cpp.o
.PHONY : GenVertexNormalsProcess.cpp.o
GenVertexNormalsProcess.i: GenVertexNormalsProcess.cpp.i
@@ -1006,7 +1006,7 @@ GenVertexNormalsProcess.i: GenVertexNormalsProcess.cpp.i
# target to preprocess a source file
GenVertexNormalsProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenVertexNormalsProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenVertexNormalsProcess.cpp.i
.PHONY : GenVertexNormalsProcess.cpp.i
GenVertexNormalsProcess.s: GenVertexNormalsProcess.cpp.s
@@ -1014,7 +1014,7 @@ GenVertexNormalsProcess.s: GenVertexNormalsProcess.cpp.s
# target to generate assembly for a file
GenVertexNormalsProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenVertexNormalsProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/GenVertexNormalsProcess.cpp.s
.PHONY : GenVertexNormalsProcess.cpp.s
HMPLoader.o: HMPLoader.cpp.o
@@ -1022,7 +1022,7 @@ HMPLoader.o: HMPLoader.cpp.o
# target to build an object file
HMPLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/HMPLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/HMPLoader.cpp.o
.PHONY : HMPLoader.cpp.o
HMPLoader.i: HMPLoader.cpp.i
@@ -1030,7 +1030,7 @@ HMPLoader.i: HMPLoader.cpp.i
# target to preprocess a source file
HMPLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/HMPLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/HMPLoader.cpp.i
.PHONY : HMPLoader.cpp.i
HMPLoader.s: HMPLoader.cpp.s
@@ -1038,7 +1038,7 @@ HMPLoader.s: HMPLoader.cpp.s
# target to generate assembly for a file
HMPLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/HMPLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/HMPLoader.cpp.s
.PHONY : HMPLoader.cpp.s
IFCCurve.o: IFCCurve.cpp.o
@@ -1046,7 +1046,7 @@ IFCCurve.o: IFCCurve.cpp.o
# target to build an object file
IFCCurve.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCCurve.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCCurve.cpp.o
.PHONY : IFCCurve.cpp.o
IFCCurve.i: IFCCurve.cpp.i
@@ -1054,7 +1054,7 @@ IFCCurve.i: IFCCurve.cpp.i
# target to preprocess a source file
IFCCurve.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCCurve.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCCurve.cpp.i
.PHONY : IFCCurve.cpp.i
IFCCurve.s: IFCCurve.cpp.s
@@ -1062,7 +1062,7 @@ IFCCurve.s: IFCCurve.cpp.s
# target to generate assembly for a file
IFCCurve.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCCurve.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCCurve.cpp.s
.PHONY : IFCCurve.cpp.s
IFCGeometry.o: IFCGeometry.cpp.o
@@ -1070,7 +1070,7 @@ IFCGeometry.o: IFCGeometry.cpp.o
# target to build an object file
IFCGeometry.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCGeometry.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCGeometry.cpp.o
.PHONY : IFCGeometry.cpp.o
IFCGeometry.i: IFCGeometry.cpp.i
@@ -1078,7 +1078,7 @@ IFCGeometry.i: IFCGeometry.cpp.i
# target to preprocess a source file
IFCGeometry.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCGeometry.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCGeometry.cpp.i
.PHONY : IFCGeometry.cpp.i
IFCGeometry.s: IFCGeometry.cpp.s
@@ -1086,7 +1086,7 @@ IFCGeometry.s: IFCGeometry.cpp.s
# target to generate assembly for a file
IFCGeometry.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCGeometry.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCGeometry.cpp.s
.PHONY : IFCGeometry.cpp.s
IFCLoader.o: IFCLoader.cpp.o
@@ -1094,7 +1094,7 @@ IFCLoader.o: IFCLoader.cpp.o
# target to build an object file
IFCLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCLoader.cpp.o
.PHONY : IFCLoader.cpp.o
IFCLoader.i: IFCLoader.cpp.i
@@ -1102,7 +1102,7 @@ IFCLoader.i: IFCLoader.cpp.i
# target to preprocess a source file
IFCLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCLoader.cpp.i
.PHONY : IFCLoader.cpp.i
IFCLoader.s: IFCLoader.cpp.s
@@ -1110,7 +1110,7 @@ IFCLoader.s: IFCLoader.cpp.s
# target to generate assembly for a file
IFCLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCLoader.cpp.s
.PHONY : IFCLoader.cpp.s
IFCMaterial.o: IFCMaterial.cpp.o
@@ -1118,7 +1118,7 @@ IFCMaterial.o: IFCMaterial.cpp.o
# target to build an object file
IFCMaterial.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCMaterial.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCMaterial.cpp.o
.PHONY : IFCMaterial.cpp.o
IFCMaterial.i: IFCMaterial.cpp.i
@@ -1126,7 +1126,7 @@ IFCMaterial.i: IFCMaterial.cpp.i
# target to preprocess a source file
IFCMaterial.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCMaterial.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCMaterial.cpp.i
.PHONY : IFCMaterial.cpp.i
IFCMaterial.s: IFCMaterial.cpp.s
@@ -1134,7 +1134,7 @@ IFCMaterial.s: IFCMaterial.cpp.s
# target to generate assembly for a file
IFCMaterial.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCMaterial.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCMaterial.cpp.s
.PHONY : IFCMaterial.cpp.s
IFCProfile.o: IFCProfile.cpp.o
@@ -1142,7 +1142,7 @@ IFCProfile.o: IFCProfile.cpp.o
# target to build an object file
IFCProfile.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCProfile.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCProfile.cpp.o
.PHONY : IFCProfile.cpp.o
IFCProfile.i: IFCProfile.cpp.i
@@ -1150,7 +1150,7 @@ IFCProfile.i: IFCProfile.cpp.i
# target to preprocess a source file
IFCProfile.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCProfile.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCProfile.cpp.i
.PHONY : IFCProfile.cpp.i
IFCProfile.s: IFCProfile.cpp.s
@@ -1158,7 +1158,7 @@ IFCProfile.s: IFCProfile.cpp.s
# target to generate assembly for a file
IFCProfile.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCProfile.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCProfile.cpp.s
.PHONY : IFCProfile.cpp.s
IFCReaderGen.o: IFCReaderGen.cpp.o
@@ -1166,7 +1166,7 @@ IFCReaderGen.o: IFCReaderGen.cpp.o
# target to build an object file
IFCReaderGen.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCReaderGen.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCReaderGen.cpp.o
.PHONY : IFCReaderGen.cpp.o
IFCReaderGen.i: IFCReaderGen.cpp.i
@@ -1174,7 +1174,7 @@ IFCReaderGen.i: IFCReaderGen.cpp.i
# target to preprocess a source file
IFCReaderGen.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCReaderGen.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCReaderGen.cpp.i
.PHONY : IFCReaderGen.cpp.i
IFCReaderGen.s: IFCReaderGen.cpp.s
@@ -1182,7 +1182,7 @@ IFCReaderGen.s: IFCReaderGen.cpp.s
# target to generate assembly for a file
IFCReaderGen.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCReaderGen.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCReaderGen.cpp.s
.PHONY : IFCReaderGen.cpp.s
IFCUtil.o: IFCUtil.cpp.o
@@ -1190,7 +1190,7 @@ IFCUtil.o: IFCUtil.cpp.o
# target to build an object file
IFCUtil.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCUtil.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCUtil.cpp.o
.PHONY : IFCUtil.cpp.o
IFCUtil.i: IFCUtil.cpp.i
@@ -1198,7 +1198,7 @@ IFCUtil.i: IFCUtil.cpp.i
# target to preprocess a source file
IFCUtil.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCUtil.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCUtil.cpp.i
.PHONY : IFCUtil.cpp.i
IFCUtil.s: IFCUtil.cpp.s
@@ -1206,7 +1206,7 @@ IFCUtil.s: IFCUtil.cpp.s
# target to generate assembly for a file
IFCUtil.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCUtil.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IFCUtil.cpp.s
.PHONY : IFCUtil.cpp.s
IRRLoader.o: IRRLoader.cpp.o
@@ -1214,7 +1214,7 @@ IRRLoader.o: IRRLoader.cpp.o
# target to build an object file
IRRLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRLoader.cpp.o
.PHONY : IRRLoader.cpp.o
IRRLoader.i: IRRLoader.cpp.i
@@ -1222,7 +1222,7 @@ IRRLoader.i: IRRLoader.cpp.i
# target to preprocess a source file
IRRLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRLoader.cpp.i
.PHONY : IRRLoader.cpp.i
IRRLoader.s: IRRLoader.cpp.s
@@ -1230,7 +1230,7 @@ IRRLoader.s: IRRLoader.cpp.s
# target to generate assembly for a file
IRRLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRLoader.cpp.s
.PHONY : IRRLoader.cpp.s
IRRMeshLoader.o: IRRMeshLoader.cpp.o
@@ -1238,7 +1238,7 @@ IRRMeshLoader.o: IRRMeshLoader.cpp.o
# target to build an object file
IRRMeshLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRMeshLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRMeshLoader.cpp.o
.PHONY : IRRMeshLoader.cpp.o
IRRMeshLoader.i: IRRMeshLoader.cpp.i
@@ -1246,7 +1246,7 @@ IRRMeshLoader.i: IRRMeshLoader.cpp.i
# target to preprocess a source file
IRRMeshLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRMeshLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRMeshLoader.cpp.i
.PHONY : IRRMeshLoader.cpp.i
IRRMeshLoader.s: IRRMeshLoader.cpp.s
@@ -1254,7 +1254,7 @@ IRRMeshLoader.s: IRRMeshLoader.cpp.s
# target to generate assembly for a file
IRRMeshLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRMeshLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRMeshLoader.cpp.s
.PHONY : IRRMeshLoader.cpp.s
IRRShared.o: IRRShared.cpp.o
@@ -1262,7 +1262,7 @@ IRRShared.o: IRRShared.cpp.o
# target to build an object file
IRRShared.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRShared.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRShared.cpp.o
.PHONY : IRRShared.cpp.o
IRRShared.i: IRRShared.cpp.i
@@ -1270,7 +1270,7 @@ IRRShared.i: IRRShared.cpp.i
# target to preprocess a source file
IRRShared.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRShared.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRShared.cpp.i
.PHONY : IRRShared.cpp.i
IRRShared.s: IRRShared.cpp.s
@@ -1278,7 +1278,7 @@ IRRShared.s: IRRShared.cpp.s
# target to generate assembly for a file
IRRShared.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRShared.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/IRRShared.cpp.s
.PHONY : IRRShared.cpp.s
Importer.o: Importer.cpp.o
@@ -1286,7 +1286,7 @@ Importer.o: Importer.cpp.o
# target to build an object file
Importer.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Importer.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Importer.cpp.o
.PHONY : Importer.cpp.o
Importer.i: Importer.cpp.i
@@ -1294,7 +1294,7 @@ Importer.i: Importer.cpp.i
# target to preprocess a source file
Importer.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Importer.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Importer.cpp.i
.PHONY : Importer.cpp.i
Importer.s: Importer.cpp.s
@@ -1302,7 +1302,7 @@ Importer.s: Importer.cpp.s
# target to generate assembly for a file
Importer.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Importer.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Importer.cpp.s
.PHONY : Importer.cpp.s
ImporterRegistry.o: ImporterRegistry.cpp.o
@@ -1310,7 +1310,7 @@ ImporterRegistry.o: ImporterRegistry.cpp.o
# target to build an object file
ImporterRegistry.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImporterRegistry.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImporterRegistry.cpp.o
.PHONY : ImporterRegistry.cpp.o
ImporterRegistry.i: ImporterRegistry.cpp.i
@@ -1318,7 +1318,7 @@ ImporterRegistry.i: ImporterRegistry.cpp.i
# target to preprocess a source file
ImporterRegistry.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImporterRegistry.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImporterRegistry.cpp.i
.PHONY : ImporterRegistry.cpp.i
ImporterRegistry.s: ImporterRegistry.cpp.s
@@ -1326,7 +1326,7 @@ ImporterRegistry.s: ImporterRegistry.cpp.s
# target to generate assembly for a file
ImporterRegistry.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImporterRegistry.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImporterRegistry.cpp.s
.PHONY : ImporterRegistry.cpp.s
ImproveCacheLocality.o: ImproveCacheLocality.cpp.o
@@ -1334,7 +1334,7 @@ ImproveCacheLocality.o: ImproveCacheLocality.cpp.o
# target to build an object file
ImproveCacheLocality.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImproveCacheLocality.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImproveCacheLocality.cpp.o
.PHONY : ImproveCacheLocality.cpp.o
ImproveCacheLocality.i: ImproveCacheLocality.cpp.i
@@ -1342,7 +1342,7 @@ ImproveCacheLocality.i: ImproveCacheLocality.cpp.i
# target to preprocess a source file
ImproveCacheLocality.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImproveCacheLocality.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImproveCacheLocality.cpp.i
.PHONY : ImproveCacheLocality.cpp.i
ImproveCacheLocality.s: ImproveCacheLocality.cpp.s
@@ -1350,7 +1350,7 @@ ImproveCacheLocality.s: ImproveCacheLocality.cpp.s
# target to generate assembly for a file
ImproveCacheLocality.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImproveCacheLocality.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ImproveCacheLocality.cpp.s
.PHONY : ImproveCacheLocality.cpp.s
JoinVerticesProcess.o: JoinVerticesProcess.cpp.o
@@ -1358,7 +1358,7 @@ JoinVerticesProcess.o: JoinVerticesProcess.cpp.o
# target to build an object file
JoinVerticesProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/JoinVerticesProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/JoinVerticesProcess.cpp.o
.PHONY : JoinVerticesProcess.cpp.o
JoinVerticesProcess.i: JoinVerticesProcess.cpp.i
@@ -1366,7 +1366,7 @@ JoinVerticesProcess.i: JoinVerticesProcess.cpp.i
# target to preprocess a source file
JoinVerticesProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/JoinVerticesProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/JoinVerticesProcess.cpp.i
.PHONY : JoinVerticesProcess.cpp.i
JoinVerticesProcess.s: JoinVerticesProcess.cpp.s
@@ -1374,7 +1374,7 @@ JoinVerticesProcess.s: JoinVerticesProcess.cpp.s
# target to generate assembly for a file
JoinVerticesProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/JoinVerticesProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/JoinVerticesProcess.cpp.s
.PHONY : JoinVerticesProcess.cpp.s
LWOAnimation.o: LWOAnimation.cpp.o
@@ -1382,7 +1382,7 @@ LWOAnimation.o: LWOAnimation.cpp.o
# target to build an object file
LWOAnimation.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOAnimation.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOAnimation.cpp.o
.PHONY : LWOAnimation.cpp.o
LWOAnimation.i: LWOAnimation.cpp.i
@@ -1390,7 +1390,7 @@ LWOAnimation.i: LWOAnimation.cpp.i
# target to preprocess a source file
LWOAnimation.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOAnimation.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOAnimation.cpp.i
.PHONY : LWOAnimation.cpp.i
LWOAnimation.s: LWOAnimation.cpp.s
@@ -1398,7 +1398,7 @@ LWOAnimation.s: LWOAnimation.cpp.s
# target to generate assembly for a file
LWOAnimation.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOAnimation.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOAnimation.cpp.s
.PHONY : LWOAnimation.cpp.s
LWOBLoader.o: LWOBLoader.cpp.o
@@ -1406,7 +1406,7 @@ LWOBLoader.o: LWOBLoader.cpp.o
# target to build an object file
LWOBLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOBLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOBLoader.cpp.o
.PHONY : LWOBLoader.cpp.o
LWOBLoader.i: LWOBLoader.cpp.i
@@ -1414,7 +1414,7 @@ LWOBLoader.i: LWOBLoader.cpp.i
# target to preprocess a source file
LWOBLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOBLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOBLoader.cpp.i
.PHONY : LWOBLoader.cpp.i
LWOBLoader.s: LWOBLoader.cpp.s
@@ -1422,7 +1422,7 @@ LWOBLoader.s: LWOBLoader.cpp.s
# target to generate assembly for a file
LWOBLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOBLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOBLoader.cpp.s
.PHONY : LWOBLoader.cpp.s
LWOLoader.o: LWOLoader.cpp.o
@@ -1430,7 +1430,7 @@ LWOLoader.o: LWOLoader.cpp.o
# target to build an object file
LWOLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOLoader.cpp.o
.PHONY : LWOLoader.cpp.o
LWOLoader.i: LWOLoader.cpp.i
@@ -1438,7 +1438,7 @@ LWOLoader.i: LWOLoader.cpp.i
# target to preprocess a source file
LWOLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOLoader.cpp.i
.PHONY : LWOLoader.cpp.i
LWOLoader.s: LWOLoader.cpp.s
@@ -1446,7 +1446,7 @@ LWOLoader.s: LWOLoader.cpp.s
# target to generate assembly for a file
LWOLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOLoader.cpp.s
.PHONY : LWOLoader.cpp.s
LWOMaterial.o: LWOMaterial.cpp.o
@@ -1454,7 +1454,7 @@ LWOMaterial.o: LWOMaterial.cpp.o
# target to build an object file
LWOMaterial.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOMaterial.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOMaterial.cpp.o
.PHONY : LWOMaterial.cpp.o
LWOMaterial.i: LWOMaterial.cpp.i
@@ -1462,7 +1462,7 @@ LWOMaterial.i: LWOMaterial.cpp.i
# target to preprocess a source file
LWOMaterial.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOMaterial.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOMaterial.cpp.i
.PHONY : LWOMaterial.cpp.i
LWOMaterial.s: LWOMaterial.cpp.s
@@ -1470,7 +1470,7 @@ LWOMaterial.s: LWOMaterial.cpp.s
# target to generate assembly for a file
LWOMaterial.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOMaterial.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWOMaterial.cpp.s
.PHONY : LWOMaterial.cpp.s
LWSLoader.o: LWSLoader.cpp.o
@@ -1478,7 +1478,7 @@ LWSLoader.o: LWSLoader.cpp.o
# target to build an object file
LWSLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWSLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWSLoader.cpp.o
.PHONY : LWSLoader.cpp.o
LWSLoader.i: LWSLoader.cpp.i
@@ -1486,7 +1486,7 @@ LWSLoader.i: LWSLoader.cpp.i
# target to preprocess a source file
LWSLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWSLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWSLoader.cpp.i
.PHONY : LWSLoader.cpp.i
LWSLoader.s: LWSLoader.cpp.s
@@ -1494,7 +1494,7 @@ LWSLoader.s: LWSLoader.cpp.s
# target to generate assembly for a file
LWSLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWSLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LWSLoader.cpp.s
.PHONY : LWSLoader.cpp.s
LimitBoneWeightsProcess.o: LimitBoneWeightsProcess.cpp.o
@@ -1502,7 +1502,7 @@ LimitBoneWeightsProcess.o: LimitBoneWeightsProcess.cpp.o
# target to build an object file
LimitBoneWeightsProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LimitBoneWeightsProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LimitBoneWeightsProcess.cpp.o
.PHONY : LimitBoneWeightsProcess.cpp.o
LimitBoneWeightsProcess.i: LimitBoneWeightsProcess.cpp.i
@@ -1510,7 +1510,7 @@ LimitBoneWeightsProcess.i: LimitBoneWeightsProcess.cpp.i
# target to preprocess a source file
LimitBoneWeightsProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LimitBoneWeightsProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LimitBoneWeightsProcess.cpp.i
.PHONY : LimitBoneWeightsProcess.cpp.i
LimitBoneWeightsProcess.s: LimitBoneWeightsProcess.cpp.s
@@ -1518,7 +1518,7 @@ LimitBoneWeightsProcess.s: LimitBoneWeightsProcess.cpp.s
# target to generate assembly for a file
LimitBoneWeightsProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LimitBoneWeightsProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/LimitBoneWeightsProcess.cpp.s
.PHONY : LimitBoneWeightsProcess.cpp.s
M3Importer.o: M3Importer.cpp.o
@@ -1526,7 +1526,7 @@ M3Importer.o: M3Importer.cpp.o
# target to build an object file
M3Importer.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/M3Importer.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/M3Importer.cpp.o
.PHONY : M3Importer.cpp.o
M3Importer.i: M3Importer.cpp.i
@@ -1534,7 +1534,7 @@ M3Importer.i: M3Importer.cpp.i
# target to preprocess a source file
M3Importer.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/M3Importer.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/M3Importer.cpp.i
.PHONY : M3Importer.cpp.i
M3Importer.s: M3Importer.cpp.s
@@ -1542,7 +1542,7 @@ M3Importer.s: M3Importer.cpp.s
# target to generate assembly for a file
M3Importer.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/M3Importer.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/M3Importer.cpp.s
.PHONY : M3Importer.cpp.s
MD2Loader.o: MD2Loader.cpp.o
@@ -1550,7 +1550,7 @@ MD2Loader.o: MD2Loader.cpp.o
# target to build an object file
MD2Loader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD2Loader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD2Loader.cpp.o
.PHONY : MD2Loader.cpp.o
MD2Loader.i: MD2Loader.cpp.i
@@ -1558,7 +1558,7 @@ MD2Loader.i: MD2Loader.cpp.i
# target to preprocess a source file
MD2Loader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD2Loader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD2Loader.cpp.i
.PHONY : MD2Loader.cpp.i
MD2Loader.s: MD2Loader.cpp.s
@@ -1566,7 +1566,7 @@ MD2Loader.s: MD2Loader.cpp.s
# target to generate assembly for a file
MD2Loader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD2Loader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD2Loader.cpp.s
.PHONY : MD2Loader.cpp.s
MD3Loader.o: MD3Loader.cpp.o
@@ -1574,7 +1574,7 @@ MD3Loader.o: MD3Loader.cpp.o
# target to build an object file
MD3Loader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD3Loader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD3Loader.cpp.o
.PHONY : MD3Loader.cpp.o
MD3Loader.i: MD3Loader.cpp.i
@@ -1582,7 +1582,7 @@ MD3Loader.i: MD3Loader.cpp.i
# target to preprocess a source file
MD3Loader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD3Loader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD3Loader.cpp.i
.PHONY : MD3Loader.cpp.i
MD3Loader.s: MD3Loader.cpp.s
@@ -1590,7 +1590,7 @@ MD3Loader.s: MD3Loader.cpp.s
# target to generate assembly for a file
MD3Loader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD3Loader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD3Loader.cpp.s
.PHONY : MD3Loader.cpp.s
MD5Loader.o: MD5Loader.cpp.o
@@ -1598,7 +1598,7 @@ MD5Loader.o: MD5Loader.cpp.o
# target to build an object file
MD5Loader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Loader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Loader.cpp.o
.PHONY : MD5Loader.cpp.o
MD5Loader.i: MD5Loader.cpp.i
@@ -1606,7 +1606,7 @@ MD5Loader.i: MD5Loader.cpp.i
# target to preprocess a source file
MD5Loader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Loader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Loader.cpp.i
.PHONY : MD5Loader.cpp.i
MD5Loader.s: MD5Loader.cpp.s
@@ -1614,7 +1614,7 @@ MD5Loader.s: MD5Loader.cpp.s
# target to generate assembly for a file
MD5Loader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Loader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Loader.cpp.s
.PHONY : MD5Loader.cpp.s
MD5Parser.o: MD5Parser.cpp.o
@@ -1622,7 +1622,7 @@ MD5Parser.o: MD5Parser.cpp.o
# target to build an object file
MD5Parser.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Parser.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Parser.cpp.o
.PHONY : MD5Parser.cpp.o
MD5Parser.i: MD5Parser.cpp.i
@@ -1630,7 +1630,7 @@ MD5Parser.i: MD5Parser.cpp.i
# target to preprocess a source file
MD5Parser.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Parser.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Parser.cpp.i
.PHONY : MD5Parser.cpp.i
MD5Parser.s: MD5Parser.cpp.s
@@ -1638,7 +1638,7 @@ MD5Parser.s: MD5Parser.cpp.s
# target to generate assembly for a file
MD5Parser.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Parser.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MD5Parser.cpp.s
.PHONY : MD5Parser.cpp.s
MDCLoader.o: MDCLoader.cpp.o
@@ -1646,7 +1646,7 @@ MDCLoader.o: MDCLoader.cpp.o
# target to build an object file
MDCLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDCLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDCLoader.cpp.o
.PHONY : MDCLoader.cpp.o
MDCLoader.i: MDCLoader.cpp.i
@@ -1654,7 +1654,7 @@ MDCLoader.i: MDCLoader.cpp.i
# target to preprocess a source file
MDCLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDCLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDCLoader.cpp.i
.PHONY : MDCLoader.cpp.i
MDCLoader.s: MDCLoader.cpp.s
@@ -1662,7 +1662,7 @@ MDCLoader.s: MDCLoader.cpp.s
# target to generate assembly for a file
MDCLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDCLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDCLoader.cpp.s
.PHONY : MDCLoader.cpp.s
MDLLoader.o: MDLLoader.cpp.o
@@ -1670,7 +1670,7 @@ MDLLoader.o: MDLLoader.cpp.o
# target to build an object file
MDLLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLLoader.cpp.o
.PHONY : MDLLoader.cpp.o
MDLLoader.i: MDLLoader.cpp.i
@@ -1678,7 +1678,7 @@ MDLLoader.i: MDLLoader.cpp.i
# target to preprocess a source file
MDLLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLLoader.cpp.i
.PHONY : MDLLoader.cpp.i
MDLLoader.s: MDLLoader.cpp.s
@@ -1686,7 +1686,7 @@ MDLLoader.s: MDLLoader.cpp.s
# target to generate assembly for a file
MDLLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLLoader.cpp.s
.PHONY : MDLLoader.cpp.s
MDLMaterialLoader.o: MDLMaterialLoader.cpp.o
@@ -1694,7 +1694,7 @@ MDLMaterialLoader.o: MDLMaterialLoader.cpp.o
# target to build an object file
MDLMaterialLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLMaterialLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLMaterialLoader.cpp.o
.PHONY : MDLMaterialLoader.cpp.o
MDLMaterialLoader.i: MDLMaterialLoader.cpp.i
@@ -1702,7 +1702,7 @@ MDLMaterialLoader.i: MDLMaterialLoader.cpp.i
# target to preprocess a source file
MDLMaterialLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLMaterialLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLMaterialLoader.cpp.i
.PHONY : MDLMaterialLoader.cpp.i
MDLMaterialLoader.s: MDLMaterialLoader.cpp.s
@@ -1710,7 +1710,7 @@ MDLMaterialLoader.s: MDLMaterialLoader.cpp.s
# target to generate assembly for a file
MDLMaterialLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLMaterialLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MDLMaterialLoader.cpp.s
.PHONY : MDLMaterialLoader.cpp.s
MS3DLoader.o: MS3DLoader.cpp.o
@@ -1718,7 +1718,7 @@ MS3DLoader.o: MS3DLoader.cpp.o
# target to build an object file
MS3DLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MS3DLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MS3DLoader.cpp.o
.PHONY : MS3DLoader.cpp.o
MS3DLoader.i: MS3DLoader.cpp.i
@@ -1726,7 +1726,7 @@ MS3DLoader.i: MS3DLoader.cpp.i
# target to preprocess a source file
MS3DLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MS3DLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MS3DLoader.cpp.i
.PHONY : MS3DLoader.cpp.i
MS3DLoader.s: MS3DLoader.cpp.s
@@ -1734,7 +1734,7 @@ MS3DLoader.s: MS3DLoader.cpp.s
# target to generate assembly for a file
MS3DLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MS3DLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MS3DLoader.cpp.s
.PHONY : MS3DLoader.cpp.s
MakeVerboseFormat.o: MakeVerboseFormat.cpp.o
@@ -1742,7 +1742,7 @@ MakeVerboseFormat.o: MakeVerboseFormat.cpp.o
# target to build an object file
MakeVerboseFormat.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MakeVerboseFormat.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MakeVerboseFormat.cpp.o
.PHONY : MakeVerboseFormat.cpp.o
MakeVerboseFormat.i: MakeVerboseFormat.cpp.i
@@ -1750,7 +1750,7 @@ MakeVerboseFormat.i: MakeVerboseFormat.cpp.i
# target to preprocess a source file
MakeVerboseFormat.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MakeVerboseFormat.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MakeVerboseFormat.cpp.i
.PHONY : MakeVerboseFormat.cpp.i
MakeVerboseFormat.s: MakeVerboseFormat.cpp.s
@@ -1758,7 +1758,7 @@ MakeVerboseFormat.s: MakeVerboseFormat.cpp.s
# target to generate assembly for a file
MakeVerboseFormat.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MakeVerboseFormat.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MakeVerboseFormat.cpp.s
.PHONY : MakeVerboseFormat.cpp.s
MaterialSystem.o: MaterialSystem.cpp.o
@@ -1766,7 +1766,7 @@ MaterialSystem.o: MaterialSystem.cpp.o
# target to build an object file
MaterialSystem.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MaterialSystem.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MaterialSystem.cpp.o
.PHONY : MaterialSystem.cpp.o
MaterialSystem.i: MaterialSystem.cpp.i
@@ -1774,7 +1774,7 @@ MaterialSystem.i: MaterialSystem.cpp.i
# target to preprocess a source file
MaterialSystem.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MaterialSystem.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MaterialSystem.cpp.i
.PHONY : MaterialSystem.cpp.i
MaterialSystem.s: MaterialSystem.cpp.s
@@ -1782,7 +1782,7 @@ MaterialSystem.s: MaterialSystem.cpp.s
# target to generate assembly for a file
MaterialSystem.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MaterialSystem.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/MaterialSystem.cpp.s
.PHONY : MaterialSystem.cpp.s
NDOLoader.o: NDOLoader.cpp.o
@@ -1790,7 +1790,7 @@ NDOLoader.o: NDOLoader.cpp.o
# target to build an object file
NDOLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NDOLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NDOLoader.cpp.o
.PHONY : NDOLoader.cpp.o
NDOLoader.i: NDOLoader.cpp.i
@@ -1798,7 +1798,7 @@ NDOLoader.i: NDOLoader.cpp.i
# target to preprocess a source file
NDOLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NDOLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NDOLoader.cpp.i
.PHONY : NDOLoader.cpp.i
NDOLoader.s: NDOLoader.cpp.s
@@ -1806,7 +1806,7 @@ NDOLoader.s: NDOLoader.cpp.s
# target to generate assembly for a file
NDOLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NDOLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NDOLoader.cpp.s
.PHONY : NDOLoader.cpp.s
NFFLoader.o: NFFLoader.cpp.o
@@ -1814,7 +1814,7 @@ NFFLoader.o: NFFLoader.cpp.o
# target to build an object file
NFFLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NFFLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NFFLoader.cpp.o
.PHONY : NFFLoader.cpp.o
NFFLoader.i: NFFLoader.cpp.i
@@ -1822,7 +1822,7 @@ NFFLoader.i: NFFLoader.cpp.i
# target to preprocess a source file
NFFLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NFFLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NFFLoader.cpp.i
.PHONY : NFFLoader.cpp.i
NFFLoader.s: NFFLoader.cpp.s
@@ -1830,7 +1830,7 @@ NFFLoader.s: NFFLoader.cpp.s
# target to generate assembly for a file
NFFLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NFFLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/NFFLoader.cpp.s
.PHONY : NFFLoader.cpp.s
OFFLoader.o: OFFLoader.cpp.o
@@ -1838,7 +1838,7 @@ OFFLoader.o: OFFLoader.cpp.o
# target to build an object file
OFFLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OFFLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OFFLoader.cpp.o
.PHONY : OFFLoader.cpp.o
OFFLoader.i: OFFLoader.cpp.i
@@ -1846,7 +1846,7 @@ OFFLoader.i: OFFLoader.cpp.i
# target to preprocess a source file
OFFLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OFFLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OFFLoader.cpp.i
.PHONY : OFFLoader.cpp.i
OFFLoader.s: OFFLoader.cpp.s
@@ -1854,7 +1854,7 @@ OFFLoader.s: OFFLoader.cpp.s
# target to generate assembly for a file
OFFLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OFFLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OFFLoader.cpp.s
.PHONY : OFFLoader.cpp.s
ObjExporter.o: ObjExporter.cpp.o
@@ -1862,7 +1862,7 @@ ObjExporter.o: ObjExporter.cpp.o
# target to build an object file
ObjExporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjExporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjExporter.cpp.o
.PHONY : ObjExporter.cpp.o
ObjExporter.i: ObjExporter.cpp.i
@@ -1870,7 +1870,7 @@ ObjExporter.i: ObjExporter.cpp.i
# target to preprocess a source file
ObjExporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjExporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjExporter.cpp.i
.PHONY : ObjExporter.cpp.i
ObjExporter.s: ObjExporter.cpp.s
@@ -1878,7 +1878,7 @@ ObjExporter.s: ObjExporter.cpp.s
# target to generate assembly for a file
ObjExporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjExporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjExporter.cpp.s
.PHONY : ObjExporter.cpp.s
ObjFileImporter.o: ObjFileImporter.cpp.o
@@ -1886,7 +1886,7 @@ ObjFileImporter.o: ObjFileImporter.cpp.o
# target to build an object file
ObjFileImporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileImporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileImporter.cpp.o
.PHONY : ObjFileImporter.cpp.o
ObjFileImporter.i: ObjFileImporter.cpp.i
@@ -1894,7 +1894,7 @@ ObjFileImporter.i: ObjFileImporter.cpp.i
# target to preprocess a source file
ObjFileImporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileImporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileImporter.cpp.i
.PHONY : ObjFileImporter.cpp.i
ObjFileImporter.s: ObjFileImporter.cpp.s
@@ -1902,7 +1902,7 @@ ObjFileImporter.s: ObjFileImporter.cpp.s
# target to generate assembly for a file
ObjFileImporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileImporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileImporter.cpp.s
.PHONY : ObjFileImporter.cpp.s
ObjFileMtlImporter.o: ObjFileMtlImporter.cpp.o
@@ -1910,7 +1910,7 @@ ObjFileMtlImporter.o: ObjFileMtlImporter.cpp.o
# target to build an object file
ObjFileMtlImporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileMtlImporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileMtlImporter.cpp.o
.PHONY : ObjFileMtlImporter.cpp.o
ObjFileMtlImporter.i: ObjFileMtlImporter.cpp.i
@@ -1918,7 +1918,7 @@ ObjFileMtlImporter.i: ObjFileMtlImporter.cpp.i
# target to preprocess a source file
ObjFileMtlImporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileMtlImporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileMtlImporter.cpp.i
.PHONY : ObjFileMtlImporter.cpp.i
ObjFileMtlImporter.s: ObjFileMtlImporter.cpp.s
@@ -1926,7 +1926,7 @@ ObjFileMtlImporter.s: ObjFileMtlImporter.cpp.s
# target to generate assembly for a file
ObjFileMtlImporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileMtlImporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileMtlImporter.cpp.s
.PHONY : ObjFileMtlImporter.cpp.s
ObjFileParser.o: ObjFileParser.cpp.o
@@ -1934,7 +1934,7 @@ ObjFileParser.o: ObjFileParser.cpp.o
# target to build an object file
ObjFileParser.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileParser.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileParser.cpp.o
.PHONY : ObjFileParser.cpp.o
ObjFileParser.i: ObjFileParser.cpp.i
@@ -1942,7 +1942,7 @@ ObjFileParser.i: ObjFileParser.cpp.i
# target to preprocess a source file
ObjFileParser.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileParser.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileParser.cpp.i
.PHONY : ObjFileParser.cpp.i
ObjFileParser.s: ObjFileParser.cpp.s
@@ -1950,7 +1950,7 @@ ObjFileParser.s: ObjFileParser.cpp.s
# target to generate assembly for a file
ObjFileParser.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileParser.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ObjFileParser.cpp.s
.PHONY : ObjFileParser.cpp.s
OgreImporter.o: OgreImporter.cpp.o
@@ -1958,7 +1958,7 @@ OgreImporter.o: OgreImporter.cpp.o
# target to build an object file
OgreImporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporter.cpp.o
.PHONY : OgreImporter.cpp.o
OgreImporter.i: OgreImporter.cpp.i
@@ -1966,7 +1966,7 @@ OgreImporter.i: OgreImporter.cpp.i
# target to preprocess a source file
OgreImporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporter.cpp.i
.PHONY : OgreImporter.cpp.i
OgreImporter.s: OgreImporter.cpp.s
@@ -1974,7 +1974,7 @@ OgreImporter.s: OgreImporter.cpp.s
# target to generate assembly for a file
OgreImporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporter.cpp.s
.PHONY : OgreImporter.cpp.s
OgreImporterMaterial.o: OgreImporterMaterial.cpp.o
@@ -1982,7 +1982,7 @@ OgreImporterMaterial.o: OgreImporterMaterial.cpp.o
# target to build an object file
OgreImporterMaterial.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporterMaterial.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporterMaterial.cpp.o
.PHONY : OgreImporterMaterial.cpp.o
OgreImporterMaterial.i: OgreImporterMaterial.cpp.i
@@ -1990,7 +1990,7 @@ OgreImporterMaterial.i: OgreImporterMaterial.cpp.i
# target to preprocess a source file
OgreImporterMaterial.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporterMaterial.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporterMaterial.cpp.i
.PHONY : OgreImporterMaterial.cpp.i
OgreImporterMaterial.s: OgreImporterMaterial.cpp.s
@@ -1998,7 +1998,7 @@ OgreImporterMaterial.s: OgreImporterMaterial.cpp.s
# target to generate assembly for a file
OgreImporterMaterial.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporterMaterial.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OgreImporterMaterial.cpp.s
.PHONY : OgreImporterMaterial.cpp.s
OptimizeGraph.o: OptimizeGraph.cpp.o
@@ -2006,7 +2006,7 @@ OptimizeGraph.o: OptimizeGraph.cpp.o
# target to build an object file
OptimizeGraph.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeGraph.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeGraph.cpp.o
.PHONY : OptimizeGraph.cpp.o
OptimizeGraph.i: OptimizeGraph.cpp.i
@@ -2014,7 +2014,7 @@ OptimizeGraph.i: OptimizeGraph.cpp.i
# target to preprocess a source file
OptimizeGraph.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeGraph.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeGraph.cpp.i
.PHONY : OptimizeGraph.cpp.i
OptimizeGraph.s: OptimizeGraph.cpp.s
@@ -2022,7 +2022,7 @@ OptimizeGraph.s: OptimizeGraph.cpp.s
# target to generate assembly for a file
OptimizeGraph.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeGraph.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeGraph.cpp.s
.PHONY : OptimizeGraph.cpp.s
OptimizeMeshes.o: OptimizeMeshes.cpp.o
@@ -2030,7 +2030,7 @@ OptimizeMeshes.o: OptimizeMeshes.cpp.o
# target to build an object file
OptimizeMeshes.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeMeshes.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeMeshes.cpp.o
.PHONY : OptimizeMeshes.cpp.o
OptimizeMeshes.i: OptimizeMeshes.cpp.i
@@ -2038,7 +2038,7 @@ OptimizeMeshes.i: OptimizeMeshes.cpp.i
# target to preprocess a source file
OptimizeMeshes.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeMeshes.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeMeshes.cpp.i
.PHONY : OptimizeMeshes.cpp.i
OptimizeMeshes.s: OptimizeMeshes.cpp.s
@@ -2046,7 +2046,7 @@ OptimizeMeshes.s: OptimizeMeshes.cpp.s
# target to generate assembly for a file
OptimizeMeshes.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeMeshes.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/OptimizeMeshes.cpp.s
.PHONY : OptimizeMeshes.cpp.s
PlyLoader.o: PlyLoader.cpp.o
@@ -2054,7 +2054,7 @@ PlyLoader.o: PlyLoader.cpp.o
# target to build an object file
PlyLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyLoader.cpp.o
.PHONY : PlyLoader.cpp.o
PlyLoader.i: PlyLoader.cpp.i
@@ -2062,7 +2062,7 @@ PlyLoader.i: PlyLoader.cpp.i
# target to preprocess a source file
PlyLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyLoader.cpp.i
.PHONY : PlyLoader.cpp.i
PlyLoader.s: PlyLoader.cpp.s
@@ -2070,7 +2070,7 @@ PlyLoader.s: PlyLoader.cpp.s
# target to generate assembly for a file
PlyLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyLoader.cpp.s
.PHONY : PlyLoader.cpp.s
PlyParser.o: PlyParser.cpp.o
@@ -2078,7 +2078,7 @@ PlyParser.o: PlyParser.cpp.o
# target to build an object file
PlyParser.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyParser.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyParser.cpp.o
.PHONY : PlyParser.cpp.o
PlyParser.i: PlyParser.cpp.i
@@ -2086,7 +2086,7 @@ PlyParser.i: PlyParser.cpp.i
# target to preprocess a source file
PlyParser.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyParser.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyParser.cpp.i
.PHONY : PlyParser.cpp.i
PlyParser.s: PlyParser.cpp.s
@@ -2094,7 +2094,7 @@ PlyParser.s: PlyParser.cpp.s
# target to generate assembly for a file
PlyParser.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyParser.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PlyParser.cpp.s
.PHONY : PlyParser.cpp.s
PostStepRegistry.o: PostStepRegistry.cpp.o
@@ -2102,7 +2102,7 @@ PostStepRegistry.o: PostStepRegistry.cpp.o
# target to build an object file
PostStepRegistry.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PostStepRegistry.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PostStepRegistry.cpp.o
.PHONY : PostStepRegistry.cpp.o
PostStepRegistry.i: PostStepRegistry.cpp.i
@@ -2110,7 +2110,7 @@ PostStepRegistry.i: PostStepRegistry.cpp.i
# target to preprocess a source file
PostStepRegistry.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PostStepRegistry.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PostStepRegistry.cpp.i
.PHONY : PostStepRegistry.cpp.i
PostStepRegistry.s: PostStepRegistry.cpp.s
@@ -2118,7 +2118,7 @@ PostStepRegistry.s: PostStepRegistry.cpp.s
# target to generate assembly for a file
PostStepRegistry.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PostStepRegistry.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PostStepRegistry.cpp.s
.PHONY : PostStepRegistry.cpp.s
PretransformVertices.o: PretransformVertices.cpp.o
@@ -2126,7 +2126,7 @@ PretransformVertices.o: PretransformVertices.cpp.o
# target to build an object file
PretransformVertices.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PretransformVertices.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PretransformVertices.cpp.o
.PHONY : PretransformVertices.cpp.o
PretransformVertices.i: PretransformVertices.cpp.i
@@ -2134,7 +2134,7 @@ PretransformVertices.i: PretransformVertices.cpp.i
# target to preprocess a source file
PretransformVertices.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PretransformVertices.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PretransformVertices.cpp.i
.PHONY : PretransformVertices.cpp.i
PretransformVertices.s: PretransformVertices.cpp.s
@@ -2142,7 +2142,7 @@ PretransformVertices.s: PretransformVertices.cpp.s
# target to generate assembly for a file
PretransformVertices.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PretransformVertices.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/PretransformVertices.cpp.s
.PHONY : PretransformVertices.cpp.s
ProcessHelper.o: ProcessHelper.cpp.o
@@ -2150,7 +2150,7 @@ ProcessHelper.o: ProcessHelper.cpp.o
# target to build an object file
ProcessHelper.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ProcessHelper.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ProcessHelper.cpp.o
.PHONY : ProcessHelper.cpp.o
ProcessHelper.i: ProcessHelper.cpp.i
@@ -2158,7 +2158,7 @@ ProcessHelper.i: ProcessHelper.cpp.i
# target to preprocess a source file
ProcessHelper.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ProcessHelper.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ProcessHelper.cpp.i
.PHONY : ProcessHelper.cpp.i
ProcessHelper.s: ProcessHelper.cpp.s
@@ -2166,7 +2166,7 @@ ProcessHelper.s: ProcessHelper.cpp.s
# target to generate assembly for a file
ProcessHelper.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ProcessHelper.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ProcessHelper.cpp.s
.PHONY : ProcessHelper.cpp.s
Q3BSPFileImporter.o: Q3BSPFileImporter.cpp.o
@@ -2174,7 +2174,7 @@ Q3BSPFileImporter.o: Q3BSPFileImporter.cpp.o
# target to build an object file
Q3BSPFileImporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileImporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileImporter.cpp.o
.PHONY : Q3BSPFileImporter.cpp.o
Q3BSPFileImporter.i: Q3BSPFileImporter.cpp.i
@@ -2182,7 +2182,7 @@ Q3BSPFileImporter.i: Q3BSPFileImporter.cpp.i
# target to preprocess a source file
Q3BSPFileImporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileImporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileImporter.cpp.i
.PHONY : Q3BSPFileImporter.cpp.i
Q3BSPFileImporter.s: Q3BSPFileImporter.cpp.s
@@ -2190,7 +2190,7 @@ Q3BSPFileImporter.s: Q3BSPFileImporter.cpp.s
# target to generate assembly for a file
Q3BSPFileImporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileImporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileImporter.cpp.s
.PHONY : Q3BSPFileImporter.cpp.s
Q3BSPFileParser.o: Q3BSPFileParser.cpp.o
@@ -2198,7 +2198,7 @@ Q3BSPFileParser.o: Q3BSPFileParser.cpp.o
# target to build an object file
Q3BSPFileParser.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileParser.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileParser.cpp.o
.PHONY : Q3BSPFileParser.cpp.o
Q3BSPFileParser.i: Q3BSPFileParser.cpp.i
@@ -2206,7 +2206,7 @@ Q3BSPFileParser.i: Q3BSPFileParser.cpp.i
# target to preprocess a source file
Q3BSPFileParser.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileParser.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileParser.cpp.i
.PHONY : Q3BSPFileParser.cpp.i
Q3BSPFileParser.s: Q3BSPFileParser.cpp.s
@@ -2214,7 +2214,7 @@ Q3BSPFileParser.s: Q3BSPFileParser.cpp.s
# target to generate assembly for a file
Q3BSPFileParser.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileParser.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPFileParser.cpp.s
.PHONY : Q3BSPFileParser.cpp.s
Q3BSPZipArchive.o: Q3BSPZipArchive.cpp.o
@@ -2222,7 +2222,7 @@ Q3BSPZipArchive.o: Q3BSPZipArchive.cpp.o
# target to build an object file
Q3BSPZipArchive.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPZipArchive.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPZipArchive.cpp.o
.PHONY : Q3BSPZipArchive.cpp.o
Q3BSPZipArchive.i: Q3BSPZipArchive.cpp.i
@@ -2230,7 +2230,7 @@ Q3BSPZipArchive.i: Q3BSPZipArchive.cpp.i
# target to preprocess a source file
Q3BSPZipArchive.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPZipArchive.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPZipArchive.cpp.i
.PHONY : Q3BSPZipArchive.cpp.i
Q3BSPZipArchive.s: Q3BSPZipArchive.cpp.s
@@ -2238,7 +2238,7 @@ Q3BSPZipArchive.s: Q3BSPZipArchive.cpp.s
# target to generate assembly for a file
Q3BSPZipArchive.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPZipArchive.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3BSPZipArchive.cpp.s
.PHONY : Q3BSPZipArchive.cpp.s
Q3DLoader.o: Q3DLoader.cpp.o
@@ -2246,7 +2246,7 @@ Q3DLoader.o: Q3DLoader.cpp.o
# target to build an object file
Q3DLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3DLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3DLoader.cpp.o
.PHONY : Q3DLoader.cpp.o
Q3DLoader.i: Q3DLoader.cpp.i
@@ -2254,7 +2254,7 @@ Q3DLoader.i: Q3DLoader.cpp.i
# target to preprocess a source file
Q3DLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3DLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3DLoader.cpp.i
.PHONY : Q3DLoader.cpp.i
Q3DLoader.s: Q3DLoader.cpp.s
@@ -2262,7 +2262,7 @@ Q3DLoader.s: Q3DLoader.cpp.s
# target to generate assembly for a file
Q3DLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3DLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Q3DLoader.cpp.s
.PHONY : Q3DLoader.cpp.s
RawLoader.o: RawLoader.cpp.o
@@ -2270,7 +2270,7 @@ RawLoader.o: RawLoader.cpp.o
# target to build an object file
RawLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RawLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RawLoader.cpp.o
.PHONY : RawLoader.cpp.o
RawLoader.i: RawLoader.cpp.i
@@ -2278,7 +2278,7 @@ RawLoader.i: RawLoader.cpp.i
# target to preprocess a source file
RawLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RawLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RawLoader.cpp.i
.PHONY : RawLoader.cpp.i
RawLoader.s: RawLoader.cpp.s
@@ -2286,7 +2286,7 @@ RawLoader.s: RawLoader.cpp.s
# target to generate assembly for a file
RawLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RawLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RawLoader.cpp.s
.PHONY : RawLoader.cpp.s
RemoveComments.o: RemoveComments.cpp.o
@@ -2294,7 +2294,7 @@ RemoveComments.o: RemoveComments.cpp.o
# target to build an object file
RemoveComments.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveComments.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveComments.cpp.o
.PHONY : RemoveComments.cpp.o
RemoveComments.i: RemoveComments.cpp.i
@@ -2302,7 +2302,7 @@ RemoveComments.i: RemoveComments.cpp.i
# target to preprocess a source file
RemoveComments.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveComments.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveComments.cpp.i
.PHONY : RemoveComments.cpp.i
RemoveComments.s: RemoveComments.cpp.s
@@ -2310,7 +2310,7 @@ RemoveComments.s: RemoveComments.cpp.s
# target to generate assembly for a file
RemoveComments.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveComments.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveComments.cpp.s
.PHONY : RemoveComments.cpp.s
RemoveRedundantMaterials.o: RemoveRedundantMaterials.cpp.o
@@ -2318,7 +2318,7 @@ RemoveRedundantMaterials.o: RemoveRedundantMaterials.cpp.o
# target to build an object file
RemoveRedundantMaterials.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveRedundantMaterials.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveRedundantMaterials.cpp.o
.PHONY : RemoveRedundantMaterials.cpp.o
RemoveRedundantMaterials.i: RemoveRedundantMaterials.cpp.i
@@ -2326,7 +2326,7 @@ RemoveRedundantMaterials.i: RemoveRedundantMaterials.cpp.i
# target to preprocess a source file
RemoveRedundantMaterials.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveRedundantMaterials.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveRedundantMaterials.cpp.i
.PHONY : RemoveRedundantMaterials.cpp.i
RemoveRedundantMaterials.s: RemoveRedundantMaterials.cpp.s
@@ -2334,7 +2334,7 @@ RemoveRedundantMaterials.s: RemoveRedundantMaterials.cpp.s
# target to generate assembly for a file
RemoveRedundantMaterials.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveRedundantMaterials.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveRedundantMaterials.cpp.s
.PHONY : RemoveRedundantMaterials.cpp.s
RemoveVCProcess.o: RemoveVCProcess.cpp.o
@@ -2342,7 +2342,7 @@ RemoveVCProcess.o: RemoveVCProcess.cpp.o
# target to build an object file
RemoveVCProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveVCProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveVCProcess.cpp.o
.PHONY : RemoveVCProcess.cpp.o
RemoveVCProcess.i: RemoveVCProcess.cpp.i
@@ -2350,7 +2350,7 @@ RemoveVCProcess.i: RemoveVCProcess.cpp.i
# target to preprocess a source file
RemoveVCProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveVCProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveVCProcess.cpp.i
.PHONY : RemoveVCProcess.cpp.i
RemoveVCProcess.s: RemoveVCProcess.cpp.s
@@ -2358,7 +2358,7 @@ RemoveVCProcess.s: RemoveVCProcess.cpp.s
# target to generate assembly for a file
RemoveVCProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveVCProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/RemoveVCProcess.cpp.s
.PHONY : RemoveVCProcess.cpp.s
SGSpatialSort.o: SGSpatialSort.cpp.o
@@ -2366,7 +2366,7 @@ SGSpatialSort.o: SGSpatialSort.cpp.o
# target to build an object file
SGSpatialSort.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SGSpatialSort.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SGSpatialSort.cpp.o
.PHONY : SGSpatialSort.cpp.o
SGSpatialSort.i: SGSpatialSort.cpp.i
@@ -2374,7 +2374,7 @@ SGSpatialSort.i: SGSpatialSort.cpp.i
# target to preprocess a source file
SGSpatialSort.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SGSpatialSort.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SGSpatialSort.cpp.i
.PHONY : SGSpatialSort.cpp.i
SGSpatialSort.s: SGSpatialSort.cpp.s
@@ -2382,7 +2382,7 @@ SGSpatialSort.s: SGSpatialSort.cpp.s
# target to generate assembly for a file
SGSpatialSort.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SGSpatialSort.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SGSpatialSort.cpp.s
.PHONY : SGSpatialSort.cpp.s
SMDLoader.o: SMDLoader.cpp.o
@@ -2390,7 +2390,7 @@ SMDLoader.o: SMDLoader.cpp.o
# target to build an object file
SMDLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SMDLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SMDLoader.cpp.o
.PHONY : SMDLoader.cpp.o
SMDLoader.i: SMDLoader.cpp.i
@@ -2398,7 +2398,7 @@ SMDLoader.i: SMDLoader.cpp.i
# target to preprocess a source file
SMDLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SMDLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SMDLoader.cpp.i
.PHONY : SMDLoader.cpp.i
SMDLoader.s: SMDLoader.cpp.s
@@ -2406,7 +2406,7 @@ SMDLoader.s: SMDLoader.cpp.s
# target to generate assembly for a file
SMDLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SMDLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SMDLoader.cpp.s
.PHONY : SMDLoader.cpp.s
STEPFileReader.o: STEPFileReader.cpp.o
@@ -2414,7 +2414,7 @@ STEPFileReader.o: STEPFileReader.cpp.o
# target to build an object file
STEPFileReader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STEPFileReader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STEPFileReader.cpp.o
.PHONY : STEPFileReader.cpp.o
STEPFileReader.i: STEPFileReader.cpp.i
@@ -2422,7 +2422,7 @@ STEPFileReader.i: STEPFileReader.cpp.i
# target to preprocess a source file
STEPFileReader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STEPFileReader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STEPFileReader.cpp.i
.PHONY : STEPFileReader.cpp.i
STEPFileReader.s: STEPFileReader.cpp.s
@@ -2430,15 +2430,39 @@ STEPFileReader.s: STEPFileReader.cpp.s
# target to generate assembly for a file
STEPFileReader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STEPFileReader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STEPFileReader.cpp.s
.PHONY : STEPFileReader.cpp.s
+STLExporter.o: STLExporter.cpp.o
+.PHONY : STLExporter.o
+
+# target to build an object file
+STLExporter.cpp.o:
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STLExporter.cpp.o
+.PHONY : STLExporter.cpp.o
+
+STLExporter.i: STLExporter.cpp.i
+.PHONY : STLExporter.i
+
+# target to preprocess a source file
+STLExporter.cpp.i:
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STLExporter.cpp.i
+.PHONY : STLExporter.cpp.i
+
+STLExporter.s: STLExporter.cpp.s
+.PHONY : STLExporter.s
+
+# target to generate assembly for a file
+STLExporter.cpp.s:
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STLExporter.cpp.s
+.PHONY : STLExporter.cpp.s
+
STLLoader.o: STLLoader.cpp.o
.PHONY : STLLoader.o
# target to build an object file
STLLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STLLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STLLoader.cpp.o
.PHONY : STLLoader.cpp.o
STLLoader.i: STLLoader.cpp.i
@@ -2446,7 +2470,7 @@ STLLoader.i: STLLoader.cpp.i
# target to preprocess a source file
STLLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STLLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STLLoader.cpp.i
.PHONY : STLLoader.cpp.i
STLLoader.s: STLLoader.cpp.s
@@ -2454,7 +2478,7 @@ STLLoader.s: STLLoader.cpp.s
# target to generate assembly for a file
STLLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STLLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/STLLoader.cpp.s
.PHONY : STLLoader.cpp.s
SceneCombiner.o: SceneCombiner.cpp.o
@@ -2462,7 +2486,7 @@ SceneCombiner.o: SceneCombiner.cpp.o
# target to build an object file
SceneCombiner.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SceneCombiner.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SceneCombiner.cpp.o
.PHONY : SceneCombiner.cpp.o
SceneCombiner.i: SceneCombiner.cpp.i
@@ -2470,7 +2494,7 @@ SceneCombiner.i: SceneCombiner.cpp.i
# target to preprocess a source file
SceneCombiner.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SceneCombiner.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SceneCombiner.cpp.i
.PHONY : SceneCombiner.cpp.i
SceneCombiner.s: SceneCombiner.cpp.s
@@ -2478,7 +2502,7 @@ SceneCombiner.s: SceneCombiner.cpp.s
# target to generate assembly for a file
SceneCombiner.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SceneCombiner.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SceneCombiner.cpp.s
.PHONY : SceneCombiner.cpp.s
ScenePreprocessor.o: ScenePreprocessor.cpp.o
@@ -2486,7 +2510,7 @@ ScenePreprocessor.o: ScenePreprocessor.cpp.o
# target to build an object file
ScenePreprocessor.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ScenePreprocessor.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ScenePreprocessor.cpp.o
.PHONY : ScenePreprocessor.cpp.o
ScenePreprocessor.i: ScenePreprocessor.cpp.i
@@ -2494,7 +2518,7 @@ ScenePreprocessor.i: ScenePreprocessor.cpp.i
# target to preprocess a source file
ScenePreprocessor.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ScenePreprocessor.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ScenePreprocessor.cpp.i
.PHONY : ScenePreprocessor.cpp.i
ScenePreprocessor.s: ScenePreprocessor.cpp.s
@@ -2502,7 +2526,7 @@ ScenePreprocessor.s: ScenePreprocessor.cpp.s
# target to generate assembly for a file
ScenePreprocessor.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ScenePreprocessor.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ScenePreprocessor.cpp.s
.PHONY : ScenePreprocessor.cpp.s
SkeletonMeshBuilder.o: SkeletonMeshBuilder.cpp.o
@@ -2510,7 +2534,7 @@ SkeletonMeshBuilder.o: SkeletonMeshBuilder.cpp.o
# target to build an object file
SkeletonMeshBuilder.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SkeletonMeshBuilder.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SkeletonMeshBuilder.cpp.o
.PHONY : SkeletonMeshBuilder.cpp.o
SkeletonMeshBuilder.i: SkeletonMeshBuilder.cpp.i
@@ -2518,7 +2542,7 @@ SkeletonMeshBuilder.i: SkeletonMeshBuilder.cpp.i
# target to preprocess a source file
SkeletonMeshBuilder.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SkeletonMeshBuilder.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SkeletonMeshBuilder.cpp.i
.PHONY : SkeletonMeshBuilder.cpp.i
SkeletonMeshBuilder.s: SkeletonMeshBuilder.cpp.s
@@ -2526,7 +2550,7 @@ SkeletonMeshBuilder.s: SkeletonMeshBuilder.cpp.s
# target to generate assembly for a file
SkeletonMeshBuilder.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SkeletonMeshBuilder.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SkeletonMeshBuilder.cpp.s
.PHONY : SkeletonMeshBuilder.cpp.s
SortByPTypeProcess.o: SortByPTypeProcess.cpp.o
@@ -2534,7 +2558,7 @@ SortByPTypeProcess.o: SortByPTypeProcess.cpp.o
# target to build an object file
SortByPTypeProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SortByPTypeProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SortByPTypeProcess.cpp.o
.PHONY : SortByPTypeProcess.cpp.o
SortByPTypeProcess.i: SortByPTypeProcess.cpp.i
@@ -2542,7 +2566,7 @@ SortByPTypeProcess.i: SortByPTypeProcess.cpp.i
# target to preprocess a source file
SortByPTypeProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SortByPTypeProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SortByPTypeProcess.cpp.i
.PHONY : SortByPTypeProcess.cpp.i
SortByPTypeProcess.s: SortByPTypeProcess.cpp.s
@@ -2550,7 +2574,7 @@ SortByPTypeProcess.s: SortByPTypeProcess.cpp.s
# target to generate assembly for a file
SortByPTypeProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SortByPTypeProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SortByPTypeProcess.cpp.s
.PHONY : SortByPTypeProcess.cpp.s
SpatialSort.o: SpatialSort.cpp.o
@@ -2558,7 +2582,7 @@ SpatialSort.o: SpatialSort.cpp.o
# target to build an object file
SpatialSort.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SpatialSort.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SpatialSort.cpp.o
.PHONY : SpatialSort.cpp.o
SpatialSort.i: SpatialSort.cpp.i
@@ -2566,7 +2590,7 @@ SpatialSort.i: SpatialSort.cpp.i
# target to preprocess a source file
SpatialSort.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SpatialSort.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SpatialSort.cpp.i
.PHONY : SpatialSort.cpp.i
SpatialSort.s: SpatialSort.cpp.s
@@ -2574,7 +2598,7 @@ SpatialSort.s: SpatialSort.cpp.s
# target to generate assembly for a file
SpatialSort.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SpatialSort.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SpatialSort.cpp.s
.PHONY : SpatialSort.cpp.s
SplitByBoneCountProcess.o: SplitByBoneCountProcess.cpp.o
@@ -2582,7 +2606,7 @@ SplitByBoneCountProcess.o: SplitByBoneCountProcess.cpp.o
# target to build an object file
SplitByBoneCountProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitByBoneCountProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitByBoneCountProcess.cpp.o
.PHONY : SplitByBoneCountProcess.cpp.o
SplitByBoneCountProcess.i: SplitByBoneCountProcess.cpp.i
@@ -2590,7 +2614,7 @@ SplitByBoneCountProcess.i: SplitByBoneCountProcess.cpp.i
# target to preprocess a source file
SplitByBoneCountProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitByBoneCountProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitByBoneCountProcess.cpp.i
.PHONY : SplitByBoneCountProcess.cpp.i
SplitByBoneCountProcess.s: SplitByBoneCountProcess.cpp.s
@@ -2598,7 +2622,7 @@ SplitByBoneCountProcess.s: SplitByBoneCountProcess.cpp.s
# target to generate assembly for a file
SplitByBoneCountProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitByBoneCountProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitByBoneCountProcess.cpp.s
.PHONY : SplitByBoneCountProcess.cpp.s
SplitLargeMeshes.o: SplitLargeMeshes.cpp.o
@@ -2606,7 +2630,7 @@ SplitLargeMeshes.o: SplitLargeMeshes.cpp.o
# target to build an object file
SplitLargeMeshes.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitLargeMeshes.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitLargeMeshes.cpp.o
.PHONY : SplitLargeMeshes.cpp.o
SplitLargeMeshes.i: SplitLargeMeshes.cpp.i
@@ -2614,7 +2638,7 @@ SplitLargeMeshes.i: SplitLargeMeshes.cpp.i
# target to preprocess a source file
SplitLargeMeshes.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitLargeMeshes.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitLargeMeshes.cpp.i
.PHONY : SplitLargeMeshes.cpp.i
SplitLargeMeshes.s: SplitLargeMeshes.cpp.s
@@ -2622,7 +2646,7 @@ SplitLargeMeshes.s: SplitLargeMeshes.cpp.s
# target to generate assembly for a file
SplitLargeMeshes.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitLargeMeshes.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/SplitLargeMeshes.cpp.s
.PHONY : SplitLargeMeshes.cpp.s
StandardShapes.o: StandardShapes.cpp.o
@@ -2630,7 +2654,7 @@ StandardShapes.o: StandardShapes.cpp.o
# target to build an object file
StandardShapes.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/StandardShapes.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/StandardShapes.cpp.o
.PHONY : StandardShapes.cpp.o
StandardShapes.i: StandardShapes.cpp.i
@@ -2638,7 +2662,7 @@ StandardShapes.i: StandardShapes.cpp.i
# target to preprocess a source file
StandardShapes.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/StandardShapes.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/StandardShapes.cpp.i
.PHONY : StandardShapes.cpp.i
StandardShapes.s: StandardShapes.cpp.s
@@ -2646,7 +2670,7 @@ StandardShapes.s: StandardShapes.cpp.s
# target to generate assembly for a file
StandardShapes.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/StandardShapes.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/StandardShapes.cpp.s
.PHONY : StandardShapes.cpp.s
Subdivision.o: Subdivision.cpp.o
@@ -2654,7 +2678,7 @@ Subdivision.o: Subdivision.cpp.o
# target to build an object file
Subdivision.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Subdivision.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Subdivision.cpp.o
.PHONY : Subdivision.cpp.o
Subdivision.i: Subdivision.cpp.i
@@ -2662,7 +2686,7 @@ Subdivision.i: Subdivision.cpp.i
# target to preprocess a source file
Subdivision.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Subdivision.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Subdivision.cpp.i
.PHONY : Subdivision.cpp.i
Subdivision.s: Subdivision.cpp.s
@@ -2670,7 +2694,7 @@ Subdivision.s: Subdivision.cpp.s
# target to generate assembly for a file
Subdivision.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Subdivision.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/Subdivision.cpp.s
.PHONY : Subdivision.cpp.s
TargetAnimation.o: TargetAnimation.cpp.o
@@ -2678,7 +2702,7 @@ TargetAnimation.o: TargetAnimation.cpp.o
# target to build an object file
TargetAnimation.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TargetAnimation.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TargetAnimation.cpp.o
.PHONY : TargetAnimation.cpp.o
TargetAnimation.i: TargetAnimation.cpp.i
@@ -2686,7 +2710,7 @@ TargetAnimation.i: TargetAnimation.cpp.i
# target to preprocess a source file
TargetAnimation.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TargetAnimation.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TargetAnimation.cpp.i
.PHONY : TargetAnimation.cpp.i
TargetAnimation.s: TargetAnimation.cpp.s
@@ -2694,7 +2718,7 @@ TargetAnimation.s: TargetAnimation.cpp.s
# target to generate assembly for a file
TargetAnimation.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TargetAnimation.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TargetAnimation.cpp.s
.PHONY : TargetAnimation.cpp.s
TerragenLoader.o: TerragenLoader.cpp.o
@@ -2702,7 +2726,7 @@ TerragenLoader.o: TerragenLoader.cpp.o
# target to build an object file
TerragenLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TerragenLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TerragenLoader.cpp.o
.PHONY : TerragenLoader.cpp.o
TerragenLoader.i: TerragenLoader.cpp.i
@@ -2710,7 +2734,7 @@ TerragenLoader.i: TerragenLoader.cpp.i
# target to preprocess a source file
TerragenLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TerragenLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TerragenLoader.cpp.i
.PHONY : TerragenLoader.cpp.i
TerragenLoader.s: TerragenLoader.cpp.s
@@ -2718,7 +2742,7 @@ TerragenLoader.s: TerragenLoader.cpp.s
# target to generate assembly for a file
TerragenLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TerragenLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TerragenLoader.cpp.s
.PHONY : TerragenLoader.cpp.s
TextureTransform.o: TextureTransform.cpp.o
@@ -2726,7 +2750,7 @@ TextureTransform.o: TextureTransform.cpp.o
# target to build an object file
TextureTransform.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TextureTransform.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TextureTransform.cpp.o
.PHONY : TextureTransform.cpp.o
TextureTransform.i: TextureTransform.cpp.i
@@ -2734,7 +2758,7 @@ TextureTransform.i: TextureTransform.cpp.i
# target to preprocess a source file
TextureTransform.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TextureTransform.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TextureTransform.cpp.i
.PHONY : TextureTransform.cpp.i
TextureTransform.s: TextureTransform.cpp.s
@@ -2742,7 +2766,7 @@ TextureTransform.s: TextureTransform.cpp.s
# target to generate assembly for a file
TextureTransform.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TextureTransform.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TextureTransform.cpp.s
.PHONY : TextureTransform.cpp.s
TriangulateProcess.o: TriangulateProcess.cpp.o
@@ -2750,7 +2774,7 @@ TriangulateProcess.o: TriangulateProcess.cpp.o
# target to build an object file
TriangulateProcess.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TriangulateProcess.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TriangulateProcess.cpp.o
.PHONY : TriangulateProcess.cpp.o
TriangulateProcess.i: TriangulateProcess.cpp.i
@@ -2758,7 +2782,7 @@ TriangulateProcess.i: TriangulateProcess.cpp.i
# target to preprocess a source file
TriangulateProcess.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TriangulateProcess.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TriangulateProcess.cpp.i
.PHONY : TriangulateProcess.cpp.i
TriangulateProcess.s: TriangulateProcess.cpp.s
@@ -2766,7 +2790,7 @@ TriangulateProcess.s: TriangulateProcess.cpp.s
# target to generate assembly for a file
TriangulateProcess.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TriangulateProcess.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/TriangulateProcess.cpp.s
.PHONY : TriangulateProcess.cpp.s
UnrealLoader.o: UnrealLoader.cpp.o
@@ -2774,7 +2798,7 @@ UnrealLoader.o: UnrealLoader.cpp.o
# target to build an object file
UnrealLoader.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/UnrealLoader.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/UnrealLoader.cpp.o
.PHONY : UnrealLoader.cpp.o
UnrealLoader.i: UnrealLoader.cpp.i
@@ -2782,7 +2806,7 @@ UnrealLoader.i: UnrealLoader.cpp.i
# target to preprocess a source file
UnrealLoader.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/UnrealLoader.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/UnrealLoader.cpp.i
.PHONY : UnrealLoader.cpp.i
UnrealLoader.s: UnrealLoader.cpp.s
@@ -2790,7 +2814,7 @@ UnrealLoader.s: UnrealLoader.cpp.s
# target to generate assembly for a file
UnrealLoader.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/UnrealLoader.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/UnrealLoader.cpp.s
.PHONY : UnrealLoader.cpp.s
ValidateDataStructure.o: ValidateDataStructure.cpp.o
@@ -2798,7 +2822,7 @@ ValidateDataStructure.o: ValidateDataStructure.cpp.o
# target to build an object file
ValidateDataStructure.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ValidateDataStructure.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ValidateDataStructure.cpp.o
.PHONY : ValidateDataStructure.cpp.o
ValidateDataStructure.i: ValidateDataStructure.cpp.i
@@ -2806,7 +2830,7 @@ ValidateDataStructure.i: ValidateDataStructure.cpp.i
# target to preprocess a source file
ValidateDataStructure.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ValidateDataStructure.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ValidateDataStructure.cpp.i
.PHONY : ValidateDataStructure.cpp.i
ValidateDataStructure.s: ValidateDataStructure.cpp.s
@@ -2814,7 +2838,7 @@ ValidateDataStructure.s: ValidateDataStructure.cpp.s
# target to generate assembly for a file
ValidateDataStructure.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ValidateDataStructure.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/ValidateDataStructure.cpp.s
.PHONY : ValidateDataStructure.cpp.s
VertexTriangleAdjacency.o: VertexTriangleAdjacency.cpp.o
@@ -2822,7 +2846,7 @@ VertexTriangleAdjacency.o: VertexTriangleAdjacency.cpp.o
# target to build an object file
VertexTriangleAdjacency.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/VertexTriangleAdjacency.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/VertexTriangleAdjacency.cpp.o
.PHONY : VertexTriangleAdjacency.cpp.o
VertexTriangleAdjacency.i: VertexTriangleAdjacency.cpp.i
@@ -2830,7 +2854,7 @@ VertexTriangleAdjacency.i: VertexTriangleAdjacency.cpp.i
# target to preprocess a source file
VertexTriangleAdjacency.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/VertexTriangleAdjacency.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/VertexTriangleAdjacency.cpp.i
.PHONY : VertexTriangleAdjacency.cpp.i
VertexTriangleAdjacency.s: VertexTriangleAdjacency.cpp.s
@@ -2838,7 +2862,7 @@ VertexTriangleAdjacency.s: VertexTriangleAdjacency.cpp.s
# target to generate assembly for a file
VertexTriangleAdjacency.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/VertexTriangleAdjacency.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/VertexTriangleAdjacency.cpp.s
.PHONY : VertexTriangleAdjacency.cpp.s
XFileImporter.o: XFileImporter.cpp.o
@@ -2846,7 +2870,7 @@ XFileImporter.o: XFileImporter.cpp.o
# target to build an object file
XFileImporter.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileImporter.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileImporter.cpp.o
.PHONY : XFileImporter.cpp.o
XFileImporter.i: XFileImporter.cpp.i
@@ -2854,7 +2878,7 @@ XFileImporter.i: XFileImporter.cpp.i
# target to preprocess a source file
XFileImporter.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileImporter.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileImporter.cpp.i
.PHONY : XFileImporter.cpp.i
XFileImporter.s: XFileImporter.cpp.s
@@ -2862,7 +2886,7 @@ XFileImporter.s: XFileImporter.cpp.s
# target to generate assembly for a file
XFileImporter.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileImporter.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileImporter.cpp.s
.PHONY : XFileImporter.cpp.s
XFileParser.o: XFileParser.cpp.o
@@ -2870,7 +2894,7 @@ XFileParser.o: XFileParser.cpp.o
# target to build an object file
XFileParser.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileParser.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileParser.cpp.o
.PHONY : XFileParser.cpp.o
XFileParser.i: XFileParser.cpp.i
@@ -2878,7 +2902,7 @@ XFileParser.i: XFileParser.cpp.i
# target to preprocess a source file
XFileParser.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileParser.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileParser.cpp.i
.PHONY : XFileParser.cpp.i
XFileParser.s: XFileParser.cpp.s
@@ -2886,7 +2910,7 @@ XFileParser.s: XFileParser.cpp.s
# target to generate assembly for a file
XFileParser.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileParser.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/XFileParser.cpp.s
.PHONY : XFileParser.cpp.s
__/contrib/ConvertUTF/ConvertUTF.o: __/contrib/ConvertUTF/ConvertUTF.c.o
@@ -2894,7 +2918,7 @@ __/contrib/ConvertUTF/ConvertUTF.o: __/contrib/ConvertUTF/ConvertUTF.c.o
# target to build an object file
__/contrib/ConvertUTF/ConvertUTF.c.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/ConvertUTF/ConvertUTF.c.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/ConvertUTF/ConvertUTF.c.o
.PHONY : __/contrib/ConvertUTF/ConvertUTF.c.o
__/contrib/ConvertUTF/ConvertUTF.i: __/contrib/ConvertUTF/ConvertUTF.c.i
@@ -2902,7 +2926,7 @@ __/contrib/ConvertUTF/ConvertUTF.i: __/contrib/ConvertUTF/ConvertUTF.c.i
# target to preprocess a source file
__/contrib/ConvertUTF/ConvertUTF.c.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/ConvertUTF/ConvertUTF.c.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/ConvertUTF/ConvertUTF.c.i
.PHONY : __/contrib/ConvertUTF/ConvertUTF.c.i
__/contrib/ConvertUTF/ConvertUTF.s: __/contrib/ConvertUTF/ConvertUTF.c.s
@@ -2910,7 +2934,7 @@ __/contrib/ConvertUTF/ConvertUTF.s: __/contrib/ConvertUTF/ConvertUTF.c.s
# target to generate assembly for a file
__/contrib/ConvertUTF/ConvertUTF.c.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/ConvertUTF/ConvertUTF.c.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/ConvertUTF/ConvertUTF.c.s
.PHONY : __/contrib/ConvertUTF/ConvertUTF.c.s
__/contrib/irrXML/irrXML.o: __/contrib/irrXML/irrXML.cpp.o
@@ -2918,7 +2942,7 @@ __/contrib/irrXML/irrXML.o: __/contrib/irrXML/irrXML.cpp.o
# target to build an object file
__/contrib/irrXML/irrXML.cpp.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/irrXML/irrXML.cpp.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/irrXML/irrXML.cpp.o
.PHONY : __/contrib/irrXML/irrXML.cpp.o
__/contrib/irrXML/irrXML.i: __/contrib/irrXML/irrXML.cpp.i
@@ -2926,7 +2950,7 @@ __/contrib/irrXML/irrXML.i: __/contrib/irrXML/irrXML.cpp.i
# target to preprocess a source file
__/contrib/irrXML/irrXML.cpp.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/irrXML/irrXML.cpp.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/irrXML/irrXML.cpp.i
.PHONY : __/contrib/irrXML/irrXML.cpp.i
__/contrib/irrXML/irrXML.s: __/contrib/irrXML/irrXML.cpp.s
@@ -2934,7 +2958,7 @@ __/contrib/irrXML/irrXML.s: __/contrib/irrXML/irrXML.cpp.s
# target to generate assembly for a file
__/contrib/irrXML/irrXML.cpp.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/irrXML/irrXML.cpp.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/irrXML/irrXML.cpp.s
.PHONY : __/contrib/irrXML/irrXML.cpp.s
__/contrib/unzip/ioapi.o: __/contrib/unzip/ioapi.c.o
@@ -2942,7 +2966,7 @@ __/contrib/unzip/ioapi.o: __/contrib/unzip/ioapi.c.o
# target to build an object file
__/contrib/unzip/ioapi.c.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/ioapi.c.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/ioapi.c.o
.PHONY : __/contrib/unzip/ioapi.c.o
__/contrib/unzip/ioapi.i: __/contrib/unzip/ioapi.c.i
@@ -2950,7 +2974,7 @@ __/contrib/unzip/ioapi.i: __/contrib/unzip/ioapi.c.i
# target to preprocess a source file
__/contrib/unzip/ioapi.c.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/ioapi.c.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/ioapi.c.i
.PHONY : __/contrib/unzip/ioapi.c.i
__/contrib/unzip/ioapi.s: __/contrib/unzip/ioapi.c.s
@@ -2958,7 +2982,7 @@ __/contrib/unzip/ioapi.s: __/contrib/unzip/ioapi.c.s
# target to generate assembly for a file
__/contrib/unzip/ioapi.c.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/ioapi.c.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/ioapi.c.s
.PHONY : __/contrib/unzip/ioapi.c.s
__/contrib/unzip/unzip.o: __/contrib/unzip/unzip.c.o
@@ -2966,7 +2990,7 @@ __/contrib/unzip/unzip.o: __/contrib/unzip/unzip.c.o
# target to build an object file
__/contrib/unzip/unzip.c.o:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/unzip.c.o
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/unzip.c.o
.PHONY : __/contrib/unzip/unzip.c.o
__/contrib/unzip/unzip.i: __/contrib/unzip/unzip.c.i
@@ -2974,7 +2998,7 @@ __/contrib/unzip/unzip.i: __/contrib/unzip/unzip.c.i
# target to preprocess a source file
__/contrib/unzip/unzip.c.i:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/unzip.c.i
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/unzip.c.i
.PHONY : __/contrib/unzip/unzip.c.i
__/contrib/unzip/unzip.s: __/contrib/unzip/unzip.c.s
@@ -2982,7 +3006,7 @@ __/contrib/unzip/unzip.s: __/contrib/unzip/unzip.c.s
# target to generate assembly for a file
__/contrib/unzip/unzip.c.s:
- cd /mnt/hgfs/dev/assimp4.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/unzip.c.s
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(MAKE) -f code/CMakeFiles/assimp.dir/build.make code/CMakeFiles/assimp.dir/__/contrib/unzip/unzip.c.s
.PHONY : __/contrib/unzip/unzip.c.s
# Help Target
@@ -3283,6 +3307,9 @@ help:
@echo "... STEPFileReader.o"
@echo "... STEPFileReader.i"
@echo "... STEPFileReader.s"
+ @echo "... STLExporter.o"
+ @echo "... STLExporter.i"
+ @echo "... STLExporter.s"
@echo "... STLLoader.o"
@echo "... STLLoader.i"
@echo "... STLLoader.s"
@@ -3363,6 +3390,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /mnt/hgfs/dev/assimp4.svnc && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /mnt/hgfs/dev-2/assimp/assimp4-minorfix.svnc && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/doc/dox.h b/doc/dox.h
index 2c5ec222bab40cadbfb6321677b16293571ce1e7..978907d8c3f58e00e7396c5642fdab0bd4279a62 100644
--- a/doc/dox.h
+++ b/doc/dox.h
@@ -1583,10 +1583,10 @@ which spread their data across multiple files. </li>
@section mat Filling materials
The required definitions zo set/remove/query keys in #aiMaterial structures are declared in <i>MaterialSystem.h</i>, in a
-#aiMaterial derivate called #Assimp::MaterialHelper. The header is included by AssimpPCH.h, so you don't need to bother.
+#aiMaterial derivate called #aiMaterial. The header is included by AssimpPCH.h, so you don't need to bother.
@code
-MaterialHelper* mat = new MaterialHelper();
+aiMaterial* mat = new aiMaterial();
const float spec = 16.f;
mat->AddProperty(&spec, 1, AI_MATKEY_SHININESS);
diff --git a/include/aiDefines.h b/include/aiDefines.h
index aaae6601c1f256f00a33a0d87acab5191bd28d9b..42e92431392dba93d824d7800a4a901ea5b1effa 100644
--- a/include/aiDefines.h
+++ b/include/aiDefines.h
@@ -113,6 +113,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//////////////////////////////////////////////////////////////////////////
# ifdef ASSIMP_BUILD_DLL_EXPORT
# define ASSIMP_API __declspec(dllexport)
+# define ASSIMP_API_WINONLY __declspec(dllexport)
# pragma warning (disable : 4251)
//////////////////////////////////////////////////////////////////////////
@@ -121,8 +122,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//////////////////////////////////////////////////////////////////////////
# elif (defined ASSIMP_DLL)
# define ASSIMP_API __declspec(dllimport)
+# define ASSIMP_API_WINONLY __declspec(dllimport)
# else
# define ASSIMP_API
+# define ASSIMP_API_WINONLY
# endif
/* Force the compiler to inline a function, if possible
@@ -136,13 +139,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# define AI_WONT_RETURN
-# define ASSIMP_API
+# define ASSIMP_API __attribute__ ((visibility("default")))
+# define ASSIMP_API_WINONLY
# define AI_FORCE_INLINE inline
#endif // (defined _MSC_VER)
#ifdef __cplusplus
- /* No explicit 'struct' and 'enum' tags for C++, we don't want to
- * confuse the _AI_ of our IDE.
+ /* No explicit 'struct' and 'enum' tags for C++, this keeps showing up
+ * in doxydocs.
*/
# define C_STRUCT
# define C_ENUM
diff --git a/include/aiMaterial.h b/include/aiMaterial.h
index f436766f29402d17f459ea9159519e35e4afb18c..d16d5e58298490552ba0f020ccd5c02084cdb9be 100644
--- a/include/aiMaterial.h
+++ b/include/aiMaterial.h
@@ -663,11 +663,9 @@ struct ASSIMP_API aiMaterial
#ifdef __cplusplus
- /// NOTE: no initialization, instance Assimp::MaterialHelper instead
- aiMaterial() {}
-
public:
+ aiMaterial();
~aiMaterial();
// -------------------------------------------------------------------
@@ -744,6 +742,78 @@ public:
aiTextureOp* op = NULL,
aiTextureMapMode* mapmode = NULL) const;
+
+ // Setters
+
+
+ // ------------------------------------------------------------------------------
+ /** @brief Add a property with a given key and type info to the material
+ * structure
+ *
+ * @param pInput Pointer to input data
+ * @param pSizeInBytes Size of input data
+ * @param pKey Key/Usage of the property (AI_MATKEY_XXX)
+ * @param type Set by the AI_MATKEY_XXX macro
+ * @param index Set by the AI_MATKEY_XXX macro
+ * @param pType Type information hint */
+ aiReturn AddBinaryProperty (const void* pInput,
+ unsigned int pSizeInBytes,
+ const char* pKey,
+ unsigned int type ,
+ unsigned int index ,
+ aiPropertyTypeInfo pType);
+
+ // ------------------------------------------------------------------------------
+ /** @brief Add a string property with a given key and type info to the
+ * material structure
+ *
+ * @param pInput Input string
+ * @param pKey Key/Usage of the property (AI_MATKEY_XXX)
+ * @param type Set by the AI_MATKEY_XXX macro
+ * @param index Set by the AI_MATKEY_XXX macro */
+ aiReturn AddProperty (const aiString* pInput,
+ const char* pKey,
+ unsigned int type = 0,
+ unsigned int index = 0);
+
+ // ------------------------------------------------------------------------------
+ /** @brief Add a property with a given key to the material structure
+ * @param pInput Pointer to the input data
+ * @param pNumValues Number of values in the array
+ * @param pKey Key/Usage of the property (AI_MATKEY_XXX)
+ * @param type Set by the AI_MATKEY_XXX macro
+ * @param index Set by the AI_MATKEY_XXX macro */
+ template<class TYPE>
+ aiReturn AddProperty (const TYPE* pInput,
+ unsigned int pNumValues,
+ const char* pKey,
+ unsigned int type = 0,
+ unsigned int index = 0);
+
+ // ------------------------------------------------------------------------------
+ /** @brief Remove a given key from the list.
+ *
+ * The function fails if the key isn't found
+ * @param pKey Key to be deleted */
+ aiReturn RemoveProperty (const char* pKey,
+ unsigned int type = 0,
+ unsigned int index = 0);
+
+ // ------------------------------------------------------------------------------
+ /** @brief Removes all properties from the material.
+ *
+ * The data array remains allocated so adding new properties is quite fast. */
+ void Clear();
+
+ // ------------------------------------------------------------------------------
+ /** Copy the property list of a material
+ * @param pcDest Destination material
+ * @param pcSrc Source material
+ */
+ static void CopyPropertyList(aiMaterial* pcDest,
+ const aiMaterial* pcSrc);
+
+
#endif
/** List of all material properties loaded. */
diff --git a/include/aiMaterial.inl b/include/aiMaterial.inl
index c7b6be27b33df8046055dc3870da5a0d24f60ac7..b8f6a5fb9f3a1e218730aa2b99f0bbc8dd32ea4d 100644
--- a/include/aiMaterial.inl
+++ b/include/aiMaterial.inl
@@ -175,6 +175,102 @@ inline aiReturn aiMaterial::Get<aiString>(const char* pKey,unsigned int type,
return aiGetMaterialString(this,pKey,type,idx,&pOut);
}
+
+#ifndef ASSIMP_BUILD_NO_EXPORT
+
+// ---------------------------------------------------------------------------
+template<class TYPE>
+aiReturn aiMaterial::AddProperty (const TYPE* pInput,
+ const unsigned int pNumValues,
+ const char* pKey,
+ unsigned int type,
+ unsigned int index)
+{
+ return AddBinaryProperty((const void*)pInput,
+ pNumValues * sizeof(TYPE),
+ pKey,type,index,aiPTI_Buffer);
+}
+
+// ---------------------------------------------------------------------------
+template<>
+inline aiReturn aiMaterial::AddProperty<float> (const float* pInput,
+ const unsigned int pNumValues,
+ const char* pKey,
+ unsigned int type,
+ unsigned int index)
+{
+ return AddBinaryProperty((const void*)pInput,
+ pNumValues * sizeof(float),
+ pKey,type,index,aiPTI_Float);
+}
+
+// ---------------------------------------------------------------------------
+template<>
+inline aiReturn aiMaterial::AddProperty<aiUVTransform> (const aiUVTransform* pInput,
+ const unsigned int pNumValues,
+ const char* pKey,
+ unsigned int type,
+ unsigned int index)
+{
+ return AddBinaryProperty((const void*)pInput,
+ pNumValues * sizeof(aiUVTransform),
+ pKey,type,index,aiPTI_Float);
+}
+
+// ---------------------------------------------------------------------------
+template<>
+inline aiReturn aiMaterial::AddProperty<aiColor4D> (const aiColor4D* pInput,
+ const unsigned int pNumValues,
+ const char* pKey,
+ unsigned int type,
+ unsigned int index)
+{
+ return AddBinaryProperty((const void*)pInput,
+ pNumValues * sizeof(aiColor4D),
+ pKey,type,index,aiPTI_Float);
+}
+
+// ---------------------------------------------------------------------------
+template<>
+inline aiReturn aiMaterial::AddProperty<aiColor3D> (const aiColor3D* pInput,
+ const unsigned int pNumValues,
+ const char* pKey,
+ unsigned int type,
+ unsigned int index)
+{
+ return AddBinaryProperty((const void*)pInput,
+ pNumValues * sizeof(aiColor3D),
+ pKey,type,index,aiPTI_Float);
+}
+
+// ---------------------------------------------------------------------------
+template<>
+inline aiReturn aiMaterial::AddProperty<aiVector3D> (const aiVector3D* pInput,
+ const unsigned int pNumValues,
+ const char* pKey,
+ unsigned int type,
+ unsigned int index)
+{
+ return AddBinaryProperty((const void*)pInput,
+ pNumValues * sizeof(aiVector3D),
+ pKey,type,index,aiPTI_Float);
+}
+
+// ---------------------------------------------------------------------------
+template<>
+inline aiReturn aiMaterial::AddProperty<int> (const int* pInput,
+ const unsigned int pNumValues,
+ const char* pKey,
+ unsigned int type,
+ unsigned int index)
+{
+ return AddBinaryProperty((const void*)pInput,
+ pNumValues * sizeof(int),
+ pKey,type,index,aiPTI_Integer);
+}
+
+#endif
+
//! @endcond
#endif //! AI_MATERIAL_INL_INC
diff --git a/tools/assimp_view/Display.cpp b/tools/assimp_view/Display.cpp
index 1571a66092cff2c1a356667495a799480c8a08a9..ac86598f390e4e5ccf35a170b3674b239c663abd 100644
--- a/tools/assimp_view/Display.cpp
+++ b/tools/assimp_view/Display.cpp
@@ -288,7 +288,7 @@ int CDisplay::ReplaceCurrentTexture(const char* szPath)
m_pcCurrentTexture->hTreeItem);
// change this in the old aiMaterial structure, too
- Assimp::MaterialHelper* pcMat = (Assimp::MaterialHelper*)
+ aiMaterial* pcMat = (aiMaterial*)
g_pcAsset->pcScene->mMaterials[m_pcCurrentTexture->iMatIndex];
// update all meshes referencing this material
@@ -364,26 +364,7 @@ int CDisplay::ReplaceCurrentTexture(const char* szPath)
//}
}
}
- // now update the material itself
- aiString szOld;
- aiGetMaterialString(pcMat,AI_MATKEY_TEXTURE(m_pcCurrentTexture->iType,0),&szOld);
- pcMat->AddProperty(&szString,AI_MATKEY_TEXTURE(m_pcCurrentTexture->iType,0));
-
-#if 0
- char szBuffer[512];
- sprintf(szBuffer,"%s%s",szKey,"_old");
-
- if (AI_SUCCESS != aiGetMaterialString(pcMat, szBuffer, &szOld))
- {
- pcMat->AddProperty(&szOld,szBuffer );
- }
- else if (szString.length == szOld.length &&
- 0 == ASSIMP_stricmp(szString.data,szOld.data))
- {
- pcMat->RemoveProperty(szBuffer);
- }
-#endif
return 1;
}
//-------------------------------------------------------------------------------
@@ -1296,7 +1277,7 @@ int CDisplay::HandleTreeViewPopup(WPARAM wParam,LPARAM lParam)
}
// change the material key ...
- Assimp::MaterialHelper* pcMat = (Assimp::MaterialHelper*)g_pcAsset->pcScene->mMaterials[
+ aiMaterial* pcMat = (aiMaterial*)g_pcAsset->pcScene->mMaterials[
this->m_pcCurrentMaterial->iIndex];
pcMat->AddProperty<aiColor4D>(&clrOld,1,szMatKey,0,0);
@@ -1429,7 +1410,7 @@ int CDisplay::HandleTreeViewPopup2(WPARAM wParam,LPARAM lParam)
return 1;
}
- Assimp::MaterialHelper* pcMat = (Assimp::MaterialHelper*)g_pcAsset->pcScene->mMaterials[
+ aiMaterial* pcMat = (aiMaterial*)g_pcAsset->pcScene->mMaterials[
m_pcCurrentTexture->iMatIndex];
unsigned int s;
diff --git a/tools/assimp_view/Normals.cpp b/tools/assimp_view/Normals.cpp
index 1a03d1cc3f79ffe8fafce1ee48d4c43b712a6c0a..3d6d4f5bcc99f695b55c40746dc0f38922bed56d 100644
--- a/tools/assimp_view/Normals.cpp
+++ b/tools/assimp_view/Normals.cpp
@@ -43,6 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "stdafx.h"
#include "assimp_view.h"
+// note: these are no longer part of the public API, but they are
+// exported on Windows to keep AssimpView alive.
#include "GenFaceNormalsProcess.h"
#include "GenVertexNormalsProcess.h"
#include "JoinVerticesProcess.h"
@@ -52,45 +54,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace AssimpView {
-// NOTE: These classes are necessary since the c'tors of all
-// postprocess steps are protected. Generally they're not
-// intended to be used directly by applications.
-//
-// However, the viewer is an exception. It does nothing than
-// displaxing the aiScene, so it wouldn't make sense to copy
-// the data to another data structure.
-//
-class MyGenFaceNormalsProcess : public Assimp::GenFaceNormalsProcess
-{
-public:
- MyGenFaceNormalsProcess() {}
-};
-
-class MyGenVertexNormalsProcess : public Assimp::GenVertexNormalsProcess
-{
-public:
- MyGenVertexNormalsProcess() {}
-};
-
-class MyMakeVerboseFormatProcess : public Assimp::MakeVerboseFormatProcess
-{
-public:
- MyMakeVerboseFormatProcess() {}
-};
-
-class MyCalcTangentsProcess : public Assimp::CalcTangentsProcess
-{
-public:
- MyCalcTangentsProcess() {}
-};
-
-class MyJoinVerticesProcess : public Assimp::JoinVerticesProcess
-{
-public:
- MyJoinVerticesProcess() {}
-};
-
-
bool g_bWasFlipped = false;
float g_smoothAngle = 80.f;
@@ -131,7 +94,7 @@ void AssetHelper::SetNormalSet(unsigned int iSet)
{
// we need to build an unique set of vertices for this ...
{
- MyMakeVerboseFormatProcess* pcProcess = new MyMakeVerboseFormatProcess();
+ MakeVerboseFormatProcess* pcProcess = new MakeVerboseFormatProcess();
pcProcess->Execute(pcScene);
delete pcProcess;
@@ -152,14 +115,14 @@ void AssetHelper::SetNormalSet(unsigned int iSet)
// now we can start to calculate a new set of normals
if (HARD == iSet)
{
- MyGenFaceNormalsProcess* pcProcess = new MyGenFaceNormalsProcess();
+ GenFaceNormalsProcess* pcProcess = new GenFaceNormalsProcess();
pcProcess->Execute(pcScene);
FlipNormalsInt();
delete pcProcess;
}
else if (SMOOTH == iSet)
{
- MyGenVertexNormalsProcess* pcProcess = new MyGenVertexNormalsProcess();
+ GenVertexNormalsProcess* pcProcess = new GenVertexNormalsProcess();
pcProcess->SetMaxSmoothAngle((float)AI_DEG_TO_RAD(g_smoothAngle));
pcProcess->Execute(pcScene);
FlipNormalsInt();
@@ -179,12 +142,12 @@ void AssetHelper::SetNormalSet(unsigned int iSet)
}
// recalculate tangents and bitangents
- Assimp::BaseProcess* pcProcess = new MyCalcTangentsProcess();
+ Assimp::BaseProcess* pcProcess = new CalcTangentsProcess();
pcProcess->Execute(pcScene);
delete pcProcess;
// join the mesh vertices again
- pcProcess = new MyJoinVerticesProcess();
+ pcProcess = new JoinVerticesProcess();
pcProcess->Execute(pcScene);
delete pcProcess;
diff --git a/tools/assimp_view/assimp_view.h b/tools/assimp_view/assimp_view.h
index b6eb38f2ef9a4bbe18824b7d5d80cdada861421f..4be5b073f67be3430fe9e32ad06d574718676608 100644
--- a/tools/assimp_view/assimp_view.h
+++ b/tools/assimp_view/assimp_view.h
@@ -61,7 +61,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../../code/AssimpPCH.h" /* HACK */
-#include "MaterialSystem.h" // MaterialHelper clas
+#include "MaterialSystem.h" // aiMaterial clas
#include "StringComparison.h" // ASSIMP_stricmp and ASSIMP_strincmp
// in order for std::min and std::max to behave properly
diff --git a/workspaces/vc9/assimp.vcproj b/workspaces/vc9/assimp.vcproj
index ea471dea98c728bac9dc231be8df8f3092f5fdbf..a63561ed5539647b027857ab4d0d0999f469464a 100644
--- a/workspaces/vc9/assimp.vcproj
+++ b/workspaces/vc9/assimp.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="assimp"
ProjectGUID="{5691E159-2D9B-407F-971F-EA5C592DC524}"
RootNamespace="assimp"
@@ -83,11 +83,10 @@
/>
</Configuration>
<Configuration
- Name="release|Win32"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="debug|x64"
+ OutputDirectory="./../../lib/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
+ IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
ConfigurationType="4"
- InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\FastSTL.vsprops"
- WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -103,25 +102,19 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="0"
- OmitFramePointers="true"
- WholeProgramOptimization="false"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0;WIN32"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
- FloatingPointModel="2"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="AssimpPCH.h"
+ PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
+ BasicRuntimeChecks="3"
+ SmallerTypeCheck="true"
+ RuntimeLibrary="3"
+ EnableFunctionLevelLinking="true"
WarningLevel="3"
- Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -152,9 +145,10 @@
/>
</Configuration>
<Configuration
- Name="release-dll|Win32"
- ConfigurationType="2"
- InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
+ Name="release|Win32"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -178,8 +172,9 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="0"
OmitFramePointers="true"
+ WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
+ PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0;WIN32"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -200,19 +195,11 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\Assimp32.dll"
- GenerateDebugInformation="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(SolutionDir)..\..\lib\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\assimp.lib"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
- <Tool
- Name="VCManifestTool"
- />
<Tool
Name="VCXDCMakeTool"
/>
@@ -222,18 +209,15 @@
<Tool
Name="VCFxCopTool"
/>
- <Tool
- Name="VCAppVerifierTool"
- />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)"

copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)\"
"
/>
</Configuration>
<Configuration
- Name="debug-dll|Win32"
- ConfigurationType="2"
- InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
+ Name="release|x64"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\shared\LibShared.vsprops"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -249,22 +233,23 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="NDEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="0"
FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -276,19 +261,11 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\Assimp32d.dll"
- GenerateDebugInformation="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(SolutionDir)..\..\lib\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\assimp.lib"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
- <Tool
- Name="VCManifestTool"
- />
<Tool
Name="VCXDCMakeTool"
/>
@@ -298,18 +275,14 @@
<Tool
Name="VCFxCopTool"
/>
- <Tool
- Name="VCAppVerifierTool"
- />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)"

copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)\"
"
/>
</Configuration>
<Configuration
- Name="release-noboost-st|Win32"
- ConfigurationType="4"
- InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
+ Name="release-dll|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -334,7 +307,7 @@
FavorSizeOrSpeed="0"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND"
+ PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -355,11 +328,19 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\Assimp32.dll"
+ GenerateDebugInformation="true"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(SolutionDir)..\..\lib\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\assimp.lib"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -369,14 +350,19 @@
<Tool
Name="VCFxCopTool"
/>
+ <Tool
+ Name="VCAppVerifierTool"
+ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="mkdir "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)"

copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)\"
"
/>
</Configuration>
<Configuration
- Name="debug-noboost-st|Win32"
- ConfigurationType="4"
- InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
+ Name="release-dll|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\shared\DllShared.vsprops"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -392,22 +378,22 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="0"
FloatingPointModel="2"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -419,11 +405,17 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\Assimp64.dll"
+ ImportLibrary="$(SolutionDir)..\..\lib\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\assimp.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -433,14 +425,18 @@
<Tool
Name="VCFxCopTool"
/>
+ <Tool
+ Name="VCAppVerifierTool"
+ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="mkdir "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)"

copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)\"
"
/>
</Configuration>
<Configuration
- Name="debug-st|Win32"
- ConfigurationType="4"
- InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
+ Name="debug-dll|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\shared\DllShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -461,7 +457,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32"
+ PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
BasicRuntimeChecks="3"
SmallerTypeCheck="true"
RuntimeLibrary="3"
@@ -483,11 +479,19 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\Assimp32d.dll"
+ GenerateDebugInformation="true"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(SolutionDir)..\..\lib\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\assimp.lib"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -497,15 +501,18 @@
<Tool
Name="VCFxCopTool"
/>
+ <Tool
+ Name="VCAppVerifierTool"
+ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="mkdir "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)"

copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)\"
"
/>
</Configuration>
<Configuration
- Name="release-st|Win32"
- ConfigurationType="4"
- InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
- WholeProgramOptimization="0"
+ Name="debug-dll|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\shared\DllShared.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -521,24 +528,19 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="0"
- OmitFramePointers="true"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
- FloatingPointModel="2"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="AssimpPCH.h"
+ PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
+ BasicRuntimeChecks="3"
+ SmallerTypeCheck="true"
+ RuntimeLibrary="3"
+ EnableFunctionLevelLinking="true"
WarningLevel="3"
- Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -550,11 +552,17 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\Assimp64d.dll"
+ ImportLibrary="$(SolutionDir)..\..\lib\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\assimp.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
+ <Tool
+ Name="VCManifestTool"
+ />
<Tool
Name="VCXDCMakeTool"
/>
@@ -564,15 +572,19 @@
<Tool
Name="VCFxCopTool"
/>
+ <Tool
+ Name="VCAppVerifierTool"
+ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="mkdir "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)"

copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)\"
"
/>
</Configuration>
<Configuration
- Name="debug|x64"
- OutputDirectory="./../../lib/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
- IntermediateDirectory="./../../obj/$(ProjectName)_$(ConfigurationName)_$(PlatformName)"
+ Name="release-noboost-st|Win32"
ConfigurationType="4"
+ InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -588,19 +600,24 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="0"
+ OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3"
- DebugInformationFormat="3"
+ Detect64BitPortabilityProblems="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -631,9 +648,9 @@
/>
</Configuration>
<Configuration
- Name="release|x64"
+ Name="release-noboost-st|x64"
ConfigurationType="4"
- InheritedPropertySheets=".\shared\LibShared.vsprops"
+ InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops"
WholeProgramOptimization="0"
>
<Tool
@@ -658,12 +675,11 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="NDEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
+ PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="0"
- FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3"
@@ -697,10 +713,9 @@
/>
</Configuration>
<Configuration
- Name="release-dll|x64"
- ConfigurationType="2"
- InheritedPropertySheets=".\shared\DllShared.vsprops"
- WholeProgramOptimization="0"
+ Name="debug-noboost-st|Win32"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -716,22 +731,22 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="0"
+ PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND"
+ BasicRuntimeChecks="3"
+ SmallerTypeCheck="true"
+ RuntimeLibrary="3"
+ EnableFunctionLevelLinking="true"
FloatingPointModel="2"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -743,17 +758,11 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\Assimp64.dll"
- ImportLibrary="$(SolutionDir)..\..\lib\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\assimp.lib"
- TargetMachine="17"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
- <Tool
- Name="VCManifestTool"
- />
<Tool
Name="VCXDCMakeTool"
/>
@@ -763,18 +772,14 @@
<Tool
Name="VCFxCopTool"
/>
- <Tool
- Name="VCAppVerifierTool"
- />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)"

copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)\"
"
/>
</Configuration>
<Configuration
- Name="debug-dll|x64"
- ConfigurationType="2"
- InheritedPropertySheets=".\shared\DllShared.vsprops"
+ Name="debug-noboost-st|x64"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -796,7 +801,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
+ PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND"
BasicRuntimeChecks="3"
SmallerTypeCheck="true"
RuntimeLibrary="3"
@@ -814,17 +819,11 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\Assimp64d.dll"
- ImportLibrary="$(SolutionDir)..\..\lib\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\assimp.lib"
- TargetMachine="17"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
- <Tool
- Name="VCManifestTool"
- />
<Tool
Name="VCXDCMakeTool"
/>
@@ -834,19 +833,14 @@
<Tool
Name="VCFxCopTool"
/>
- <Tool
- Name="VCAppVerifierTool"
- />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)"
mkdir "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)"

copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\unit_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpview_$(ConfigurationName)_$(PlatformName)\"
copy "$(OutDir)\$(TargetFileName)" "$(SolutionDir)..\..\bin\assimpcmd_$(ConfigurationName)_$(PlatformName)\"
"
/>
</Configuration>
<Configuration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
ConfigurationType="4"
- InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops"
- WholeProgramOptimization="0"
+ InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -862,22 +856,22 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="0"
+ PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32"
+ BasicRuntimeChecks="3"
+ SmallerTypeCheck="true"
+ RuntimeLibrary="3"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -908,9 +902,9 @@
/>
</Configuration>
<Configuration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
ConfigurationType="4"
- InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\NoBoostShared.vsprops"
+ InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -932,7 +926,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND"
+ PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
BasicRuntimeChecks="3"
SmallerTypeCheck="true"
RuntimeLibrary="3"
@@ -969,9 +963,10 @@
/>
</Configuration>
<Configuration
- Name="debug-st|x64"
+ Name="release-st|Win32"
ConfigurationType="4"
- InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops"
+ InheritedPropertySheets=".\shared\LibShared.vsprops;.\shared\SingleThreadedShared.vsprops;.\shared\FastSTL.vsprops"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -987,19 +982,24 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="0"
+ OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\contrib\unzip"
- PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
- BasicRuntimeChecks="3"
- SmallerTypeCheck="true"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="AssimpPCH.h"
WarningLevel="3"
- DebugInformationFormat="3"
+ Detect64BitPortabilityProblems="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -2144,7 +2144,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2152,7 +2152,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2160,7 +2160,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2168,7 +2168,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2176,7 +2176,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2184,7 +2184,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2192,7 +2192,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2200,7 +2200,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2342,16 +2342,15 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="AssimpPCH.h"
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2360,7 +2359,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2369,7 +2368,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2378,16 +2377,15 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="AssimpPCH.h"
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2396,19 +2394,21 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="AssimpPCH.h"
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="AssimpPCH.h"
/>
</FileConfiguration>
<FileConfiguration
@@ -2719,7 +2719,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2727,7 +2727,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2735,7 +2735,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2743,7 +2743,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2751,7 +2751,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2759,7 +2759,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2767,7 +2767,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2775,7 +2775,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2783,7 +2783,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2791,7 +2791,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2799,7 +2799,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2807,7 +2807,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2815,7 +2815,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2823,7 +2823,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2863,7 +2863,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2871,7 +2871,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2879,7 +2879,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2887,7 +2887,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2895,7 +2895,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2903,7 +2903,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2911,7 +2911,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2919,7 +2919,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2927,7 +2927,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2935,7 +2935,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2943,7 +2943,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2951,7 +2951,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2959,7 +2959,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -2967,7 +2967,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2995,7 +2995,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3003,7 +3003,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3011,7 +3011,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3019,7 +3019,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3027,7 +3027,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3035,7 +3035,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3043,7 +3043,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3051,7 +3051,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3059,7 +3059,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3067,7 +3067,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3075,7 +3075,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3083,7 +3083,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3091,7 +3091,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3099,7 +3099,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3135,7 +3135,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3143,7 +3143,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3151,7 +3151,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3159,7 +3159,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3167,7 +3167,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3175,7 +3175,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3183,7 +3183,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3191,7 +3191,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3199,7 +3199,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3207,7 +3207,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3215,7 +3215,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3223,7 +3223,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3231,7 +3231,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3239,7 +3239,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3275,7 +3275,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3283,7 +3283,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3291,7 +3291,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3299,7 +3299,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3307,7 +3307,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3315,7 +3315,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3323,7 +3323,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3331,7 +3331,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3339,7 +3339,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3347,7 +3347,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3355,7 +3355,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3363,7 +3363,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3371,7 +3371,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3379,7 +3379,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3411,7 +3411,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3419,7 +3419,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3427,7 +3427,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3435,7 +3435,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3443,7 +3443,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3451,7 +3451,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3459,7 +3459,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3467,7 +3467,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3475,7 +3475,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3483,7 +3483,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3491,7 +3491,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3499,7 +3499,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3507,7 +3507,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3515,7 +3515,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3547,7 +3547,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3555,7 +3555,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3563,7 +3563,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3571,7 +3571,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3579,7 +3579,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3587,7 +3587,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3595,7 +3595,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3603,7 +3603,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3611,7 +3611,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3619,7 +3619,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3627,7 +3627,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3635,7 +3635,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3643,7 +3643,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3651,7 +3651,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3683,7 +3683,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3691,7 +3691,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3699,7 +3699,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3707,7 +3707,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3715,7 +3715,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3723,7 +3723,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3731,7 +3731,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3739,7 +3739,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3747,7 +3747,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3755,7 +3755,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3763,7 +3763,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3771,7 +3771,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3779,7 +3779,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3787,7 +3787,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3831,7 +3831,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3839,7 +3839,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3847,7 +3847,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3855,7 +3855,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3863,7 +3863,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3871,7 +3871,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3879,7 +3879,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3887,7 +3887,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3895,7 +3895,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3903,7 +3903,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3911,7 +3911,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3919,7 +3919,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3927,7 +3927,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3935,7 +3935,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3971,7 +3971,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|Win32"
+ Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3979,7 +3979,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|Win32"
+ Name="release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -3987,7 +3987,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|Win32"
+ Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -3995,7 +3995,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|Win32"
+ Name="release-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -4003,7 +4003,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|Win32"
+ Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -4011,7 +4011,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|Win32"
+ Name="debug-dll|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -4019,7 +4019,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-st|Win32"
+ Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -4027,7 +4027,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug|x64"
+ Name="release-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -4035,7 +4035,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release|x64"
+ Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -4043,7 +4043,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-dll|x64"
+ Name="debug-noboost-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -4051,7 +4051,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-dll|x64"
+ Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -4059,7 +4059,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="release-noboost-st|x64"
+ Name="debug-st|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -4067,7 +4067,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-noboost-st|x64"
+ Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -4075,7 +4075,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="debug-st|x64"
+ Name="release-st|Win32"
>
<Tool
Name="VCCLCompilerTool"