From ac8479f542c7d94d33e89b49370903cf6017e0a6 Mon Sep 17 00:00:00 2001 From: klickverbot Date: Wed, 3 Mar 2010 21:48:23 +0000 Subject: [PATCH] =?UTF-8?q?Moved=20private=20headers=20to=20code/=20as=20d?= =?UTF-8?q?iscussed;=20removed=20boost::random=20workaround=20which=20was?= =?UTF-8?q?=20no=20longer=20needed;=20CMake=20cleanup=20part=20two=20(Boos?= =?UTF-8?q?t=20detection,=20=E2=80=A6).=20Please=20be=20quick=20to=20suspe?= =?UTF-8?q?ct=20this=20commit=20if=20the=20build=20should=20break=20on=20W?= =?UTF-8?q?indows/MSVC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (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 --- CMakeLists.txt | 10 +++- code/AssimpPCH.h | 30 ++-------- .../BoostWorkaround/boost/foreach.hpp | 0 .../BoostWorkaround/boost/format.hpp | 0 .../boost/math}/common_factor_rt.hpp | 0 .../BoostWorkaround/boost/scoped_array.hpp | 0 .../BoostWorkaround/boost/scoped_ptr.hpp | 0 .../BoostWorkaround/boost/static_assert.hpp | 0 .../BoostWorkaround/boost/tuple/tuple.hpp | 12 ++-- code/CMakeLists.txt | 55 +++++++++++++------ code/IRRLoader.cpp | 7 +-- code/makefile | 4 +- {include/Compiler => code}/pstdint.h | 6 +- doc/Doxyfile | 2 +- doc/Doxyfile_Cmd | 2 +- .../boost/random/mersenne_twister.hpp | 26 --------- .../boost/random/uniform_int.hpp | 30 ---------- .../boost/random/variate_generator.hpp | 31 ----------- test/CMakeLists.txt | 13 ++--- test/unit/BoostWorkaround/tupletest.cpp | 6 +- tools/assimp_view/AnimEvaluator.h | 8 +-- workspaces/vc8/assimp.vcproj | 38 +++++-------- workspaces/vc9/assimp.vcproj | 50 +++++++---------- workspaces/vc9/shared/NoBoostShared.vsprops | 1 + 24 files changed, 109 insertions(+), 222 deletions(-) rename {include => code}/BoostWorkaround/boost/foreach.hpp (100%) rename {include => code}/BoostWorkaround/boost/format.hpp (100%) rename {include/BoostWorkaround/boost => code/BoostWorkaround/boost/math}/common_factor_rt.hpp (100%) rename {include => code}/BoostWorkaround/boost/scoped_array.hpp (100%) rename {include => code}/BoostWorkaround/boost/scoped_ptr.hpp (100%) rename {include => code}/BoostWorkaround/boost/static_assert.hpp (100%) rename {include => code}/BoostWorkaround/boost/tuple/tuple.hpp (95%) rename {include/Compiler => code}/pstdint.h (97%) delete mode 100644 include/BoostWorkaround/boost/random/mersenne_twister.hpp delete mode 100644 include/BoostWorkaround/boost/random/uniform_int.hpp delete mode 100644 include/BoostWorkaround/boost/random/variate_generator.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b235b0bf..181eb575c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,9 +6,13 @@ INCLUDE_DIRECTORIES( include ) SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib ) SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin ) -SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" ) -SET( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" ) -SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" ) +# Cache these to allow the user to override them manually. +SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH + "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 ADD_SUBDIRECTORY( code/ ) diff --git a/code/AssimpPCH.h b/code/AssimpPCH.h index 4a45fb367..26232ca26 100644 --- a/code/AssimpPCH.h +++ b/code/AssimpPCH.h @@ -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 */ #ifdef _MSC_VER -# include "../include/Compiler/pstdint.h" +# include "pstdint.h" #else # include #endif @@ -134,28 +134,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "qnan.h" // ---------------------------------------------------------------------------------------- -/* boost headers - if -noboost is enabled, take it from the workaround directory - * using hardcoded paths. This has the advantage that the user doesn't need to specify - * 'include/BoostWorkaround' as additional include path. - */ -// ---------------------------------------------------------------------------------------- -#ifdef ASSIMP_BUILD_BOOST_WORKAROUND +#include +#include +#include +#include +#include -# 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 -# include -# include -# include -# include - -#endif // ! ASSIMP_BUILD_BOOST_WORKAROUND #endif // !! ASSIMP_PCH_INCLUDED - - diff --git a/include/BoostWorkaround/boost/foreach.hpp b/code/BoostWorkaround/boost/foreach.hpp similarity index 100% rename from include/BoostWorkaround/boost/foreach.hpp rename to code/BoostWorkaround/boost/foreach.hpp diff --git a/include/BoostWorkaround/boost/format.hpp b/code/BoostWorkaround/boost/format.hpp similarity index 100% rename from include/BoostWorkaround/boost/format.hpp rename to code/BoostWorkaround/boost/format.hpp diff --git a/include/BoostWorkaround/boost/common_factor_rt.hpp b/code/BoostWorkaround/boost/math/common_factor_rt.hpp similarity index 100% rename from include/BoostWorkaround/boost/common_factor_rt.hpp rename to code/BoostWorkaround/boost/math/common_factor_rt.hpp diff --git a/include/BoostWorkaround/boost/scoped_array.hpp b/code/BoostWorkaround/boost/scoped_array.hpp similarity index 100% rename from include/BoostWorkaround/boost/scoped_array.hpp rename to code/BoostWorkaround/boost/scoped_array.hpp diff --git a/include/BoostWorkaround/boost/scoped_ptr.hpp b/code/BoostWorkaround/boost/scoped_ptr.hpp similarity index 100% rename from include/BoostWorkaround/boost/scoped_ptr.hpp rename to code/BoostWorkaround/boost/scoped_ptr.hpp diff --git a/include/BoostWorkaround/boost/static_assert.hpp b/code/BoostWorkaround/boost/static_assert.hpp similarity index 100% rename from include/BoostWorkaround/boost/static_assert.hpp rename to code/BoostWorkaround/boost/static_assert.hpp diff --git a/include/BoostWorkaround/boost/tuple/tuple.hpp b/code/BoostWorkaround/boost/tuple/tuple.hpp similarity index 95% rename from include/BoostWorkaround/boost/tuple/tuple.hpp rename to code/BoostWorkaround/boost/tuple/tuple.hpp index d59b5ce59..95c534981 100644 --- a/include/BoostWorkaround/boost/tuple/tuple.hpp +++ b/code/BoostWorkaround/boost/tuple/tuple.hpp @@ -26,7 +26,7 @@ namespace boost { // Predeclare some stuff template struct value_getter; - + // Helper to obtain the type of a tuple element template struct type_getter { @@ -126,9 +126,9 @@ namespace boost { typedef value_getter next_value_getter; - typename ConstIf::type>::t& + typename ConstIf::type>::t& operator () (typename ConstIf::t& me) { - + next_value_getter s; return s(me.next); } @@ -156,8 +156,8 @@ namespace boost { private: - typedef detail::list_elem inline tuple make_tuple (const T0& t0, const T1& t1,const T2& t2,const T3& t3,const T4& t4) { - + tuple t; t.get<0>() = t0; t.get<1>() = t1; diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index c5e721ee6..ac82e4cee 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1,11 +1,35 @@ SET( LIBRARY_VERSION "1.0.0" ) 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( COMPILER_HEADERS ${HEADER_PATH}/Compiler/pushpack1.h ${HEADER_PATH}/Compiler/poppack1.h + pstdint.h ) SET( PUBLIC_HEADERS @@ -44,19 +68,18 @@ SET( PUBLIC_HEADERS ${HEADER_PATH}/NullLogger.h ) -SOURCE_GROUP( Compiler FILES - ${HEADER_PATH}/Compiler/pushpack1.h +SOURCE_GROUP( Compiler FILES ${HEADER_PATH}/Compiler/pushpack1.h ${HEADER_PATH}/Compiler/poppack1.h ) SOURCE_GROUP( Boost FILES - ${HEADER_PATH}/BoostWorkaround/boost/common_factor_rt.hpp - ${HEADER_PATH}/BoostWorkaround/boost/foreach.hpp - ${HEADER_PATH}/BoostWorkaround/boost/format.hpp - ${HEADER_PATH}/BoostWorkaround/boost/scoped_array.hpp - ${HEADER_PATH}/BoostWorkaround/boost/scoped_ptr.hpp - ${HEADER_PATH}/BoostWorkaround/boost/static_assert.hpp - ${HEADER_PATH}/BoostWorkaround/boost/tuple/tuple.hpp + BoostWorkaround/boost/math/common_factor_rt.hpp + BoostWorkaround/boost/foreach.hpp + BoostWorkaround/boost/format.hpp + BoostWorkaround/boost/scoped_array.hpp + BoostWorkaround/boost/scoped_ptr.hpp + BoostWorkaround/boost/static_assert.hpp + BoostWorkaround/boost/tuple/tuple.hpp ) SOURCE_GROUP( Logging FILES @@ -638,13 +661,13 @@ ADD_LIBRARY( assimp SHARED MS3DLoader.cpp # Necessary to show the headers in the project when using the VC++ generator: - ${HEADER_PATH}/BoostWorkaround/boost/common_factor_rt.hpp - ${HEADER_PATH}/BoostWorkaround/boost/foreach.hpp - ${HEADER_PATH}/BoostWorkaround/boost/format.hpp - ${HEADER_PATH}/BoostWorkaround/boost/scoped_array.hpp - ${HEADER_PATH}/BoostWorkaround/boost/scoped_ptr.hpp - ${HEADER_PATH}/BoostWorkaround/boost/static_assert.hpp - ${HEADER_PATH}/BoostWorkaround/boost/tuple/tuple.hpp + BoostWorkaround/boost/math/common_factor_rt.hpp + BoostWorkaround/boost/foreach.hpp + BoostWorkaround/boost/format.hpp + BoostWorkaround/boost/scoped_array.hpp + BoostWorkaround/boost/scoped_ptr.hpp + BoostWorkaround/boost/static_assert.hpp + BoostWorkaround/boost/tuple/tuple.hpp ${PUBLIC_HEADERS} ${COMPILER_HEADERS} ) diff --git a/code/IRRLoader.cpp b/code/IRRLoader.cpp index f520ab4bb..3d6116387 100644 --- a/code/IRRLoader.cpp +++ b/code/IRRLoader.cpp @@ -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 -#ifdef ASSIMP_BUILD_BOOST_WORKAROUND -# include "../include/BoostWorkaround/boost/common_factor_rt.hpp" -#else -# include -#endif +#include using namespace Assimp; using namespace irr; using namespace irr::io; -using namespace boost::math; // ------------------------------------------------------------------------------------------------ diff --git a/code/makefile b/code/makefile index 4db27bdd9..3df808e15 100644 --- a/code/makefile +++ b/code/makefile @@ -46,7 +46,7 @@ CPPFLAGS=-Wall # Setup environment for noboost build ifeq ($(NOBOOST),1) SINGLETHREADED = 1 - INCLUDEFLAGS += -I../include/BoostWorkaround/ + INCLUDEFLAGS += -IBoostWorkaround/ DEFINEFLAGS += -DASSIMP_BUILD_BOOST_WORKAROUND # NAMESUFFIX += -noboost # else @@ -104,4 +104,4 @@ install: mkdir -p $(INSTALLDIR)/include mkdir -p $(INSTALLDIR)/lib cp $(BINPATH)/libassimp$(NAMESUFFIX).* $(INSTALLDIR)/lib - cp $(INCPATH)/* $(INSTALLDIR)/include \ No newline at end of file + cp $(INCPATH)/* $(INSTALLDIR)/include diff --git a/include/Compiler/pstdint.h b/code/pstdint.h similarity index 97% rename from include/Compiler/pstdint.h rename to code/pstdint.h index a12176dea..73de63075 100644 --- a/include/Compiler/pstdint.h +++ b/code/pstdint.h @@ -5,11 +5,11 @@ * * Copyright (c) 2005-2007 Paul Hsieh * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. diff --git a/doc/Doxyfile b/doc/Doxyfile index 2a44c0a01..28b4a3565 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -127,7 +127,7 @@ FILE_PATTERNS = *.c \ *.dox \ *.py RECURSIVE = YES -EXCLUDE = ../include/BoostWorkaround +EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = */.svn/* \ */.svn diff --git a/doc/Doxyfile_Cmd b/doc/Doxyfile_Cmd index 27497cbfb..7cf427b6d 100644 --- a/doc/Doxyfile_Cmd +++ b/doc/Doxyfile_Cmd @@ -125,7 +125,7 @@ FILE_PATTERNS = *.c \ *.dox \ *.py RECURSIVE = YES -EXCLUDE = ../include/BoostWorkaround +EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = */.svn/* \ */.svn diff --git a/include/BoostWorkaround/boost/random/mersenne_twister.hpp b/include/BoostWorkaround/boost/random/mersenne_twister.hpp deleted file mode 100644 index 0d58e86e1..000000000 --- a/include/BoostWorkaround/boost/random/mersenne_twister.hpp +++ /dev/null @@ -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 diff --git a/include/BoostWorkaround/boost/random/uniform_int.hpp b/include/BoostWorkaround/boost/random/uniform_int.hpp deleted file mode 100644 index 6632a4cf0..000000000 --- a/include/BoostWorkaround/boost/random/uniform_int.hpp +++ /dev/null @@ -1,30 +0,0 @@ - -#ifndef BOOST_UNIFORM_INT_INCLUDED -#define BOOST_UNIFORM_INT_INCLUDED - -namespace boost -{ - template - 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 diff --git a/include/BoostWorkaround/boost/random/variate_generator.hpp b/include/BoostWorkaround/boost/random/variate_generator.hpp deleted file mode 100644 index e0bda8997..000000000 --- a/include/BoostWorkaround/boost/random/variate_generator.hpp +++ /dev/null @@ -1,31 +0,0 @@ - - -#ifndef BOOST_VG_INCLUDED -#define BOOST_VG_INCLUDED - -namespace boost -{ - -template -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 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a67dbe368..194d8fe3a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,10 +1,11 @@ -include_directories ( +INCLUDE_DIRECTORIES( ${AssetImporter_SOURCE_DIR}/include ${AssetImporter_SOURCE_DIR}/code ) -# Make sure the linker can find the Hello library once it is built. -link_directories (${AssetImporter_BINARY_DIR} ${AssetImporter_BINARY_DIR}/lib) +# Add the temporary output directories to the library path to make sure the +# 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 unit/CCompilerTest.c @@ -115,7 +116,6 @@ IF( WIN32 ) "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include" DOC "The directory where D3D9.h resides") - FIND_LIBRARY(D3D9_LIBRARY d3d9.lib PATHS "$ENV{DXSDK_DIR}/Lib/x86" @@ -137,6 +137,5 @@ IF( WIN32 ) ) ENDIF( WIN32 ) -# Link the executable to the Hello library. -target_link_libraries ( unit assimp ${DX9_LIBRARIES} comctl32.lib Winmm.lib ) - +# TODO: Port to non-Windows platforms. +target_link_libraries ( unit assimp ${DX9_LIBRARIES} comctl32.lib Winmm.lib ) diff --git a/test/unit/BoostWorkaround/tupletest.cpp b/test/unit/BoostWorkaround/tupletest.cpp index 8dad0e7b2..75f06ffcb 100644 --- a/test/unit/BoostWorkaround/tupletest.cpp +++ b/test/unit/BoostWorkaround/tupletest.cpp @@ -1,6 +1,4 @@ - - -#include "../../../include/BoostWorkaround/boost/tuple/tuple.hpp" +#include "BoostWorkaround/boost/tuple/tuple.hpp" struct another {int dummy;}; @@ -32,4 +30,4 @@ void test () { // Direct assignment w. explicit conversion last = first; -} \ No newline at end of file +} diff --git a/tools/assimp_view/AnimEvaluator.h b/tools/assimp_view/AnimEvaluator.h index c7a16753d..9f3ef30ca 100644 --- a/tools/assimp_view/AnimEvaluator.h +++ b/tools/assimp_view/AnimEvaluator.h @@ -43,11 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AV_ANIMEVALUATOR_H_INCLUDED #define AV_ANIMEVALUATOR_H_INCLUDED -#ifdef ASSIMP_BUILD_BOOST_WORKAROUND -# include "BoostWorkaround/boost/tuple/tuple.hpp" -#else -# include -#endif +#include namespace AssimpView { @@ -92,4 +88,4 @@ protected: } // end of namespace AssimpView -#endif // AV_ANIMEVALUATOR_H_INCLUDED \ No newline at end of file +#endif // AV_ANIMEVALUATOR_H_INCLUDED diff --git a/workspaces/vc8/assimp.vcproj b/workspaces/vc8/assimp.vcproj index 461ad052d..65d510b17 100644 --- a/workspaces/vc8/assimp.vcproj +++ b/workspaces/vc8/assimp.vcproj @@ -626,7 +626,7 @@ FavorSizeOrSpeed="0" OmitFramePointers="true" WholeProgramOptimization="false" - AdditionalIncludeDirectories="" + AdditionalIncludeDirectories="..\..\code\BoostWorkaround" PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND" StringPooling="true" RuntimeLibrary="2" @@ -693,7 +693,7 @@ InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="0" - AdditionalIncludeDirectories="" + AdditionalIncludeDirectories="..\..\code\BoostWorkaround" PreprocessorDefinitions="NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND" StringPooling="true" RuntimeLibrary="2" @@ -758,7 +758,7 @@ Optimization="0" FavorSizeOrSpeed="0" WholeProgramOptimization="false" - AdditionalIncludeDirectories="" + AdditionalIncludeDirectories="..\..\code\BoostWorkaround" PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND" BasicRuntimeChecks="3" SmallerTypeCheck="true" @@ -824,7 +824,7 @@ Name="VCCLCompilerTool" Optimization="0" FavorSizeOrSpeed="0" - AdditionalIncludeDirectories="" + AdditionalIncludeDirectories="..\..\code\BoostWorkaround" PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_BOOST_WORKAROUND" BasicRuntimeChecks="3" SmallerTypeCheck="true" @@ -1141,7 +1141,7 @@ > - - @@ -1176,22 +1172,6 @@ RelativePath="..\..\include\BoostWorkaround\boost\static_assert.hpp" > - - - - - - - - @@ -1200,6 +1180,14 @@ > + + + + - - - - - - - - - - + + + + diff --git a/workspaces/vc9/shared/NoBoostShared.vsprops b/workspaces/vc9/shared/NoBoostShared.vsprops index 637faa281..8b28b882e 100644 --- a/workspaces/vc9/shared/NoBoostShared.vsprops +++ b/workspaces/vc9/shared/NoBoostShared.vsprops @@ -6,6 +6,7 @@ >