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

Moved private headers to code/ as discussed; removed boost::random workaround which was no longer needed; CMake cleanup part two (Boost detection, …). 

Please be quick to suspect this commit if the build should break on Windows/MSVC.

(Again, sorry for the large commit, but I didnt want to flood the commit log with my git-style tiny commits.)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@577 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
klickverbot 2010-03-03 21:48:23 +00:00
parent ee6c6e5187
commit ac8479f542
24 changed files with 109 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -6,9 +6,13 @@ INCLUDE_DIRECTORIES( include )
SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib ) SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin ) SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin )
SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" ) # Cache these to allow the user to override them manually.
SET( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" ) SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH
SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" ) "Path the built library files are installed to." )
SET( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH
"Path the header files are installed to." )
SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH
"Path the tool executables are installed to." )
# Libs # Libs
ADD_SUBDIRECTORY( code/ ) ADD_SUBDIRECTORY( code/ )

30
code/AssimpPCH.h
View File

@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw /* Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw
*/ */
#ifdef _MSC_VER #ifdef _MSC_VER
# include "../include/Compiler/pstdint.h" # include "pstdint.h"
#else #else
# include <stdint.h> # include <stdint.h>
#endif #endif
@ -134,28 +134,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "qnan.h" #include "qnan.h"
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
/* boost headers - if -noboost is enabled, take it from the workaround directory #include <boost/scoped_ptr.hpp>
* using hardcoded paths. This has the advantage that the user doesn't need to specify #include <boost/scoped_array.hpp>
* 'include/BoostWorkaround' as additional include path. #include <boost/format.hpp>
*/ #include <boost/foreach.hpp>
// ---------------------------------------------------------------------------------------- #include <boost/static_assert.hpp>
#ifdef ASSIMP_BUILD_BOOST_WORKAROUND
# include "../include/BoostWorkaround/boost/scoped_ptr.hpp"
# include "../include/BoostWorkaround/boost/scoped_array.hpp"
# include "../include/BoostWorkaround/boost/format.hpp"
# include "../include/BoostWorkaround/boost/foreach.hpp"
# include "../include/BoostWorkaround/boost/static_assert.hpp"
#else
# include <boost/scoped_ptr.hpp>
# include <boost/scoped_array.hpp>
# include <boost/format.hpp>
# include <boost/foreach.hpp>
# include <boost/static_assert.hpp>
#endif // ! ASSIMP_BUILD_BOOST_WORKAROUND
#endif // !! ASSIMP_PCH_INCLUDED #endif // !! ASSIMP_PCH_INCLUDED

0
include/BoostWorkaround/boost/foreach.hpp → code/BoostWorkaround/boost/foreach.hpp
View File

0
include/BoostWorkaround/boost/format.hpp → code/BoostWorkaround/boost/format.hpp
View File

0
include/BoostWorkaround/boost/common_factor_rt.hpp → code/BoostWorkaround/boost/math/common_factor_rt.hpp
View File

0
include/BoostWorkaround/boost/scoped_array.hpp → code/BoostWorkaround/boost/scoped_array.hpp
View File

0
include/BoostWorkaround/boost/scoped_ptr.hpp → code/BoostWorkaround/boost/scoped_ptr.hpp
View File

0
include/BoostWorkaround/boost/static_assert.hpp → code/BoostWorkaround/boost/static_assert.hpp
View File

12
include/BoostWorkaround/boost/tuple/tuple.hpp → code/BoostWorkaround/boost/tuple/tuple.hpp
View File

