瀏覽代碼

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.

Jonne Nauha 11 年之前
父節點
當前提交
fe87b09246
共有 4 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      code/AssimpPCH.h
  2. 1 1
      code/CMakeLists.txt
  3. 0 0
      include/assimp/Compiler/pstdint.h
  4. 1 1
      include/assimp/metadata.h

+ 1 - 1
code/AssimpPCH.h

@@ -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

+ 1 - 1
code/CMakeLists.txt

@@ -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})
 

+ 0 - 0
code/pstdint.h → include/assimp/Compiler/pstdint.h


+ 1 - 1
include/assimp/metadata.h

@@ -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