瀏覽代碼

- update tools/

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1149 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
aramis_acg 13 年之前
父節點
當前提交
f07901df9d
共有 3 個文件被更改,包括 20 次插入20 次删除
  1. 2 2
      tools/assimp_cmd/ImageExtractor.cpp
  2. 6 6
      tools/assimp_cmd/Main.h
  3. 12 12
      tools/assimp_view/assimp_view.h

+ 2 - 2
tools/assimp_cmd/ImageExtractor.cpp

@@ -59,7 +59,7 @@ const char* AICMD_MSG_DUMP_HELP_E =
 ;
 
 #define AI_EXTRACT_WRITE_BMP_ALPHA 0x1
-#include "Compiler/pushpack1.h"
+#include <assimp/Compiler/pushpack1.h>
 
 // -----------------------------------------------------------------------------------
 // Data structure for the first header of a BMP
@@ -114,7 +114,7 @@ struct TGA_HEADER
 } PACK_STRUCT;
 
 
-#include "Compiler/poppack1.h"
+#include <assimp/Compiler/poppack1.h>
 
 // -----------------------------------------------------------------------------------
 // Save a texture as bitmap

+ 6 - 6
tools/assimp_cmd/Main.h

@@ -53,14 +53,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <time.h>
 #include <limits>
 
-#include <aiPostProcess.h>
-#include <aiVersion.h>
-#include <aiScene.h>
-#include <assimp.hpp>
-#include <DefaultLogger.h>
+#include <assimp/aiPostProcess.h>
+#include <assimp/aiVersion.h>
+#include <assimp/aiScene.h>
+#include <assimp/assimp.hpp>
+#include <assimp/DefaultLogger.h>
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
-#	include <export.hpp>
+#	include <assimp/export.hpp>
 #endif
 
 #include <../code/AssimpPCH.h> /* to get stdint.h */

+ 12 - 12
tools/assimp_view/assimp_view.h

@@ -48,21 +48,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "resource.h"
 
 // Include ASSIMP headers (XXX: do we really need all of them?)
-#include "assimp.h"
-#include "assimp.hpp"
-#include "aiAssert.h"
-#include "aiFileIO.h"
-#include "aiPostProcess.h"
-#include "aiScene.h"
-#include "IOSystem.h"
-#include "IOStream.h"
-#include "LogStream.h"
-#include "DefaultLogger.h"
+#include <assimp/assimp.h>
+#include <assimp/assimp.hpp>
+#include <assimp/aiAssert.h>
+#include <assimp/aiFileIO.h>
+#include <assimp/aiPostProcess.h>
+#include <assimp/aiScene.h>
+#include <assimp/IOSystem.h>
+#include <assimp/IOStream.h>
+#include <assimp/LogStream.h>
+#include <assimp/DefaultLogger.h>
 
 #include "../../code/AssimpPCH.h" /* HACK */
  
-#include "MaterialSystem.h"   // aiMaterial clas
-#include "StringComparison.h" // ASSIMP_stricmp and ASSIMP_strincmp
+#include "../../code/MaterialSystem.h"   // aiMaterial class
+#include "../../code/StringComparison.h" // ASSIMP_stricmp and ASSIMP_strincmp
 
 // in order for std::min and std::max to behave properly
 #ifdef min