v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable compiler switch test for no exporter requested.

pull/1598/head
Kim Kulling 2017-11-29 21:02:52 +01:00
parent 59dcfefeb2
commit 46caecdf35
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/D3MFExporter.cpp
View File

@ -38,6 +38,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------- ----------------------------------------------------------------------
*/ */
#ifndef ASSIMP_BUILD_NO_EXPORT
#ifndef ASSIMP_BUILD_NO_3MF_EXPORTER
#include "D3MFExporter.h" #include "D3MFExporter.h"
#include <assimp/scene.h> #include <assimp/scene.h>
@ -69,8 +72,6 @@ void ExportScene3MF( const char* pFile, IOSystem* pIOSystem, const aiScene* pSce
namespace D3MF { namespace D3MF {
#ifndef ASSIMP_BUILD_NO3MF_EXPORTER
D3MFExporter::D3MFExporter( const char* pFile, const aiScene* pScene ) D3MFExporter::D3MFExporter( const char* pFile, const aiScene* pScene )
: mArchiveName( pFile ) : mArchiveName( pFile )
, m_zipArchive( nullptr ) , m_zipArchive( nullptr )
@ -276,8 +277,9 @@ void D3MFExporter::writeRelInfoToFile( const std::string &folder, const std::str
zip_entry_close( m_zipArchive ); zip_entry_close( m_zipArchive );
} }
#endif // ASSIMP_BUILD_NO3MF_EXPORTER
} // Namespace D3MF } // Namespace D3MF
} // Namespace Assimp } // Namespace Assimp
#endif // ASSIMP_BUILD_NO3MF_EXPORTER
#endif // ASSIMP_BUILD_NO_EXPORT

2
code/D3MFExporter.h
View File

@ -58,6 +58,7 @@ class IOStream;
namespace D3MF { namespace D3MF {
#ifndef ASSIMP_BUILD_NO_EXPORT
#ifndef ASSIMP_BUILD_NO3MF_EXPORTER #ifndef ASSIMP_BUILD_NO3MF_EXPORTER
struct OpcPackageRelationship; struct OpcPackageRelationship;
@ -92,6 +93,7 @@ private:
}; };
#endif // ASSIMP_BUILD_NO3MF_EXPORTER #endif // ASSIMP_BUILD_NO3MF_EXPORTER
#endif // ASSIMP_BUILD_NO_EXPORT
} // Namespace D3MF } // Namespace D3MF
} // Namespace Assimp } // Namespace Assimp