diff -up ./rts/lib/CMakeLists.txt.spring-98-assimp-remove ./rts/lib/CMakeLists.txt
--- ./rts/lib/CMakeLists.txt.spring-98-assimp-remove 2015-07-15 18:23:01.000000000 -0400
+++ ./rts/lib/CMakeLists.txt 2016-05-21 22:30:16.644695816 -0400
@@ -14,7 +14,6 @@ set(UNZIP_INCLUDE_DIRS ${SPRING_MINIZIP_
set(UNZIP_LIBRARIES ${SPRING_MINIZIP_LIBRARY})
set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB)
-ADD_SUBDIRECTORY(assimp)
if (NOT HEADLESS_SYSTEM)
diff -up ./rts/Rendering/Models/AssIO.h.spring-98-assimp-remove ./rts/Rendering/Models/AssIO.h
--- ./rts/Rendering/Models/AssIO.h.spring-98-assimp-remove 2015-07-15 18:23:00.000000000 -0400
+++ ./rts/Rendering/Models/AssIO.h 2016-05-21 22:30:16.645695856 -0400
@@ -3,8 +3,8 @@
#ifndef ASS_IO_H
#define ASS_IO_H
-#include "lib/assimp/include/assimp/IOStream.hpp"
-#include "lib/assimp/include/assimp/IOSystem.hpp"
+#include "assimp/IOStream.hpp"
+#include "assimp/IOSystem.hpp"
class CFileHandler;
// Custom implementation of Assimp IOStream to support Spring's VFS
diff -up ./rts/Rendering/Models/AssParser.cpp.spring-98-assimp-remove ./rts/Rendering/Models/AssParser.cpp
--- ./rts/Rendering/Models/AssParser.cpp.spring-98-assimp-remove 2015-07-15 18:23:00.000000000 -0400
+++ ./rts/Rendering/Models/AssParser.cpp 2016-05-21 22:30:16.645695856 -0400
@@ -17,13 +17,13 @@
#include "System/FileSystem/FileHandler.h"
#include "System/FileSystem/FileSystem.h"
-#include "lib/assimp/include/assimp/config.h"
-#include "lib/assimp/include/assimp/defs.h"
-#include "lib/assimp/include/assimp/types.h"
-#include "lib/assimp/include/assimp/scene.h"
-#include "lib/assimp/include/assimp/postprocess.h"
-#include "lib/assimp/include/assimp/Importer.hpp"
-#include "lib/assimp/include/assimp/DefaultLogger.hpp"
+#include "assimp/config.h"
+#include "assimp/defs.h"
+#include "assimp/types.h"
+#include "assimp/scene.h"
+#include "assimp/postprocess.h"
+#include "assimp/Importer.hpp"
+#include "assimp/DefaultLogger.hpp"
#include "Rendering/Textures/S3OTextureHandler.h"
#ifndef BITMAP_NO_OPENGL
#include "Rendering/GL/myGL.h"
diff -up ./rts/Rendering/Models/IModelParser.cpp.spring-98-assimp-remove ./rts/Rendering/Models/IModelParser.cpp
--- ./rts/Rendering/Models/IModelParser.cpp.spring-98-assimp-remove 2016-05-21 22:35:08.063470232 -0400
+++ ./rts/Rendering/Models/IModelParser.cpp 2016-05-21 22:35:37.238649019 -0400
@@ -17,7 +17,7 @@
#include "System/Util.h"
#include "System/Log/ILog.h"
#include "System/Exceptions.h"
-#include "lib/assimp/include/assimp/Importer.hpp"
+#include "assimp/Importer.hpp"
C3DModelLoader* modelParser = NULL;