From 29beb0f04309a376e9bca9bff3fc9af9e3c585b0 Mon Sep 17 00:00:00 2001
From: Sam Edwards <CFSworks@gmail.com>
Date: Sat, 10 Nov 2018 17:19:18 -0700
Subject: [PATCH] assimp: Update include path

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).
---
 makepanda/makepanda.py                | 4 ++--
 pandatool/src/assimp/assimpLoader.cxx | 2 +-
 pandatool/src/assimp/assimpLoader.h   | 4 ++--
 pandatool/src/assimp/pandaIOStream.h  | 2 +-
 pandatool/src/assimp/pandaIOSystem.h  | 2 +-
 pandatool/src/assimp/pandaLogger.cxx  | 2 +-
 pandatool/src/assimp/pandaLogger.h    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 60006096e3..895b306d38 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -683,7 +683,7 @@ if (COMPILER == "MSVC"):
         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 @@ if (COMPILER=="GCC"):
         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
index d04c1d55ad..8533fbaa64 100644
--- 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
index 35a9bb6947..3133fee377 100644
--- 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
index fa5cc2bb1e..18c24b1475 100644
--- 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
index f38223381c..be8ad2dd91 100644
--- 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
index b6432e132e..2b92cfbc17 100644
--- 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
index a9bcbb40af..dbd2165ce6 100644
--- 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