diff --git a/WickedEngine/BULLET/CMakeLists.txt b/WickedEngine/BULLET/CMakeLists.txt index 29e36e492..81f85c2af 100644 --- a/WickedEngine/BULLET/CMakeLists.txt +++ b/WickedEngine/BULLET/CMakeLists.txt @@ -1,4 +1,299 @@ project(BULLET) +include(GNUInstallDirs) + +set(Bullet_HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/Bullet-C-Api.h + ${CMAKE_CURRENT_SOURCE_DIR}/btBulletCollisionCommon.h + ${CMAKE_CURRENT_SOURCE_DIR}/btBulletDynamicsCommon.h +) +install(FILES ${Bullet_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/") + +set(Bullet_HEADERS_CollisionBroadphaseCollision + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btAxisSweep3.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btDbvt.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btDispatcher.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btQuantizedBvh.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h + ) +install(FILES ${Bullet_HEADERS_CollisionBroadphaseCollision} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletCollision/BroadphaseCollision/") + +set(Bullet_HEADERS_DynamicsCollisionDispatch + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/SphereTriangleDetector.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btBoxBoxDetector.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btCollisionConfiguration.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btCollisionDispatcher.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btCollisionObject.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btCollisionWorld.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btGhostObject.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btManifoldResult.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btSimulationIslandManager.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionDispatch/btUnionFind.h + ) +install(FILES ${Bullet_HEADERS_DynamicsCollisionDispatch} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletCollision/CollisionDispatch/") + +set(Bullet_HEADERS_DynamicsCollisionShapes + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btBox2dShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btBoxShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btCapsuleShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btCollisionMargin.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btCollisionShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btCompoundShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btConcaveShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btConeShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btConvex2dShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btConvexHullShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btConvexInternalShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btConvexPointCloudShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btConvexPolyhedron.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btConvexShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btCylinderShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btEmptyShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btMaterial.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btMinkowskiSumShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btMultiSphereShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btOptimizedBvh.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btShapeHull.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btSphereShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btStaticPlaneShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btStridingMeshInterface.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btTetrahedronShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btTriangleBuffer.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btTriangleCallback.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btTriangleInfoMap.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btTriangleMesh.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btTriangleMeshShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btTriangleShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/CollisionShapes/btUniformScalingShape.h + ) +install(FILES ${Bullet_HEADERS_DynamicsCollisionShapes} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletCollision/CollisionShapes/") + + +set(Bullet_HEADERS_DynamicsGimpact + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btBoxCollision.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btClipPolygon.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btCompoundFromGimpact.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btContactProcessing.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btGImpactBvh.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btGImpactMassUtil.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btGImpactQuantizedBvh.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btGImpactShape.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btGenericPoolAllocator.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btGeometryOperations.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btQuantization.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/btTriangleShapeEx.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_array.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_basic_geometry_operations.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_bitset.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_box_collision.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_box_set.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_clip_polygon.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_contact.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_geom_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_geometry.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_hash_table.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_linear_math.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_math.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_memory.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_radixsort.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/Gimpact/gim_tri_collision.h + ) +install(FILES ${Bullet_HEADERS_DynamicsGimpact} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletCollision/Gimpact/") + + +set(Bullet_HEADERS_DynamicsNarrowPhaseCollision + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btConvexCast.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btPointCollector.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h + ) +install(FILES ${Bullet_HEADERS_DynamicsNarrowPhaseCollision} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletCollision/NarrowPhaseCollision/") + + +set(Bullet_HEADERS_DynamicsCharacter + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Character/btCharacterControllerInterface.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Character/btKinematicCharacterController.h + ) +install(FILES ${Bullet_HEADERS_DynamicsCharacter} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletDynamics/Character/") + + +set(Bullet_HEADERS_DynamicsConstraintSolver + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btConstraintSolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btContactConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btContactSolverInfo.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btFixedConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btGearConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btHinge2Constraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btHingeConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btJacobianEntry.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btSliderConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btSolverBody.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btSolverConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btTypedConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/ConstraintSolver/btUniversalConstraint.h + ) +install(FILES ${Bullet_HEADERS_DynamicsConstraintSolver} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletDynamics/ConstraintSolver/") + + +set(Bullet_HEADERS_DynamicsDyn + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Dynamics/btActionInterface.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Dynamics/btDynamicsWorld.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Dynamics/btRigidBody.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h + ) +install(FILES ${Bullet_HEADERS_DynamicsDyn} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletDynamics/Dynamics/") + + +set(Bullet_HEADERS_DynamicsFeatherstone + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBody.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBodyConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBodyJointMotor.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBodyLink.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h + ) +install(FILES ${Bullet_HEADERS_DynamicsFeatherstone} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletDynamics/Featherstone/") + + +set(Bullet_HEADERS_DynamicsMLCPSolvers + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/MLCPSolvers/btDantzigLCP.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/MLCPSolvers/btDantzigSolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/MLCPSolvers/btMLCPSolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/MLCPSolvers/btPATHSolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h + ) +install(FILES ${Bullet_HEADERS_DynamicsMLCPSolvers} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletDynamics/MLCPSolvers/") + + +set(Bullet_HEADERS_DynamicsVehicle + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Vehicle/btRaycastVehicle.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Vehicle/btVehicleRaycaster.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletDynamics/Vehicle/btWheelInfo.h + ) +install(FILES ${Bullet_HEADERS_DynamicsVehicle} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletDynamics/Vehicle/") + + +set(Bullet_HEADERS_SoftBody + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btDefaultSoftBodySolver.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftBody.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftBodyData.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftBodyHelpers.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftBodyInternals.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftBodySolverVertexBuffer.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftBodySolvers.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftRigidCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftRigidDynamicsWorld.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSoftSoftCollisionAlgorithm.h + ${CMAKE_CURRENT_SOURCE_DIR}/BulletSoftBody/btSparseSDF.h + ) +install(FILES ${Bullet_HEADERS_SoftBody} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/BulletSoftBody/") + + +set(Bullet_HEADERS_LinearMath + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btAabbUtil2.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btAlignedAllocator.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btAlignedObjectArray.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btConvexHull.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btConvexHullComputer.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btDefaultMotionState.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btGeometryUtil.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btGrahamScan2dConvexHull.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btHashMap.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btIDebugDraw.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btList.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btMatrix3x3.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btMatrixX.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btMinMax.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btMotionState.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btPolarDecomposition.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btPoolAllocator.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btQuadWord.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btQuaternion.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btQuickprof.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btRandom.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btScalar.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btSerializer.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btStackAlloc.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btTransform.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btTransformUtil.h + ${CMAKE_CURRENT_SOURCE_DIR}/LinearMath/btVector3.h + ) +install(FILES ${Bullet_HEADERS_LinearMath} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/BULLET/LinearMath/") + add_library(Bullet STATIC BulletCollision/BroadphaseCollision/btAxisSweep3.cpp @@ -141,7 +436,24 @@ add_library(Bullet STATIC LinearMath/btQuickprof.cpp LinearMath/btSerializer.cpp LinearMath/btVector3.cpp + ${Bullet_HEADERS} + ${Bullet_HEADERS_CollisionBroadphaseCollision} + ${Bullet_HEADERS_DynamicsCollisionDispatch} + ${Bullet_HEADERS_DynamicsCollisionShapes} + ${Bullet_HEADERS_DynamicsGimpact} + ${Bullet_HEADERS_DynamicsNarrowPhaseCollision} + ${Bullet_HEADERS_DynamicsCharacter} + ${Bullet_HEADERS_DynamicsConstraintSolver} + ${Bullet_HEADERS_DynamicsDyn} + ${Bullet_HEADERS_DynamicsFeatherstone} + ${Bullet_HEADERS_DynamicsMLCPSolvers} + ${Bullet_HEADERS_DynamicsVehicle} + ${Bullet_HEADERS_SoftBody} + ${Bullet_HEADERS_LinearMath} ) -target_include_directories(Bullet PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -set_property(TARGET "Bullet" PROPERTY FOLDER "ThirdParty") \ No newline at end of file +target_include_directories(Bullet PUBLIC + $ + $ + ) +set_property(TARGET "Bullet" PROPERTY FOLDER "ThirdParty") diff --git a/WickedEngine/CMakeLists.txt b/WickedEngine/CMakeLists.txt index 79a259116..e3fbdc4e9 100644 --- a/WickedEngine/CMakeLists.txt +++ b/WickedEngine/CMakeLists.txt @@ -1,4 +1,9 @@ +include(CMakePackageConfigHelpers) +include(GNUInstallDirs) +set(INSTALL_LOCAL_CONFIGDIR "${CMAKE_BINARY_DIR}/cmake") +set(INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/WickedEngine") + if (WIN32) # TODO: Choose whether to use SDL2 on windows as well set(TARGET_NAME WickedEngine_Windows) @@ -33,6 +38,92 @@ add_subdirectory(BULLET) add_subdirectory(LUA) add_subdirectory(Utility) +set(HEADER_FILES + WickedEngine.h + CommonInclude.h + sdl2.h + wiApplication.h + wiApplication_BindLua.h + wiArchive.h + wiArguments.h + wiAudio.h + wiAudio_BindLua.h + wiBacklog.h + wiBacklog_BindLua.h + wiCanvas.h + wiColor.h + wiECS.h + wiEmittedParticle.h + wiEnums.h + wiEventHandler.h + wiFadeManager.h + wiFFTGenerator.h + wiFont.h + wiGPUBVH.h + wiGPUSortLib.h + wiGraphics.h + wiGraphicsDevice.h + wiGraphicsDevice_DX12.h + wiGraphicsDevice_Vulkan.h + wiGUI.h + wiHairParticle.h + wiHelper.h + wiImage.h + wiImageParams_BindLua.h + wiInitializer.h + wiInput.h + wiInput_BindLua.h + wiJobSystem.h + wiLoadingScreen.h + wiLoadingScreen_BindLua.h + wiLua.h + wiLua_Globals.h + wiLuna.h + wiMath.h + wiMath_BindLua.h + wiNetwork.h + wiNetwork_BindLua.h + wiOcean.h + wiPhysics.h + wiPlatform.h + wiPrimitive.h + wiPrimitive_BindLua.h + wiProfiler.h + wiRandom.h + wiRawInput.h + wiRectPacker.h + wiRenderer.h + wiRenderer_BindLua.h + wiRenderPath.h + wiRenderPath2D.h + wiRenderPath2D_BindLua.h + wiRenderPath3D.h + wiRenderPath3D_BindLua.h + wiRenderPath3D_PathTracing.h + wiRenderPath_BindLua.h + wiResourceManager.h + wiScene.h + wiScene_BindLua.h + wiScene_Decl.h + wiSDLInput.h + wiShaderCompiler.h + wiSheenLUT.h + wiSpinLock.h + wiSprite.h + wiSprite_BindLua.h + wiSpriteAnim_BindLua.h + wiSpriteFont.h + wiSpriteFont_BindLua.h + wiTexture_BindLua.h + wiTextureHelper.h + wiTimer.h + wiUnorderedMap.h + wiUnorderedSet.h + wiVector.h + wiVersion.h + wiXInput.h + ) + add_library(${TARGET_NAME} STATIC wiLoadingScreen.cpp wiLoadingScreen_BindLua.cpp @@ -100,11 +191,14 @@ add_library(${TARGET_NAME} STATIC wiVersion.cpp wiXInput.cpp wiShaderCompiler.cpp + ${HEADER_FILES} ) add_library(WickedEngine ALIAS ${TARGET_NAME}) +set_target_properties(${TARGET_NAME} PROPERTIES PUBLIC_HEADER "${HEADER_FILES}") target_include_directories(${TARGET_NAME} PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} + $ + $ ) set(WICKEDENGINE_STATIC_LIBRARIES @@ -159,10 +253,8 @@ add_executable(offlineshadercompiler target_link_libraries(offlineshadercompiler PUBLIC ${TARGET_NAME}) +#### LOCAL FOLDER INSTALLATION # Create importable target here -include(CMakePackageConfigHelpers) -set(INSTALL_CONFIGDIR "${CMAKE_BINARY_DIR}/cmake") -#set(INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/WickedEngine") #set_target_properties(${TARGET_NAME} PROPERTIES PUBLIC_HEADER "${HEADERS}") set_target_properties("${TARGET_NAME}" PROPERTIES EXPORT_NAME "${TARGET_NAME}") @@ -173,22 +265,404 @@ install(TARGETS "${TARGET_NAME}" ${WICKEDENGINE_STATIC_LIBRARIES} LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine") +install(FILES ${LIBDXCOMPILER} + DESTINATION "${CMAKE_INSTALL_LIBDIR}/WickedEngine") + export(EXPORT Engine-Targets FILE "${CMAKE_BINARY_DIR}/cmake/WickedEngineTargets.cmake" NAMESPACE WickedEngine:: ) -#install(EXPORT Engine-Targets -# FILE WickedEngineTargets.cmake -# NAMESPACE WickedEngine -# DESTINATION ${INSTALL_CONFIGDIR}) +install(EXPORT Engine-Targets + FILE WickedEngineTargets.cmake + NAMESPACE WickedEngine:: + DESTINATION ${INSTALL_CONFIGDIR}) +set(_CONFIG_INSTALL_DIR_INCLUDE "${CMAKE_SOURCE_DIR}") +set(_CONFIG_INSTALL_DIR_LIB "${CMAKE_SOURCE_DIR}") configure_package_config_file( ${CMAKE_CURRENT_SOURCE_DIR}/WickedEngineConfig.cmake.in ${CMAKE_BINARY_DIR}/cmake/WickedEngineConfig.cmake + INSTALL_DESTINATION ${INSTALL_LOCAL_CONFIGDIR} +) +set(_CONFIG_INSTALL_DIR_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") +set(_CONFIG_INSTALL_DIR_LIB "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +configure_package_config_file( + ${CMAKE_CURRENT_SOURCE_DIR}/WickedEngineConfig.cmake.in + ${CMAKE_BINARY_DIR}/cmake/install/WickedEngineConfig.cmake INSTALL_DESTINATION ${INSTALL_CONFIGDIR} ) -#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WickedEngineConfig.cmake -# DESTINATION ${INSTALL_CONFIGDIR} -#) +install(FILES ${CMAKE_BINARY_DIR}/cmake/install/WickedEngineConfig.cmake + DESTINATION ${INSTALL_CONFIGDIR} +) + +# Shaders +install(FILES shaders/ShaderInterop_FFTGenerator.h + shaders/blur_bilateral_float1CS.hlsl + shaders/blur_bilateral_float3CS.hlsl + shaders/blur_bilateral_float4CS.hlsl + shaders/blur_bilateral_unorm1CS.hlsl + shaders/blur_bilateral_unorm4CS.hlsl + shaders/blur_bilateral_wide_float1CS.hlsl + shaders/blur_bilateral_wide_float3CS.hlsl + shaders/blur_bilateral_wide_float4CS.hlsl + shaders/blur_bilateral_wide_unorm1CS.hlsl + shaders/blur_bilateral_wide_unorm4CS.hlsl + shaders/blur_gaussian_float1CS.hlsl + shaders/blur_gaussian_float3CS.hlsl + shaders/blur_gaussian_unorm1CS.hlsl + shaders/blur_gaussian_unorm4CS.hlsl + shaders/blur_gaussian_wide_float1CS.hlsl + shaders/blur_gaussian_wide_float3CS.hlsl + shaders/blur_gaussian_wide_float4CS.hlsl + shaders/blur_gaussian_wide_unorm1CS.hlsl + shaders/blur_gaussian_wide_unorm4CS.hlsl + shaders/captureImpostorPS_albedo.hlsl + shaders/captureImpostorPS_normal.hlsl + shaders/captureImpostorPS_surface.hlsl + shaders/circle.hlsli + shaders/cone.hlsli + shaders/copytexture2D_unorm4CS.hlsl + shaders/copytexture2D_unorm4_borderexpandCS.hlsl + shaders/cube.hlsli + shaders/cubeShadowGS_emulation.hlsl + shaders/cubeShadowGS_transparent_emulation.hlsl + shaders/cubeShadowVS_alphatest_emulation.hlsl + shaders/cubeShadowVS_emulation.hlsl + shaders/cubeShadowVS_transparent_emulation.hlsl + shaders/cylinder.hlsli + shaders/depthoffield_mainCS_cheap.hlsl + shaders/depthoffield_mainCS_earlyexit.hlsl + shaders/depthoffield_prepassCS_earlyexit.hlsl + shaders/emittedparticlePS_soft_distortion.hlsl + shaders/emittedparticlePS_soft_lighting.hlsl + shaders/emittedparticle_emitCS_FROMMESH.hlsl + shaders/emittedparticle_emitCS_volume.hlsl + shaders/emittedparticle_simulateCS_DEPTHCOLLISIONS.hlsl + shaders/emittedparticle_simulateCS_SORTING.hlsl + shaders/emittedparticle_simulateCS_SORTING_DEPTHCOLLISIONS.hlsl + shaders/envMapPS_terrain.hlsl + shaders/envMapVS_emulation.hlsl + shaders/envMap_skyGS_emulation.hlsl + shaders/envMap_skyPS_dynamic.hlsl + shaders/envMap_skyVS_emulation.hlsl + shaders/fxaa.hlsli + shaders/generateMIPChain2DCS_unorm4.hlsl + shaders/generateMIPChain3DCS_unorm4.hlsl + shaders/generateMIPChainCubeArrayCS_unorm4.hlsl + shaders/generateMIPChainCubeCS_unorm4.hlsl + shaders/icosphere.hlsli + shaders/lightCullingCS_ADVANCED.hlsl + shaders/lightCullingCS_ADVANCED_DEBUG.hlsl + shaders/lightCullingCS_DEBUG.hlsl + shaders/lightVisualizerPS.hlsl + shaders/motionblurCS_cheap.hlsl + shaders/motionblurCS_earlyexit.hlsl + shaders/msao_blurupsampleCS_blendout.hlsl + shaders/msao_blurupsampleCS_premin.hlsl + shaders/msao_blurupsampleCS_premin_blendout.hlsl + shaders/msao_interleaveCS.hlsl + shaders/objectDS.hlsl + shaders/objectHS.hlsl + shaders/objectPS.hlsl + shaders/objectPS_anisotropic.hlsl + shaders/objectPS_cartoon.hlsl + shaders/objectPS_clearcoat.hlsl + shaders/objectPS_cloth.hlsl + shaders/objectPS_cloth_clearcoat.hlsl + shaders/objectPS_debug.hlsl + shaders/objectPS_planarreflection.hlsl + shaders/objectPS_pom.hlsl + shaders/objectPS_terrain.hlsl + shaders/objectPS_transparent.hlsl + shaders/objectPS_transparent_anisotropic.hlsl + shaders/objectPS_transparent_cartoon.hlsl + shaders/objectPS_transparent_clearcoat.hlsl + shaders/objectPS_transparent_cloth.hlsl + shaders/objectPS_transparent_cloth_clearcoat.hlsl + shaders/objectPS_transparent_planarreflection.hlsl + shaders/objectPS_transparent_pom.hlsl + shaders/objectPS_transparent_unlit.hlsl + shaders/objectPS_unlit.hlsl + shaders/objectPS_voxelizer_terrain.hlsl + shaders/objectPS_water.hlsl + shaders/objectVS_common.hlsl + shaders/objectVS_common_tessellation.hlsl + shaders/objectVS_debug.hlsl + shaders/objectVS_voxelizer.hlsl + shaders/oceanSurfaceHF.hlsli + shaders/oceanSurfaceSimplePS.hlsl + shaders/quad.hlsli + shaders/raytraceCS_rtapi.hlsl + shaders/raytrace_debugbvhPS.hlsl + shaders/renderlightmapPS_rtapi.hlsl + shaders/renderlightmapVS.hlsl + shaders/shadingRateClassificationCS_DEBUG.hlsl + shaders/upsample_bilateralPS.hlsl + shaders/upsample_bilateral_float1CS.hlsl + shaders/upsample_bilateral_uint4CS.hlsl + shaders/upsample_bilateral_unorm1CS.hlsl + shaders/upsample_bilateral_unorm4CS.hlsl + shaders/uvsphere.hlsli + shaders/vertexcolorPS.hlsl + shaders/vertexcolorVS.hlsl + shaders/volumeLightHF.hlsli + shaders/volumetricCloudsHF.hlsli + shaders/volumetriclight_pointVS.hlsl + shaders/volumetriclight_spotVS.hlsl + shaders/voxelSceneCopyClearCS_TemporalSmoothing.hlsl + shaders/ShaderInterop_Ocean.h + shaders/ShaderInterop_Raytracing.h + shaders/rtshadowCS.hlsl + shaders/volumetricLightHF.hlsli + shaders/voxelHF.hlsli + shaders/ShaderInterop_HairParticle.h + shaders/cubeShadowVS.hlsl + shaders/cubeShadowVS_alphatest.hlsl + shaders/cubeShadowVS_transparent.hlsl + shaders/hairparticlePS_simple.hlsl + shaders/impostorPS_prepass.hlsl + shaders/impostorPS_simple.hlsl + shaders/objectDS_prepass.hlsl + shaders/objectDS_prepass_alphatest.hlsl + shaders/objectDS_simple.hlsl + shaders/objectHS_prepass.hlsl + shaders/objectHS_prepass_alphatest.hlsl + shaders/objectHS_simple.hlsl + shaders/objectPS_prepass.hlsl + shaders/objectPS_prepass_alphatest.hlsl + shaders/objectPS_simple.hlsl + shaders/objectVS_prepass.hlsl + shaders/objectVS_prepass_alphatest.hlsl + shaders/objectVS_prepass_alphatest_tessellation.hlsl + shaders/objectVS_prepass_tessellation.hlsl + shaders/objectVS_simple_tessellation.hlsl + shaders/shadowPS_alphatest.hlsl + shaders/shadowPS_water.hlsl + shaders/shadowVS.hlsl + shaders/shadowVS_alphatest.hlsl + shaders/shadowVS_transparent.hlsl + shaders/surfel_raytraceCS_rtapi.hlsl + shaders/visibility_resolveCS_MSAA.hlsl + shaders/skinningCS.hlsl + shaders/generateMIPChain3DCS_float4.hlsl + shaders/ColorSpaceUtility.hlsli + shaders/PixelPacking_R11G11B10.hlsli + shaders/ShaderInterop_Weather.h + shaders/bloomseparateCS.hlsl + shaders/bitonicSortHF.hlsli + shaders/blur_gaussian_float4CS.hlsl + shaders/bvh_hierarchyCS.hlsl + shaders/bvh_propagateaabbCS.hlsl + shaders/chromatic_aberrationCS.hlsl + shaders/copytexture2D_float4CS.hlsl + shaders/copytexture2D_float4_borderexpandCS.hlsl + shaders/cubeMapPS.hlsl + shaders/cullingShaderHF.hlsli + shaders/depthOfFieldHF.hlsli + shaders/depthoffield_kickjobsCS.hlsl + shaders/depthoffield_mainCS.hlsl + shaders/depthoffield_neighborhoodMaxCOCCS.hlsl + shaders/depthoffield_postfilterCS.hlsl + shaders/depthoffield_prepassCS.hlsl + shaders/depthoffield_tileMaxCOC_horizontalCS.hlsl + shaders/depthoffield_tileMaxCOC_verticalCS.hlsl + shaders/depthoffield_upsampleCS.hlsl + shaders/downsample4xCS.hlsl + shaders/downsampleDepthBuffer4xPS.hlsl + shaders/emittedparticle_finishUpdateCS.hlsl + shaders/emittedparticle_kickoffUpdateCS.hlsl + shaders/emittedparticle_sphdensityCS.hlsl + shaders/emittedparticle_sphpartitionCS.hlsl + shaders/emittedparticle_sphpartitionoffsetsCS.hlsl + shaders/emittedparticle_sphpartitionoffsetsresetCS.hlsl + shaders/envMap_skyPS_static.hlsl + shaders/envMap_skyVS.hlsl + shaders/filterEnvMapCS.hlsl + shaders/forceFieldPlaneVisualizerVS.hlsl + shaders/forceFieldPointVisualizerVS.hlsl + shaders/forceFieldVisualizerPS.hlsl + shaders/fxaaCS.hlsl + shaders/generateMIPChainCubeArrayCS_float4.hlsl + shaders/generateMIPChainCubeCS_float4.hlsl + shaders/hairparticle_finishUpdateCS.hlsl + shaders/hbaoCS.hlsl + shaders/impostorPS.hlsl + shaders/lensFlarePS.hlsl + shaders/lensFlareVS.hlsl + shaders/lightCullingCS.hlsl + shaders/lightShaftsCS.hlsl + shaders/luminancePass1CS.hlsl + shaders/luminancePass2CS.hlsl + shaders/motionblur_kickjobsCS.hlsl + shaders/motionblur_neighborhoodMaxVelocityCS.hlsl + shaders/motionblur_tileMaxVelocity_verticalCS.hlsl + shaders/msao_blurupsampleCS.hlsl + shaders/msao_preparedepthbuffers1CS.hlsl + shaders/msao_preparedepthbuffers2CS.hlsl + shaders/normalsfromdepthCS.hlsl + shaders/objectHF_tessellation.hlsli + shaders/objectPS_hologram.hlsl + shaders/oceanSimulatorCS.hlsl + shaders/oceanSurfaceVS.hlsl + shaders/oceanUpdateGradientFoldingCS.hlsl + shaders/outlinePS.hlsl + shaders/paint_textureCS.hlsl + shaders/raytrace_screenVS.hlsl + shaders/resolveMSAADepthStencilCS.hlsl + shaders/rtao_denoise_filterCS.hlsl + shaders/rtshadow_denoise_filterCS.hlsl + shaders/sharpenCS.hlsl + shaders/skyAtmosphere.hlsli + shaders/skyAtmosphere_multiScatteredLuminanceLutCS.hlsl + shaders/skyAtmosphere_skyLuminanceLutCS.hlsl + shaders/skyAtmosphere_skyViewLutCS.hlsl + shaders/skyAtmosphere_transmittanceLutCS.hlsl + shaders/skyHF.hlsli + shaders/skyPS_dynamic.hlsl + shaders/skyPS_static.hlsl + shaders/skyVS.hlsl + shaders/sphereVS.hlsl + shaders/sunPS.hlsl + shaders/surfel_binningCS.hlsl + shaders/surfel_gridoffsetsCS.hlsl + shaders/surfel_gridresetCS.hlsl + shaders/tileFrustumsCS.hlsl + shaders/tonemapCS.hlsl + shaders/upsample_bilateral_float4CS.hlsl + shaders/vPointLightVS.hlsl + shaders/vSpotLightVS.hlsl + shaders/volumetricCloud_curlnoiseCS.hlsl + shaders/volumetricCloud_detailnoiseCS.hlsl + shaders/volumetricCloud_renderCS.hlsl + shaders/volumetricCloud_reprojectCS.hlsl + shaders/volumetricCloud_shapenoiseCS.hlsl + shaders/volumetricCloud_temporalCS.hlsl + shaders/volumetricCloud_weathermapCS.hlsl + shaders/volumetricLight_DirectionalPS.hlsl + shaders/volumetricLight_PointPS.hlsl + shaders/volumetricLight_SpotPS.hlsl + shaders/volumetriclight_directionalVS.hlsl + shaders/voxelClearOnlyNormalCS.hlsl + shaders/voxelConeTracingHF.hlsli + shaders/voxelGS.hlsl + shaders/voxelRadianceSecondaryBounceCS.hlsl + shaders/voxelSceneCopyClearCS.hlsl + shaders/voxelVS.hlsl + shaders/ShaderInterop.h + shaders/ShaderInterop_BVH.h + shaders/ShaderInterop_Font.h + shaders/ShaderInterop_GPUSortLib.h + shaders/ShaderInterop_Image.h + shaders/circlePS.hlsl + shaders/cubeShadowGS_alphatest_emulation.hlsl + shaders/emittedparticlePS_simple.hlsl + shaders/envMapGS_emulation.hlsl + shaders/fft_512x512_c2c_CS.hlsl + shaders/fft_512x512_c2c_v2_CS.hlsl + shaders/fontPS.hlsl + shaders/fontVS.hlsl + shaders/fsr_sharpenCS.hlsl + shaders/fsr_upscalingCS.hlsl + shaders/generateMIPChain2DCS_float4.hlsl + shaders/gpusortlib_kickoffSortCS.hlsl + shaders/gpusortlib_sortCS.hlsl + shaders/gpusortlib_sortInnerCS.hlsl + shaders/gpusortlib_sortStepCS.hlsl + shaders/hairparticlePS_prepass.hlsl + shaders/imageHF.hlsli + shaders/imagePS.hlsl + shaders/imageVS.hlsl + shaders/impostorHF.hlsli + shaders/impostorPS_wire.hlsl + shaders/msaoCS.hlsl + shaders/objectGS_voxelizer.hlsl + shaders/occludeeVS.hlsl + shaders/oceanUpdateDisplacementMapCS.hlsl + shaders/postprocessVS.hlsl + shaders/shadowPS_transparent.hlsl + shaders/voxelPS.hlsl + shaders/ShaderInterop_DDGI.h + shaders/ShaderInterop_EmittedParticle.h + shaders/ShaderInterop_SurfelGI.h + shaders/ddgi_debugPS.hlsl + shaders/ddgi_debugVS.hlsl + shaders/ddgi_raytraceCS_rtapi.hlsl + shaders/ddgi_updateCS.hlsl + shaders/ddgi_updateCS_depth.hlsl + shaders/emittedparticlePS_soft.hlsl + shaders/emittedparticle_sphforceCS.hlsl + shaders/hairparticlePS.hlsl + shaders/objectVS_simple.hlsl + shaders/oceanSurfacePS.hlsl + shaders/surfel_indirectprepareCS.hlsl + shaders/surfel_integrateCS.hlsl + shaders/ShaderInterop_Postprocess.h + shaders/ShaderInterop_Renderer.h + shaders/Shaders_SOURCE.vcxitems + shaders/Shaders_SOURCE.vcxitems.filters + shaders/brdf.hlsli + shaders/bvh_primitivesCS.hlsl + shaders/ddgi_raytraceCS.hlsl + shaders/emittedparticleHF.hlsli + shaders/emittedparticleMS.hlsl + shaders/emittedparticleVS.hlsl + shaders/emittedparticle_emitCS.hlsl + shaders/emittedparticle_simulateCS.hlsl + shaders/envMapPS.hlsl + shaders/envMapVS.hlsl + shaders/globals.hlsli + shaders/hairparticleHF.hlsli + shaders/hairparticleVS.hlsl + shaders/hairparticle_simulateCS.hlsl + shaders/impostorVS.hlsl + shaders/lightingHF.hlsli + shaders/motionblurCS.hlsl + shaders/motionblur_tileMaxVelocity_horizontalCS.hlsl + shaders/objectHF.hlsli + shaders/objectPS_paintradius.hlsl + shaders/objectPS_voxelizer.hlsl + shaders/raytraceCS.hlsl + shaders/raytracingHF.hlsli + shaders/renderlightmapPS.hlsl + shaders/rtaoCS.hlsl + shaders/rtao_denoise_tileclassificationCS.hlsl + shaders/rtreflectionCS.hlsl + shaders/rtreflectionLIB.hlsl + shaders/rtshadow_denoise_temporalCS.hlsl + shaders/rtshadow_denoise_tileclassificationCS.hlsl + shaders/screenspaceshadowCS.hlsl + shaders/shadingRateClassificationCS.hlsl + shaders/ssaoCS.hlsl + shaders/ssr_bilateralCS.hlsl + shaders/ssr_depthHierarchyCS.hlsl + shaders/ssr_kickjobsCS.hlsl + shaders/ssr_raytraceCS.hlsl + shaders/ssr_raytraceCS_cheap.hlsl + shaders/ssr_raytraceCS_earlyexit.hlsl + shaders/ssr_resolveCS.hlsl + shaders/ssr_temporalCS.hlsl + shaders/ssr_tileMaxRoughness_horizontalCS.hlsl + shaders/ssr_tileMaxRoughness_verticalCS.hlsl + shaders/stochasticSSRHF.hlsli + shaders/surfel_coverageCS.hlsl + shaders/surfel_raytraceCS.hlsl + shaders/surfel_updateCS.hlsl + shaders/temporalaaCS.hlsl + shaders/visibility_resolveCS.hlsl + shaders/visibility_resolveCS_fast.hlsl + shaders/visibility_resolveCS_fast_MSAA.hlsl + + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/shaders/") + +install(FILES + shaders/ffx-shadows-dnsr/ffx_denoiser_shadows_filter.h + shaders/ffx-shadows-dnsr/ffx_denoiser_shadows_prepare.h + shaders/ffx-shadows-dnsr/ffx_denoiser_shadows_tileclassification.h + shaders/ffx-shadows-dnsr/ffx_denoiser_shadows_util.h + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/shaders/ffx-shadows-dnsr") +install(FILES + shaders/ffx-fsr/ffx_a.h + shaders/ffx-fsr/ffx_fsr1.h + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/shaders/ffx-fsr") \ No newline at end of file diff --git a/WickedEngine/LUA/CMakeLists.txt b/WickedEngine/LUA/CMakeLists.txt index cadd703ca..6d57507fc 100644 --- a/WickedEngine/LUA/CMakeLists.txt +++ b/WickedEngine/LUA/CMakeLists.txt @@ -1,3 +1,31 @@ +set(LUA_HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/lapi.h + ${CMAKE_CURRENT_SOURCE_DIR}/lauxlib.h + ${CMAKE_CURRENT_SOURCE_DIR}/lcode.h + ${CMAKE_CURRENT_SOURCE_DIR}/lctype.h + ${CMAKE_CURRENT_SOURCE_DIR}/ldebug.h + ${CMAKE_CURRENT_SOURCE_DIR}/ldo.h + ${CMAKE_CURRENT_SOURCE_DIR}/lfunc.h + ${CMAKE_CURRENT_SOURCE_DIR}/lgc.h + ${CMAKE_CURRENT_SOURCE_DIR}/llex.h + ${CMAKE_CURRENT_SOURCE_DIR}/llimits.h + ${CMAKE_CURRENT_SOURCE_DIR}/lmem.h + ${CMAKE_CURRENT_SOURCE_DIR}/lobject.h + ${CMAKE_CURRENT_SOURCE_DIR}/lopcodes.h + ${CMAKE_CURRENT_SOURCE_DIR}/lparser.h + ${CMAKE_CURRENT_SOURCE_DIR}/lprefix.h + ${CMAKE_CURRENT_SOURCE_DIR}/lstate.h + ${CMAKE_CURRENT_SOURCE_DIR}/lstring.h + ${CMAKE_CURRENT_SOURCE_DIR}/ltable.h + ${CMAKE_CURRENT_SOURCE_DIR}/ltm.h + ${CMAKE_CURRENT_SOURCE_DIR}/lua.h + ${CMAKE_CURRENT_SOURCE_DIR}/luaconf.h + ${CMAKE_CURRENT_SOURCE_DIR}/lualib.h + ${CMAKE_CURRENT_SOURCE_DIR}/lundump.h + ${CMAKE_CURRENT_SOURCE_DIR}/lvm.h + ${CMAKE_CURRENT_SOURCE_DIR}/lzio.h +) + add_library(LUA STATIC lapi.c lauxlib.c @@ -33,6 +61,7 @@ add_library(LUA STATIC lutf8lib.c lvm.c lzio.c + ${LUA_HEADERS} ) if (UNIX) @@ -41,3 +70,6 @@ if (UNIX) endif() set_property(TARGET "LUA" PROPERTY FOLDER "ThirdParty") + +install(FILES ${LUA_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/LUA/") diff --git a/WickedEngine/Utility/CMakeLists.txt b/WickedEngine/Utility/CMakeLists.txt index bbd89de14..5d1f9ccaa 100644 --- a/WickedEngine/Utility/CMakeLists.txt +++ b/WickedEngine/Utility/CMakeLists.txt @@ -1,7 +1,147 @@ +include(GNUInstallDirs) if (PLATFORM MATCHES "SDL2") add_subdirectory(FAudio) endif() +set(HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXCollision.h + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXColors.h + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXMath.h + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXMathCommon.h + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXPackedVector.h + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXCollision.inl + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXMathConvert.inl + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXMathMatrix.inl + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXMathMisc.inl + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXMathVector.inl + ${CMAKE_CURRENT_SOURCE_DIR}/DirectXPackedVector.inl + ${CMAKE_CURRENT_SOURCE_DIR}/arial.h + ${CMAKE_CURRENT_SOURCE_DIR}/portable-file-dialogs.h + ${CMAKE_CURRENT_SOURCE_DIR}/sal.h + ${CMAKE_CURRENT_SOURCE_DIR}/tinyddsloader.h + ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h + ${CMAKE_CURRENT_SOURCE_DIR}/stb_image.h + ${CMAKE_CURRENT_SOURCE_DIR}/stb_image_write.h + ${CMAKE_CURRENT_SOURCE_DIR}/stb_truetype.h + ${CMAKE_CURRENT_SOURCE_DIR}/dxcapi.h + ${CMAKE_CURRENT_SOURCE_DIR}/D3D12MemAlloc.h + ${CMAKE_CURRENT_SOURCE_DIR}/volk.h + ${CMAKE_CURRENT_SOURCE_DIR}/vk_mem_alloc.h + ${CMAKE_CURRENT_SOURCE_DIR}/flat_hash_map.hpp + ) +install(FILES ${HEADER_FILES} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/Utility/") + +set(HEADER_FILES_dx12 + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/d3d12.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/d3d12compatibility.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/d3d12sdklayers.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/d3dcommon.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/dxcore.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/dxcore_interface.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/dxgicommon.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/dxgiformat.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/d3d12shader.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/d3d12video.h + ${CMAKE_CURRENT_SOURCE_DIR}/dx12/d3dx12.h + ) +install(FILES ${HEADER_FILES_dx12} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/Utility/dx12") + +set(HEADER_FILES_spirv + ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv/unified1/spirv.h + ) +install(FILES ${HEADER_FILES_spirv} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/Utility/include/spirv/unified1/") + +set(HEADER_FILES_vulkan + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk_layer.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk_sdk_platform.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_directfb.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_ggp.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_ios.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_macos.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_metal.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_screen.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_vi.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_wayland.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_win32.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_xcb.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_xlib.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_xlib_xrandr.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk_icd.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk_platform.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_android.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_beta.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_core.h + ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan_fuchsia.h + ) +install(FILES ${HEADER_FILES_vulkan} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/Utility/vulkan/") + + +set(HEADER_FILES_encoder + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/apg_bmp.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_astc_decomp.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_backend.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_basis_file.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_bc7enc.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_comp.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_enc.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_etc.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_frontend.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_global_selector_palette_helpers.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_gpu_texture.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_kernels_declares.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_kernels_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_miniz.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_pvrtc1_4.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_resampler.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_resampler_filters.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_ssim.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/basisu_uastc_enc.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/cppspmd_flow.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/cppspmd_math.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/cppspmd_math_declares.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/cppspmd_sse.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/cppspmd_type_aliases.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/jpgd.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/encoder/lodepng.h + ) +install(FILES ${HEADER_FILES_encoder} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/Utility/basis_universal/encoder/") + + +set(HEADER_FILES_transcoder + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/transcoder/basisu.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/transcoder/basisu_containers.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/transcoder/basisu_containers_impl.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/transcoder/basisu_file_headers.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/transcoder/basisu_global_selector_cb.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/transcoder/basisu_global_selector_palette.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/transcoder/basisu_transcoder.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/transcoder/basisu_transcoder_internal.h + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/transcoder/basisu_transcoder_uastc.h + ) +install(FILES ${HEADER_FILES_transcoder} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/Utility/basis_universal/transcoder/") + + +set(HEADER_FILES_zstd + ${CMAKE_CURRENT_SOURCE_DIR}/basis_universal/zstd/zstd.h + ) +install(FILES ${HEADER_FILES_zstd} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/Utility/basis_universal/zstd/") + + +set(HEADER_FILES_dxc + ${CMAKE_CURRENT_SOURCE_DIR}/dxc/Support/WinAdapter.h + ) +install(FILES ${HEADER_FILES_dxc} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/Utility/dxc/Support/") + + set (SOURCE_FILES utility_common.cpp spirv_reflect.c @@ -15,6 +155,16 @@ if (WIN32) ) endif () -add_library(Utility STATIC ${SOURCE_FILES}) +add_library(Utility STATIC + ${SOURCE_FILES} + ${HEADER_FILES} + ${HEADER_FILES_dx12} + ${HEADER_FILES_dxc} + ${HEADER_FILES_encoder} + ${HEADER_FILES_transcoder} + ${HEADER_FILES_spirv} + ${HEADER_FILES_vulkan} + ${HEADER_FILES_zstd} + ) set_property(TARGET "Utility" PROPERTY FOLDER "ThirdParty") diff --git a/WickedEngine/Utility/FAudio/CMakeLists.txt b/WickedEngine/Utility/FAudio/CMakeLists.txt index 7d6c379f6..7a6a703a3 100644 --- a/WickedEngine/Utility/FAudio/CMakeLists.txt +++ b/WickedEngine/Utility/FAudio/CMakeLists.txt @@ -34,9 +34,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) ) endif() -# Source lists -add_library(FAudio - # Public Headers +set(PUBLIC_HEADERS include/F3DAudio.h include/FACT3D.h include/FACT.h @@ -45,11 +43,18 @@ add_library(FAudio include/FAPO.h include/FAudioFX.h include/FAudio.h + ) + +# Source lists +add_library(FAudio + # Public Headers + ${PUBLIC_HEADERS} # Internal Headers src/FACT_internal.h src/FAudio_internal.h src/stb.h src/stb_vorbis.h + src/matrix_defaults.inl # Source Files src/F3DAudio.c src/FACT3D.c @@ -74,10 +79,14 @@ add_library(FAudio src/FAudio_gstreamer.c ) +install(FILES ${PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/WickedEngine/FAudio/") + # FAudio folders as includes, for other targets to consume target_include_directories(FAudio PUBLIC $ $ + $ ) # Soname diff --git a/WickedEngine/WickedEngineConfig.cmake.in b/WickedEngine/WickedEngineConfig.cmake.in index 8a1db952f..842e82374 100644 --- a/WickedEngine/WickedEngineConfig.cmake.in +++ b/WickedEngine/WickedEngineConfig.cmake.in @@ -40,12 +40,12 @@ if (NOT TARGET WickedEngine::WickedEngine) include("${WICKED_CMAKE_DIR}/WickedEngineTargets.cmake") add_library(WickedEngine::WickedEngine ALIAS ${TARGET_NAME}) - set(WickedEngine_SHADER_DIR "@CMAKE_SOURCE_DIR@/WickedEngine/shaders/") + set(WickedEngine_SHADER_DIR "@_CONFIG_INSTALL_DIR_INCLUDE@/WickedEngine/shaders/") target_compile_definitions(${TARGET_NAME} INTERFACE "WickedEngine_SHADER_DIR=\"${WickedEngine_SHADER_DIR}\"") add_library(WickedEngine::dxcompiler SHARED IMPORTED) set_property(TARGET WickedEngine::dxcompiler PROPERTY - IMPORTED_LOCATION @CMAKE_SOURCE_DIR@/WickedEngine/${LIBDXCOMPILER} ) + IMPORTED_LOCATION "@_CONFIG_INSTALL_DIR_LIB@/WickedEngine/${LIBDXCOMPILER}" ) endif() set(WickedEngine_LIBRARIES WickedEngine::WickedEngine ${TARGET_NAME})