diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt index 706f0fe5..1f1f6bb5 100644 --- a/src/engine/CMakeLists.txt +++ b/src/engine/CMakeLists.txt @@ -14,23 +14,23 @@ endif() if(WIN32 AND (${CMAKE_BUILD_TYPE} STREQUAL "Debug")) set(ThirdParty ${ThirdParty} simplesquirrel_static sqstdlib_static squirrel_static SDL2d SDL2maind - medialoader_imagemdd zlibstaticd physfsmdd - PocoFoundationmdd PocoNetmdd + medialoader_imagemdd medialoader_modelmdd assimpmdd zlibstaticd physfsmdd lz4mdd + PocoFoundationmdd PocoNetmdd PocoJSONmdd PocoXMLmdd ${SystemLibraries}) else() if(WIN32) set(ThirdParty ${ThirdParty} simplesquirrel_static sqstdlib_static squirrel_static SDL2 SDL2main - medialoader_imagemd zlibstatic physfsmd - PocoFoundationmd PocoNetmd + medialoader_imagemd medialoader_modelmd assimpmd zlibstatic physfsmd lz4md + PocoFoundationmd PocoNetmd PocoJSONmd PocoXMLmd ${SystemLibraries}) else() set(ThirdParty ${ThirdParty} simplesquirrel_static sqstdlib_static squirrel_static SDL2 SDL2main - medialoader_image z physfs - PocoFoundation PocoNet + medialoader_image medialoader_model assimp z physfs lz4 + PocoFoundation PocoNet PocoJSON PocoXML ${SystemLibraries}) endif() endif() -set(EVELIBS EVWindow EVMouse EVEvent EVCmdLine EVDevTools EVScripts EVCommon EVGraphics EVImage EVFileSystem EVNetwork) +set(EVELIBS EVWindow EVMouse EVEvent EVCmdLine EVDevTools EVScripts EVCommon EVGraphics EVImage EVFileSystem EVNetwork EVData) target_link_libraries(eve ${EVELIBS} zeroerr ${ThirdParty} ${EVENGINE_VULKAN_LIB}) \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5121094a..1f444a3e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -2,8 +2,10 @@ enable_testing() file(GLOB all_test_cpp ECS.cpp + data.cpp filesystem.cpp graphic.cpp + medialoader_model_link.cpp model.cpp mouse.cpp network.cpp @@ -43,26 +45,26 @@ endif() if(WIN32) if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") - set(ThirdParty ${ThirdParty} physfsmdd medialoader_imagemdd zlibstaticd lz4mdd) + set(ThirdParty ${ThirdParty} physfsmdd medialoader_imagemdd medialoader_modelmdd assimpmdd zlibstaticd lz4mdd) else() - set(ThirdParty ${ThirdParty} physfsmd medialoader_imagemd zlibstatic lz4md) + set(ThirdParty ${ThirdParty} physfsmd medialoader_imagemd medialoader_modelmd assimpmd zlibstatic lz4md) endif() else() - set(ThirdParty ${ThirdParty} physfs medialoader_image z lz4) + set(ThirdParty ${ThirdParty} physfs medialoader_image medialoader_model assimp z lz4) endif() if(WIN32 AND (${CMAKE_BUILD_TYPE} STREQUAL "Debug")) set(ThirdParty ${ThirdParty} simplesquirrel_static sqstdlib_static squirrel_static SDL2d - PocoFoundationmdd PocoNetmdd + PocoFoundationmdd PocoNetmdd PocoJSONmdd PocoXMLmdd ${SystemLibraries}) else() if(WIN32) set(ThirdParty ${ThirdParty} simplesquirrel_static sqstdlib_static squirrel_static SDL2 - PocoFoundationmd PocoNetmd + PocoFoundationmd PocoNetmd PocoJSONmd PocoXMLmd ${SystemLibraries}) else() set(ThirdParty ${ThirdParty} simplesquirrel_static sqstdlib_static squirrel_static SDL2 - PocoFoundation PocoNet + PocoFoundation PocoNet PocoJSON PocoXML ${SystemLibraries}) endif() endif() diff --git a/test/medialoader_model_link.cpp b/test/medialoader_model_link.cpp new file mode 100644 index 00000000..14f70aa1 --- /dev/null +++ b/test/medialoader_model_link.cpp @@ -0,0 +1,10 @@ +#include "zeroerr/assert.h" +#include "zeroerr/unittest.h" +#include "medialoader/model/ModelLoader.h" +#include + +TEST_CASE("MedialoaderModel.linkHeaders") { + medialoader::ModelLoader loader; + CHECK(sizeof(aiScene) > 0); + CHECK(sizeof(loader) > 0); +}