AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50 from Bearborg/master 

Update dependencies
This commit is contained in:
Henrique Gemignani Passos Lima 2023-05-21 20:39:01 +03:00 committed by GitHub
parent 2fe042be80 e85f7cc560
commit e5d1678ff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
CMakeSettings.json
View File

@ -1,28 +1,28 @@
{ {
"configurations": [ "configurations": [
{ {
"name": "x64-Debug", "name": "x64-Debug",
"generator": "Ninja", "generator": "Ninja",
"configurationType": "Debug", "configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ], "inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${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": "", "buildCommandArgs": "",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"variables": [] "variables": []
}, },
{ {
"name": "x64-Release", "name": "x64-Release",
"generator": "Ninja", "generator": "Ninja",
"configurationType": "RelWithDebInfo", "configurationType": "RelWithDebInfo",
"inheritEnvironments": [ "msvc_x64_x64" ], "inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${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": "", "buildCommandArgs": "",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"variables": [] "variables": []
} }
] ]
} }

2
dewfile.json
View File

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

2
externals/LibCommon vendored

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

4
src/Core/CMakeLists.txt
View File

@ -11,9 +11,6 @@ find_package(assimp CONFIG REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(Threads 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 file(GLOB_RECURSE source_files
"*.c" "*.c"
"*.cpp" "*.cpp"
@ -41,7 +38,6 @@ target_link_libraries(
OpenGL::GL OpenGL::GL
assimp::assimp assimp::assimp
Threads::Threads Threads::Threads
${IIRXML_LIBRARY}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
) )