Move pstdint.h for <= VC9 under include. Apps that include the Assimp headers need to have this available, as its pulled in by metadata.h. Fixes #290.

pull/291/head
Jonne Nauha 2014-05-30 01:57:21 +03:00
parent 340b94f9a5
commit fe87b09246
4 changed files with 3 additions and 3 deletions

View File

@ -56,7 +56,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
#if defined( _MSC_VER) && (_MSC_VER < 1600)
# include "pstdint.h"
# include "../include/assimp/Compiler/pstdint.h"
#else
# include <stdint.h>
#endif

View File

@ -10,7 +10,7 @@ SET( HEADER_PATH ../include/assimp )
SET( COMPILER_HEADERS
${HEADER_PATH}/Compiler/pushpack1.h
${HEADER_PATH}/Compiler/poppack1.h
pstdint.h
${HEADER_PATH}/Compiler/pstdint.h
)
SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})

View File

@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assert.h>
#if defined(_MSC_VER) && (_MSC_VER <= 1500)
#include "pstdint.h"
#include "Compiler/pstdint.h"
#else
#include <stdint.h>
#endif