diff --git a/CMakeSettings.json b/CMakeSettings.json index 17ca55e2..3f472870 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -1,28 +1,28 @@ { - "configurations": [ - { - "name": "x64-Debug", - "generator": "Ninja", - "configurationType": "Debug", - "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", - "buildCommandArgs": "", + "configurations": [ + { + "name": "x64-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "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.2/msvc2017_64/lib/cmake/Qt5", + "buildCommandArgs": "", "ctestCommandArgs": "", "variables": [] - }, - { - "name": "x64-Release", - "generator": "Ninja", - "configurationType": "RelWithDebInfo", - "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", - "buildCommandArgs": "", + }, + { + "name": "x64-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "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.2/msvc2017_64/lib/cmake/Qt5", + "buildCommandArgs": "", "ctestCommandArgs": "", "variables": [] - } - ] + } + ] } \ No newline at end of file diff --git a/dewfile.json b/dewfile.json index 9f5d2179..c7870214 100644 --- a/dewfile.json +++ b/dewfile.json @@ -13,7 +13,7 @@ "url": "https://github.com/assimp/assimp", "type": "git", "head": "master", - "ref": "83237de02ffb97305317d24564c44ce4794af3db", + "ref": "c305b50f13627befade833cef8399be3c53fc4ec", "dependson": [ "zlib" ], diff --git a/externals/LibCommon b/externals/LibCommon index 16f8d38f..bfc73416 160000 --- a/externals/LibCommon +++ b/externals/LibCommon @@ -1 +1 @@ -Subproject commit 16f8d38fcc47acf8621f68580a262c98d16b12ec +Subproject commit bfc734168aaf953493ba8110697886bbbd21ed0b diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt index 5c0c07d1..d2a98924 100644 --- a/src/Core/CMakeLists.txt +++ b/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} )