diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt index a73246d..1a43fa5 100644 --- a/Runtime/CMakeLists.txt +++ b/Runtime/CMakeLists.txt @@ -27,16 +27,17 @@ target_link_libraries(${PROJECT_NAME} winmm ) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${PROJECT_SOURCE_DIR} +) + if(MSVC) target_compile_options(${PROJECT_NAME} PRIVATE /EHa ) endif() -#target_include_directories(${PROJECT_NAME} -# -#) - if (WIN32) target_compile_definitions(${PROJECT_NAME} PRIVATE @@ -86,3 +87,29 @@ if (WIN32) NOINOUT ) endif() + +install(TARGETS ${PROJECT_NAME} + DESTINATION lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + OBJECTS DESTINATION lib + RESOURCE DESTINATION lib + PUBLIC_HEADER DESTINATION include + PRIVATE_HEADER DESTINATION source +) +if(MSVC) + install( + FILES $ + DESTINATION bin + OPTIONAL + ) +endif() + +install( + FILES ${fmod_BINARIES} + DESTINATION bin +) +install( + FILES ${FreeImage_BINARIES} + DESTINATION bin +) diff --git a/Runtime/blitz3d/meshmodel.hpp b/Runtime/blitz3d/meshmodel.hpp index 48a6c68..9df95be 100644 --- a/Runtime/blitz3d/meshmodel.hpp +++ b/Runtime/blitz3d/meshmodel.hpp @@ -4,7 +4,7 @@ #include "surface.hpp" class MeshCollider; -class Collision; +struct Collision; class MeshModel : public Model { public: