assimp: Update include path

CFSworks · CFSworks · commit 29beb0f04309 · 2018-11-10T18:00:09.000-07:00
This changes the Assimp include path to point to the
directory containing assimp/ instead of inside assimp/
directly. This is for consistency with how the Assimp
project defines their "include path" and keeps the actual
inclusions themselves unambiguous (since Assimp's headers
have fairly generic filenames).
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
@@ -683,7 +683,7 @@ def parseopts(args):
         path = GetThirdpartyDir() + "assimp/lib/IrrXML.lib"
         if os.path.isfile(path):
             LibName("ASSIMP", GetThirdpartyDir() + "assimp/lib/IrrXML.lib")
-        IncDirectory("ASSIMP", GetThirdpartyDir() + "assimp/include/assimp")
+        IncDirectory("ASSIMP", GetThirdpartyDir() + "assimp/include")
     if (PkgSkip("SQUISH")==0):
         if GetOptimize() <= 2:
             LibName("SQUISH",   GetThirdpartyDir() + "squish/lib/squishd.lib")
@@ -828,7 +828,7 @@ def parseopts(args):
         SmartPkgEnable("EIGEN",     "eigen3",    (), ("Eigen/Dense",), target_pkg = 'ALWAYS')
         SmartPkgEnable("ARTOOLKIT", "",          ("AR"), "AR/ar.h")
         SmartPkgEnable("FCOLLADA",  "",          ChooseLib(fcollada_libs, "FCOLLADA"), ("FCollada", "FCollada/FCollada.h"))
-        SmartPkgEnable("ASSIMP",    "",          ("assimp"), "assimp")
+        SmartPkgEnable("ASSIMP",    "",          ("assimp"), "assimp/Importer.hpp")
         SmartPkgEnable("FFMPEG",    ffmpeg_libs, ffmpeg_libs, ("libavformat/avformat.h", "libavcodec/avcodec.h", "libavutil/avutil.h"))
         SmartPkgEnable("SWSCALE",   "libswscale", "libswscale", ("libswscale/swscale.h"), target_pkg = "FFMPEG", thirdparty_dir = "ffmpeg")
         SmartPkgEnable("SWRESAMPLE","libswresample", "libswresample", ("libswresample/swresample.h"), target_pkg = "FFMPEG", thirdparty_dir = "ffmpeg")
diff --git a/pandatool/src/assimp/assimpLoader.cxx b/pandatool/src/assimp/assimpLoader.cxx
@@ -39,7 +39,7 @@
 #include "pandaIOSystem.h"
 #include "pandaLogger.h"
 
-#include "postprocess.h"
+#include <assimp/postprocess.h>
 
 using std::ostringstream;
 using std::stringstream;
diff --git a/pandatool/src/assimp/assimpLoader.h b/pandatool/src/assimp/assimpLoader.h
@@ -20,8 +20,8 @@
 #include "texture.h"
 #include "pmap.h"
 
-#include "scene.h"
-#include "Importer.hpp"
+#include <assimp/scene.h>
+#include <assimp/Importer.hpp>
 
 class Character;
 class CharacterJointBundle;
diff --git a/pandatool/src/assimp/pandaIOStream.h b/pandatool/src/assimp/pandaIOStream.h
@@ -16,7 +16,7 @@
 
 #include "config_assimp.h"
 
-#include "IOStream.hpp"
+#include <assimp/IOStream.hpp>
 
 class PandaIOSystem;
 
diff --git a/pandatool/src/assimp/pandaIOSystem.h b/pandatool/src/assimp/pandaIOSystem.h
@@ -17,7 +17,7 @@
 #include "config_assimp.h"
 #include "virtualFileSystem.h"
 
-#include "IOSystem.hpp"
+#include <assimp/IOSystem.hpp>
 
 /**
  * Custom implementation of Assimp::IOSystem.
diff --git a/pandatool/src/assimp/pandaLogger.cxx b/pandatool/src/assimp/pandaLogger.cxx
@@ -13,7 +13,7 @@
 
 #include "pandaLogger.h"
 
-#include "DefaultLogger.hpp"
+#include <assimp/DefaultLogger.hpp>
 
 PandaLogger *PandaLogger::_ptr = nullptr;
 
diff --git a/pandatool/src/assimp/pandaLogger.h b/pandatool/src/assimp/pandaLogger.h
@@ -16,7 +16,7 @@
 
 #include "config_assimp.h"
 
-#include "Logger.hpp"
+#include <assimp/Logger.hpp>
 
 /**
  * Custom implementation of Assimp::Logger.  It simply wraps around the