@ -26,7 +26,7 @@ namespace boost {
// Predeclare some stuff // Predeclare some stuff
template <typename, unsigned, typename, bool, unsigned> struct value_getter; template <typename, unsigned, typename, bool, unsigned> struct value_getter;
// Helper to obtain the type of a tuple element // Helper to obtain the type of a tuple element
template <typename T, unsigned NIDX, typename TNEXT, unsigned N /*= 0*/> template <typename T, unsigned NIDX, typename TNEXT, unsigned N /*= 0*/>
struct type_getter { struct type_getter {
@ -126,9 +126,9 @@ namespace boost {
typedef value_getter<typename TNEXT::type,NIDX+1,typename TNEXT::next_type, typedef value_getter<typename TNEXT::type,NIDX+1,typename TNEXT::next_type,
IS_CONST, N> next_value_getter; IS_CONST, N> next_value_getter;
typename ConstIf<IS_CONST,typename type_getter<T,NIDX,TNEXT,N>::type>::t& typename ConstIf<IS_CONST,typename type_getter<T,NIDX,TNEXT,N>::type>::t&
operator () (typename ConstIf<IS_CONST,outer_elem >::t& me) { operator () (typename ConstIf<IS_CONST,outer_elem >::t& me) {
next_value_getter s; next_value_getter s;
return s(me.next); return s(me.next);
} }
@ -156,8 +156,8 @@ namespace boost {
private: private:
typedef detail::list_elem<T0,0, typedef detail::list_elem<T0,0,
detail::list_elem<T1,1, detail::list_elem<T1,1,
detail::list_elem<T2,2, detail::list_elem<T2,2,
detail::list_elem<T3,3, detail::list_elem<T3,3,
detail::list_elem<T4,4, detail::list_elem<T4,4,
@ -219,7 +219,7 @@ namespace boost {
template <typename T0,typename T1,typename T2,typename T3,typename T4> template <typename T0,typename T1,typename T2,typename T3,typename T4>
inline tuple <T0,T1,T2,T3,T4> make_tuple (const T0& t0, inline tuple <T0,T1,T2,T3,T4> make_tuple (const T0& t0,
const T1& t1,const T2& t2,const T3& t3,const T4& t4) { const T1& t1,const T2& t2,const T3& t3,const T4& t4) {
tuple <T0,T1,T2,T3,T4> t; tuple <T0,T1,T2,T3,T4> t;
t.get<0>() = t0; t.get<0>() = t0;
t.get<1>() = t1; t.get<1>() = t1;

55
code/CMakeLists.txt
View File

@ -1,11 +1,35 @@
SET( LIBRARY_VERSION "1.0.0" ) SET( LIBRARY_VERSION "1.0.0" )
SET( LIBRARY_SOVERSION "1" ) SET( LIBRARY_SOVERSION "1" )
IF ( ENABLE_BOOST_WORKAROUND )
INCLUDE_DIRECTORIES( BoostWorkaround )
ADD_DEFINITIONS( -DASSIMP_BUILD_BOOST_WORKAROUND )
MESSAGE( STATUS "Building a non-boost version of Assimp." )
ELSE ( ENABLE_BOOST_WORKAROUND )
FIND_PACKAGE( Boost 1.35 )
IF ( NOT Boost_FOUND )
MESSAGE( FATAL_ERROR
"Boost libraries (http://www.boost.org/) not found. "
"You can build a non-boost version of Assimp with slightly reduced "
"functionality by specifying -DENABLE_BOOST_WORKAROUND=ON."
)
ENDIF ( NOT Boost_FOUND )
INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} )
ENDIF ( ENABLE_BOOST_WORKAROUND )
#
# Listing and grouping of all the source files for use with IDE project
# generators.
#
SET( HEADER_PATH ../include ) SET( HEADER_PATH ../include )
SET( COMPILER_HEADERS SET( COMPILER_HEADERS
${HEADER_PATH}/Compiler/pushpack1.h ${HEADER_PATH}/Compiler/pushpack1.h
${HEADER_PATH}/Compiler/poppack1.h ${HEADER_PATH}/Compiler/poppack1.h
pstdint.h
) )
SET( PUBLIC_HEADERS SET( PUBLIC_HEADERS
@ -44,19 +68,18 @@ SET( PUBLIC_HEADERS
${HEADER_PATH}/NullLogger.h ${HEADER_PATH}/NullLogger.h
) )
SOURCE_GROUP( Compiler FILES SOURCE_GROUP( Compiler FILES ${HEADER_PATH}/Compiler/pushpack1.h
${HEADER_PATH}/Compiler/pushpack1.h
${HEADER_PATH}/Compiler/poppack1.h ${HEADER_PATH}/Compiler/poppack1.h
) )
SOURCE_GROUP( Boost FILES SOURCE_GROUP( Boost FILES
${HEADER_PATH}/BoostWorkaround/boost/common_factor_rt.hpp BoostWorkaround/boost/math/common_factor_rt.hpp
${HEADER_PATH}/BoostWorkaround/boost/foreach.hpp BoostWorkaround/boost/foreach.hpp
${HEADER_PATH}/BoostWorkaround/boost/format.hpp BoostWorkaround/boost/format.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_array.hpp BoostWorkaround/boost/scoped_array.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_ptr.hpp BoostWorkaround/boost/scoped_ptr.hpp
${HEADER_PATH}/BoostWorkaround/boost/static_assert.hpp BoostWorkaround/boost/static_assert.hpp
${HEADER_PATH}/BoostWorkaround/boost/tuple/tuple.hpp BoostWorkaround/boost/tuple/tuple.hpp
) )
SOURCE_GROUP( Logging FILES SOURCE_GROUP( Logging FILES
@ -638,13 +661,13 @@ ADD_LIBRARY( assimp SHARED
MS3DLoader.cpp MS3DLoader.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:
${HEADER_PATH}/BoostWorkaround/boost/common_factor_rt.hpp BoostWorkaround/boost/math/common_factor_rt.hpp
${HEADER_PATH}/BoostWorkaround/boost/foreach.hpp BoostWorkaround/boost/foreach.hpp
${HEADER_PATH}/BoostWorkaround/boost/format.hpp BoostWorkaround/boost/format.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_array.hpp BoostWorkaround/boost/scoped_array.hpp
${HEADER_PATH}/BoostWorkaround/boost/scoped_ptr.hpp BoostWorkaround/boost/scoped_ptr.hpp
${HEADER_PATH}/BoostWorkaround/boost/static_assert.hpp BoostWorkaround/boost/static_assert.hpp
${HEADER_PATH}/BoostWorkaround/boost/tuple/tuple.hpp BoostWorkaround/boost/tuple/tuple.hpp
${PUBLIC_HEADERS} ${PUBLIC_HEADERS}
${COMPILER_HEADERS} ${COMPILER_HEADERS}
) )

7
code/IRRLoader.cpp
View File

@ -55,16 +55,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// We need boost::common_factor to compute the lcm/gcd of a number // We need boost::common_factor to compute the lcm/gcd of a number
#ifdef ASSIMP_BUILD_BOOST_WORKAROUND #include <boost/math/common_factor_rt.hpp>
# include "../include/BoostWorkaround/boost/common_factor_rt.hpp"
#else
# include <boost/math/common_factor_rt.hpp>
#endif
using namespace Assimp; using namespace Assimp;
using namespace irr; using namespace irr;
using namespace irr::io; using namespace irr::io;
using namespace boost::math;
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------

4
code/makefile
View File

@ -46,7 +46,7 @@ CPPFLAGS=-Wall
# Setup environment for noboost build # Setup environment for noboost build
ifeq ($(NOBOOST),1) ifeq ($(NOBOOST),1)
SINGLETHREADED = 1 SINGLETHREADED = 1
INCLUDEFLAGS += -I../include/BoostWorkaround/ INCLUDEFLAGS += -IBoostWorkaround/
DEFINEFLAGS += -DASSIMP_BUILD_BOOST_WORKAROUND DEFINEFLAGS += -DASSIMP_BUILD_BOOST_WORKAROUND
# NAMESUFFIX += -noboost # NAMESUFFIX += -noboost
# else # else
@ -104,4 +104,4 @@ install:
mkdir -p $(INSTALLDIR)/include mkdir -p $(INSTALLDIR)/include
mkdir -p $(INSTALLDIR)/lib mkdir -p $(INSTALLDIR)/lib
cp $(BINPATH)/libassimp$(NAMESUFFIX).* $(INSTALLDIR)/lib cp $(BINPATH)/libassimp$(NAMESUFFIX).* $(INSTALLDIR)/lib
cp $(INCPATH)/* $(INSTALLDIR)/include cp $(INCPATH)/* $(INSTALLDIR)/include

6
include/Compiler/pstdint.h → code/pstdint.h
View File

@ -5,11 +5,11 @@
* *
* Copyright (c) 2005-2007 Paul Hsieh * Copyright (c) 2005-2007 Paul Hsieh
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* *
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
@ -17,7 +17,7 @@
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products * 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

2
doc/Doxyfile
View File

@ -127,7 +127,7 @@ FILE_PATTERNS = *.c \
*.dox \ *.dox \
*.py *.py
RECURSIVE = YES RECURSIVE = YES
EXCLUDE = ../include/BoostWorkaround EXCLUDE =
EXCLUDE_SYMLINKS = NO EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = */.svn/* \ EXCLUDE_PATTERNS = */.svn/* \
*/.svn */.svn

2
doc/Doxyfile_Cmd
View File

@ -125,7 +125,7 @@ FILE_PATTERNS = *.c \
*.dox \ *.dox \
*.py *.py
RECURSIVE = YES RECURSIVE = YES
EXCLUDE = ../include/BoostWorkaround EXCLUDE =
EXCLUDE_SYMLINKS = NO EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = */.svn/* \ EXCLUDE_PATTERNS = */.svn/* \
*/.svn */.svn

26
include/BoostWorkaround/boost/random/mersenne_twister.hpp
View File

@ -1,26 +0,0 @@
#ifndef BOOST_MT_INCLUDED
#define BOOST_MT_INCLUDED
namespace boost
{
// A very minimal implementation. No mersenne_twister at all,
// but it should generate some randomness though
class mt19937
{
public:
mt19937(unsigned int seed)
{
::srand(seed);
}
unsigned int operator () (void)
{
return ::rand();
}
};
};
#endif

30
include/BoostWorkaround/boost/random/uniform_int.hpp
View File

@ -1,30 +0,0 @@
#ifndef BOOST_UNIFORM_INT_INCLUDED
#define BOOST_UNIFORM_INT_INCLUDED
namespace boost
{
template <typename IntType = unsigned int>
class uniform_int
{
public:
typedef IntType type;
uniform_int (IntType _first, IntType _last)
: first (_first)
, last (_last)
{}
IntType operator () (IntType in)
{
return (IntType)((in * ((last-first)/RAND_MAX)) + first);
}
private:
IntType first, last;
};
};
#endif // BOOST_UNIFORM_INT_INCLUDED

31
include/BoostWorkaround/boost/random/variate_generator.hpp
View File

@ -1,31 +0,0 @@
#ifndef BOOST_VG_INCLUDED
#define BOOST_VG_INCLUDED
namespace boost
{
template <typename Random, typename Distribution>
class variate_generator
{
public:
variate_generator (Random _rnd, Distribution _dist)
: rnd (_rnd)
, dist (_dist)
{}
typename Distribution::type operator () ()
{
return dist ( rnd () );
}
private:
Random rnd;
Distribution dist;
};
} // end namespace boost
#endif

13
test/CMakeLists.txt
View File

@ -1,10 +1,11 @@
include_directories ( INCLUDE_DIRECTORIES(
${AssetImporter_SOURCE_DIR}/include ${AssetImporter_SOURCE_DIR}/include
${AssetImporter_SOURCE_DIR}/code ${AssetImporter_SOURCE_DIR}/code
) )
# Make sure the linker can find the Hello library once it is built. # Add the temporary output directories to the library path to make sure the
link_directories (${AssetImporter_BINARY_DIR} ${AssetImporter_BINARY_DIR}/lib) # Assimp library can be found, even if it is not installed system-wide yet.
LINK_DIRECTORIES( ${AssetImporter_BINARY_DIR} ${AssetImporter_BINARY_DIR}/lib )
SOURCE_GROUP( unit FILES SOURCE_GROUP( unit FILES
unit/CCompilerTest.c unit/CCompilerTest.c
@ -115,7 +116,6 @@ IF( WIN32 )
"$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include"
DOC "The directory where D3D9.h resides") DOC "The directory where D3D9.h resides")
FIND_LIBRARY(D3D9_LIBRARY d3d9.lib FIND_LIBRARY(D3D9_LIBRARY d3d9.lib
PATHS PATHS
"$ENV{DXSDK_DIR}/Lib/x86" "$ENV{DXSDK_DIR}/Lib/x86"
@ -137,6 +137,5 @@ IF( WIN32 )
) )
ENDIF( WIN32 ) ENDIF( WIN32 )
# Link the executable to the Hello library. # TODO: Port to non-Windows platforms.
target_link_libraries ( unit assimp ${DX9_LIBRARIES} comctl32.lib Winmm.lib ) target_link_libraries ( unit assimp ${DX9_LIBRARIES} comctl32.lib Winmm.lib )

6
test/unit/BoostWorkaround/tupletest.cpp
View File

@ -1,6 +1,4 @@
#include "BoostWorkaround/boost/tuple/tuple.hpp"
#include "../../../include/BoostWorkaround/boost/tuple/tuple.hpp"
struct another struct another
{int dummy;}; {int dummy;};
@ -32,4 +30,4 @@ void test () {
// Direct assignment w. explicit conversion // Direct assignment w. explicit conversion
last = first; last = first;
} }

8
tools/assimp_view/AnimEvaluator.h
View File

@ -43,11 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AV_ANIMEVALUATOR_H_INCLUDED #ifndef AV_ANIMEVALUATOR_H_INCLUDED
#define AV_ANIMEVALUATOR_H_INCLUDED #define AV_ANIMEVALUATOR_H_INCLUDED
#ifdef ASSIMP_BUILD_BOOST_WORKAROUND #include <boost/tuple/tuple.hpp>
# include "BoostWorkaround/boost/tuple/tuple.hpp"
#else
# include <boost/tuple/tuple.hpp>
#endif
namespace AssimpView namespace AssimpView
{ {
@ -92,4 +88,4 @@ protected:
} // end of namespace AssimpView } // end of namespace AssimpView
#endif // AV_ANIMEVALUATOR_H_INCLUDED #endif // AV_ANIMEVALUATOR_H_INCLUDED

38
workspaces/vc8/assimp.vcproj
View File

@ -626,7 +626,7 @@
FavorSizeOrSpeed="0" FavorSizeOrSpeed="0"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="..\..\code\BoostWorkaround"
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_BOOST_WORKAROUND"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -693,7 +693,7 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="0" FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="..\..\code\BoostWorkaround"
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_BOOST_WORKAROUND"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -758,7 +758,7 @@
Optimization="0" Optimization="0"
FavorSizeOrSpeed="0" FavorSizeOrSpeed="0"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="..\..\code\BoostWorkaround"
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;ASSIMP_BUILD_BOOST_WORKAROUND"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
SmallerTypeCheck="true" SmallerTypeCheck="true"
@ -824,7 +824,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
FavorSizeOrSpeed="0" FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="..\..\code\BoostWorkaround"
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;ASSIMP_BUILD_BOOST_WORKAROUND"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
SmallerTypeCheck="true" SmallerTypeCheck="true"
@ -1141,7 +1141,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\include\Compiler\pstdint.h" RelativePath="..\..\code\pstdint.h"
> >
</File> </File>
<File <File
@ -1152,10 +1152,6 @@
<Filter <Filter
Name="BoostWorkaround" Name="BoostWorkaround"
> >
<File
RelativePath="..\..\include\BoostWorkaround\boost\common_factor_rt.hpp"
>
</File>
<File <File
RelativePath="..\..\include\BoostWorkaround\boost\foreach.hpp" RelativePath="..\..\include\BoostWorkaround\boost\foreach.hpp"
> >
@ -1176,22 +1172,6 @@
RelativePath="..\..\include\BoostWorkaround\boost\static_assert.hpp" RelativePath="..\..\include\BoostWorkaround\boost\static_assert.hpp"
> >
</File> </File>
<Filter
Name="random"
>
<File
RelativePath="..\..\include\BoostWorkaround\boost\random\mersenne_twister.hpp"
>
</File>
<File
RelativePath="..\..\include\BoostWorkaround\boost\random\uniform_int.hpp"
>
</File>
<File
RelativePath="..\..\include\BoostWorkaround\boost\random\variate_generator.hpp"
>
</File>
</Filter>
<Filter <Filter
Name="tuple" Name="tuple"
> >
@ -1200,6 +1180,14 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="math"
>
<File
RelativePath="..\..\include\BoostWorkaround\boost\math\common_factor_rt.hpp"
>
</File>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="C" Name="C"

50
workspaces/vc9/assimp.vcproj
View File

@ -333,7 +333,7 @@
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="0" FavorSizeOrSpeed="0"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="..\..\code\BoostWorkaround"
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_BOOST_WORKAROUND"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -396,7 +396,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="..\..\code\BoostWorkaround"
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;ASSIMP_BUILD_BOOST_WORKAROUND"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
SmallerTypeCheck="true" SmallerTypeCheck="true"
@ -872,7 +872,7 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="..\..\code\BoostWorkaround"
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_BOOST_WORKAROUND"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -934,7 +934,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="..\..\code\BoostWorkaround"
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;ASSIMP_BUILD_BOOST_WORKAROUND"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
SmallerTypeCheck="true" SmallerTypeCheck="true"
@ -1112,7 +1112,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\include\Compiler\pstdint.h" RelativePath="..\..\code\pstdint.h"
> >
</File> </File>
<File <File
@ -1124,50 +1124,38 @@
Name="BoostWorkaround" Name="BoostWorkaround"
> >
<File <File
RelativePath="..\..\include\BoostWorkaround\boost\common_factor_rt.hpp" RelativePath="..\..\code\BoostWorkaround\boost\foreach.hpp"
> >
</File> </File>
<File <File
RelativePath="..\..\include\BoostWorkaround\boost\foreach.hpp" RelativePath="..\..\code\BoostWorkaround\boost\format.hpp"
> >
</File> </File>
<File <File
RelativePath="..\..\include\BoostWorkaround\boost\format.hpp" RelativePath="..\..\code\BoostWorkaround\boost\scoped_array.hpp"
> >
</File> </File>
<File <File
RelativePath="..\..\include\BoostWorkaround\boost\scoped_array.hpp" RelativePath="..\..\code\BoostWorkaround\boost\scoped_ptr.hpp"
> >
</File> </File>
<File <File
RelativePath="..\..\include\BoostWorkaround\boost\scoped_ptr.hpp" RelativePath="..\..\code\BoostWorkaround\boost\static_assert.hpp"
> >
</File> </File>
<File
RelativePath="..\..\include\BoostWorkaround\boost\static_assert.hpp"
>
</File>
<Filter
Name="random"
>
<File
RelativePath="..\..\include\BoostWorkaround\boost\random\mersenne_twister.hpp"
>
</File>
<File
RelativePath="..\..\include\BoostWorkaround\boost\random\uniform_int.hpp"
>
</File>
<File
RelativePath="..\..\include\BoostWorkaround\boost\random\variate_generator.hpp"
>
</File>
</Filter>
<Filter <Filter
Name="tuple" Name="tuple"
> >
<File <File
RelativePath="..\..\include\BoostWorkaround\boost\tuple\tuple.hpp" RelativePath="..\..\code\BoostWorkaround\boost\tuple\tuple.hpp"
>
</File>
</Filter>
<Filter
Name="math"
>
<File
RelativePath="..\..\code\BoostWorkaround\boost\math\common_factor_rt.hpp"
> >
</File> </File>
</Filter> </Filter>

1
workspaces/vc9/shared/NoBoostShared.vsprops
View File

@ -6,6 +6,7 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\code\BoostWorkaround"
PreprocessorDefinitions="ASSIMP_BUILD_BOOST_WORKAROUND;ASSIMP_BUILD_SINGLETHREADED" PreprocessorDefinitions="ASSIMP_BUILD_BOOST_WORKAROUND;ASSIMP_BUILD_SINGLETHREADED"
/> />
</VisualStudioPropertySheet> </VisualStudioPropertySheet>