Merge pull request #50 from Bearborg/master

Update dependencies

CMakeSettings.json

@@ -7,7 +7,7 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
-			"cmakeCommandArgs": "-DCMAKE_PREFIX_PATH=C:/Qt/5.14.1/msvc2017_64/lib/cmake/Qt5",
+      "cmakeCommandArgs": "-DCMAKE_PREFIX_PATH=C:/Qt/5.14.2/msvc2017_64/lib/cmake/Qt5",
       "buildCommandArgs": "",
 			"ctestCommandArgs": "",
 			"variables": []
@@ -19,7 +19,7 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
-			"cmakeCommandArgs": "-DCMAKE_PREFIX_PATH=C:/Qt/5.14.1/msvc2017_64/lib/cmake/Qt5",
+      "cmakeCommandArgs": "-DCMAKE_PREFIX_PATH=C:/Qt/5.14.2/msvc2017_64/lib/cmake/Qt5",
       "buildCommandArgs": "",
 			"ctestCommandArgs": "",
 			"variables": []

dewfile.json

@@ -13,7 +13,7 @@
             "url": "https://github.com/assimp/assimp",
             "type": "git",
             "head": "master",
-            "ref": "83237de02ffb97305317d24564c44ce4794af3db",
+            "ref": "c305b50f13627befade833cef8399be3c53fc4ec",
             "dependson": [
                 "zlib"
             ],

externals/LibCommon

@@ -1 +1 @@
-Subproject commit 16f8d38fcc47acf8621f68580a262c98d16b12ec
+Subproject commit bfc734168aaf953493ba8110697886bbbd21ed0b

src/Core/CMakeLists.txt

@@ -11,9 +11,6 @@ find_package(assimp CONFIG REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(Threads REQUIRED)
 
-# AssImp's cmake config is pretty awful. It doesn't include necesary libraries. Hopefully this can be fixed later.
-find_library(IIRXML_LIBRARY NAMES IrrXMLd IrrXML)
-
 file(GLOB_RECURSE source_files
     "*.c"
     "*.cpp"
@@ -41,7 +38,6 @@ target_link_libraries(
     OpenGL::GL
     assimp::assimp
     Threads::Threads
-    ${IIRXML_LIBRARY}
     ${ZLIB_LIBRARY}
 )