2
0
Эх сурвалжийг харах

Moved/Added several includes to file HL1MDLLoader.h.

GCC says there are several class types such as DefaultIOSystem, std::unique_ptr that are undeclared. I moved several includes to this header and also added <string> and <assimp/types> because there are strings and Assimp types defined further down.
Marc-Antoine Lortie 6 жил өмнө
parent
commit
188ee6562e

+ 0 - 5
code/MDL/HalfLife/HL1MDLLoader.cpp

@@ -49,18 +49,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UniqueNameGenerator.h"
 
 #include <assimp/BaseImporter.h>
-#include <assimp/DefaultIOSystem.h>
-#include <assimp/Exceptional.h>
 #include <assimp/StringUtils.h>
 #include <assimp/ai_assert.h>
 #include <assimp/qnan.h>
-#include <assimp/scene.h>
-#include <assimp/types.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/Importer.hpp>
 
 #include <iomanip>
-#include <memory>
 #include <sstream>
 
 #ifdef MDL_HALFLIFE_LOG_WARN_HEADER

+ 6 - 0
code/MDL/HalfLife/HL1MDLLoader.h

@@ -50,9 +50,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "HL1ImportSettings.h"
 #include "UniqueNameGenerator.h"
 
+#include <memory>
+#include <string>
+
+#include <assimp/types.h>
 #include <assimp/scene.h>
 #include <assimp/texture.h>
 #include <assimp/IOSystem.hpp>
+#include <assimp/DefaultIOSystem.h>
+#include <assimp/Exceptional.h>
 
 namespace Assimp {
 namespace MDL {