-add missing unit to cmake script for assimp_cmd, fix linux build trouble.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@934 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2011-04-03 11:44:09 +00:00
parent e6c0dbd35c
commit f8add9bb22
4 changed files with 17 additions and 1 deletions

View File

@ -166,6 +166,8 @@ SOURCE_GROUP( Collada FILES
ColladaLoader.h ColladaLoader.h
ColladaParser.cpp ColladaParser.cpp
ColladaParser.h ColladaParser.h
ColladaExporter.h
ColladaExporter.cpp
) )
SOURCE_GROUP( DXF FILES SOURCE_GROUP( DXF FILES
@ -734,6 +736,8 @@ ADD_LIBRARY( assimp SHARED
Profiler.h Profiler.h
NDOLoader.cpp NDOLoader.cpp
NDOLoader.h NDOLoader.h
ColladaExporter.h
ColladaExporter.cpp
# Necessary to show the headers in the project when using the VC++ generator: # Necessary to show the headers in the project when using the VC++ generator:
BoostWorkaround/boost/math/common_factor_rt.hpp BoostWorkaround/boost/math/common_factor_rt.hpp

View File

@ -39,6 +39,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "AssimpPCH.h" #include "AssimpPCH.h"
#ifndef ASSIMP_BUILD_NO_EXPORT
#include "ColladaExporter.h" #include "ColladaExporter.h"
using namespace Assimp; using namespace Assimp;
@ -362,3 +364,6 @@ void ColladaExporter::WriteNode( const aiNode* pNode)
PopTag(); PopTag();
mOutput << startstr << "</node>" << endstr; mOutput << startstr << "</node>" << endstr;
} }
#endif

View File

@ -34,6 +34,7 @@ ADD_EXECUTABLE( assimp_cmd
resource.h resource.h
WriteDumb.cpp WriteDumb.cpp
Info.cpp Info.cpp
Export.cpp
) )
TARGET_LINK_LIBRARIES( assimp_cmd assimp ) TARGET_LINK_LIBRARIES( assimp_cmd assimp )

View File

@ -51,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <limits>
#include <aiPostProcess.h> #include <aiPostProcess.h>
#include <aiVersion.h> #include <aiVersion.h>
@ -69,6 +70,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <../contrib/zlib/zlib.h> #include <../contrib/zlib/zlib.h>
#ifndef SIZE_MAX
# define SIZE_MAX (std::numeric_limits<size_t>::max())
#endif
using namespace Assimp; using namespace Assimp;
@ -197,4 +203,4 @@ int Assimp_TestBatchLoad (
unsigned int num); unsigned int num);
#endif // !! AICMD_MAIN_INCLUDED #endif // !! AICMD_MAIN_INCLUDED