From a5290030fc7ec6661a815afbf98e9ebfd983443c Mon Sep 17 00:00:00 2001 From: Sam Hocevar <sam@hocevar.net> Date: Sun, 28 Aug 2016 20:20:14 +0000 Subject: [PATCH] build: fix .vcxproj files that would be constantly out of date. --- build/Lol (vs2015).sln | 13 +++ src/bullet/lol-bullet.vcxproj | 152 +++------------------------------- src/lol-core.vcxproj | 6 +- src/lua/lol-lua.vcxproj | 1 - 4 files changed, 27 insertions(+), 145 deletions(-) diff --git a/build/Lol (vs2015).sln b/build/Lol (vs2015).sln index 450a2d71..deab9d41 100644 --- a/build/Lol (vs2015).sln +++ b/build/Lol (vs2015).sln @@ -162,6 +162,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "weshgrow", "..\games\weshgr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ld36", "..\people\sam\ld36\ld36.vcxproj", "{3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "..\people\touky\shared\shared.vcxproj", "{EE203B88-44CF-4859-9D42-7A4F43FEDB52}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ORBIS = Debug|ORBIS @@ -699,6 +701,16 @@ Global {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Release|Win32.Build.0 = Release|Win32 {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Release|x64.ActiveCfg = Release|x64 {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Release|x64.Build.0 = Release|x64 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|Win32.Build.0 = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|x64.ActiveCfg = Debug|x64 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|x64.Build.0 = Debug|x64 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|ORBIS.ActiveCfg = Release|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|Win32.ActiveCfg = Release|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|Win32.Build.0 = Release|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|x64.ActiveCfg = Release|x64 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -776,5 +788,6 @@ Global {B9A255A0-2B92-4801-AF6C-354535A6E105} = {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} {010BF56B-2D3A-4EBE-839C-0B734EB368CA} = {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1} = {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} + {EE203B88-44CF-4859-9D42-7A4F43FEDB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772} EndGlobalSection EndGlobal diff --git a/src/bullet/lol-bullet.vcxproj b/src/bullet/lol-bullet.vcxproj index ab74aa0e..d2d20c62 100644 --- a/src/bullet/lol-bullet.vcxproj +++ b/src/bullet/lol-bullet.vcxproj @@ -154,134 +154,6 @@ <ClInclude Include="Bullet3Geometry/b3GeometryUtil.h" /> <ClInclude Include="Bullet3Geometry/b3GrahamScan2dConvexHull.h" /> </ItemGroup> - <ItemGroup> - <ClCompile Include="Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.cpp" /> - <ClCompile Include="Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp" /> - <ClCompile Include="Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.cpp" /> - <ClCompile Include="Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp" /> - <ClCompile Include="Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphase.cl" /> - <ClCompile Include="Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvh.cl" /> - <ClCompile Include="Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl" /> - <ClCompile Include="Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3GjkPairDetector.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.cpp" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/kernels/mpr.cl" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl" /> - <ClCompile Include="Bullet3OpenCL/NarrowphaseCollision/kernels/satConcave.cl" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.cpp" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/b3FillCL.cpp" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.cpp" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.cpp" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.cpp" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.cpp" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernels.cl" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanFloat4Kernels.cl" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl" /> - <ClCompile Include="Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl" /> - <ClCompile Include="Bullet3OpenCL/Raycast/b3GpuRaycast.cpp" /> - <ClCompile Include="Bullet3OpenCL/Raycast/kernels/rayCastKernels.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.cpp" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.cpp" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.cpp" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.cpp" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.cpp" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.cpp" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/b3Solver.cpp" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/batchingKernels.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/integrateKernel.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/jointSolver.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/solveContact.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/solveFriction.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/solverSetup2.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/solverSetup.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/solverUtils.cl" /> - <ClCompile Include="Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.cl" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Bullet3OpenCL/BroadphaseCollision/b3GpuBroadphaseInterface.h" /> - <ClInclude Include="Bullet3OpenCL/BroadphaseCollision/b3GpuGridBroadphase.h" /> - <ClInclude Include="Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.h" /> - <ClInclude Include="Bullet3OpenCL/BroadphaseCollision/b3GpuParallelLinearBvh.h" /> - <ClInclude Include="Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.h" /> - <ClInclude Include="Bullet3OpenCL/BroadphaseCollision/b3SapAabb.h" /> - <ClInclude Include="Bullet3OpenCL/BroadphaseCollision/kernels/gridBroadphaseKernels.h" /> - <ClInclude Include="Bullet3OpenCL/BroadphaseCollision/kernels/parallelLinearBvhKernels.h" /> - <ClInclude Include="Bullet3OpenCL/BroadphaseCollision/kernels/sapKernels.h" /> - <ClInclude Include="Bullet3OpenCL/Initialize/b3OpenClInclude.h" /> - <ClInclude Include="Bullet3OpenCL/Initialize/b3OpenCLUtils.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3BvhInfo.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3ConvexPolyhedronCL.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3GjkPairDetector.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3SupportMappings.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3TriangleCallback.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3TriangleIndexVertexArray.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3VectorFloat4.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/b3VoronoiSimplexSolver.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/kernels/satConcaveKernels.h" /> - <ClInclude Include="Bullet3OpenCL/NarrowphaseCollision/kernels/satKernels.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/b3BoundSearchCL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/b3BufferInfoCL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/b3FillCL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/b3PrefixScanCL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/b3PrefixScanFloat4CL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/b3RadixSort32CL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernelsCL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/kernels/CopyKernelsCL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/kernels/FillKernelsCL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsCL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsFloat4CL.h" /> - <ClInclude Include="Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32KernelsCL.h" /> - <ClInclude Include="Bullet3OpenCL/Raycast/b3GpuRaycast.h" /> - <ClInclude Include="Bullet3OpenCL/Raycast/kernels/rayCastKernels.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuConstraint4.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuGenericConstraint.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuNarrowPhase.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuNarrowPhaseInternalData.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuPgsConstraintSolver.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuPgsContactSolver.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipeline.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuRigidBodyPipelineInternalData.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuSolverBody.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/b3Solver.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/batchingKernels.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/batchingKernelsNew.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/integrateKernel.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/jointSolver.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/solveContact.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/solveFriction.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/solverSetup2.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/solverSetup.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/solverUtils.h" /> - <ClInclude Include="Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.h" /> - </ItemGroup> <ItemGroup> <ClCompile Include="Bullet3Serialize/Bullet2FileLoader/b3BulletFile.cpp" /> <ClCompile Include="Bullet3Serialize/Bullet2FileLoader/b3Chunk.cpp" /> @@ -619,21 +491,23 @@ <ClInclude Include="BulletDynamics/Vehicle/btWheelInfo.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="BulletInverseDynamics/details/IDEigenInterface.hpp" /> - <ClCompile Include="BulletInverseDynamics/details/IDLinearMathInterface.hpp" /> - <ClCompile Include="BulletInverseDynamics/details/IDMatVec.hpp" /> <ClCompile Include="BulletInverseDynamics/details/MultiBodyTreeImpl.cpp" /> - <ClCompile Include="BulletInverseDynamics/details/MultiBodyTreeImpl.hpp" /> <ClCompile Include="BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp" /> - <ClCompile Include="BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp" /> - <ClCompile Include="BulletInverseDynamics/IDConfigBuiltin.hpp" /> - <ClCompile Include="BulletInverseDynamics/IDConfigEigen.hpp" /> - <ClCompile Include="BulletInverseDynamics/IDConfig.hpp" /> - <ClCompile Include="BulletInverseDynamics/IDErrorMessages.hpp" /> <ClCompile Include="BulletInverseDynamics/IDMath.cpp" /> - <ClCompile Include="BulletInverseDynamics/IDMath.hpp" /> <ClCompile Include="BulletInverseDynamics/MultiBodyTree.cpp" /> - <ClCompile Include="BulletInverseDynamics/MultiBodyTree.hpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="BulletInverseDynamics/details/IDEigenInterface.hpp" /> + <ClInclude Include="BulletInverseDynamics/details/IDLinearMathInterface.hpp" /> + <ClInclude Include="BulletInverseDynamics/details/IDMatVec.hpp" /> + <ClInclude Include="BulletInverseDynamics/details/MultiBodyTreeImpl.hpp" /> + <ClInclude Include="BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp" /> + <ClInclude Include="BulletInverseDynamics/IDConfigBuiltin.hpp" /> + <ClInclude Include="BulletInverseDynamics/IDConfigEigen.hpp" /> + <ClInclude Include="BulletInverseDynamics/IDConfig.hpp" /> + <ClInclude Include="BulletInverseDynamics/IDErrorMessages.hpp" /> + <ClInclude Include="BulletInverseDynamics/IDMath.hpp" /> + <ClInclude Include="BulletInverseDynamics/MultiBodyTree.hpp" /> </ItemGroup> <ItemGroup> <ClCompile Include="BulletSoftBody/btDefaultSoftBodySolver.cpp" /> diff --git a/src/lol-core.vcxproj b/src/lol-core.vcxproj index 67669d84..40ce3ada 100644 --- a/src/lol-core.vcxproj +++ b/src/lol-core.vcxproj @@ -277,8 +277,7 @@ <ClInclude Include="lol\image\movie.h" /> <ClInclude Include="lol\image\pixel.h" /> <ClInclude Include="lol\math\all.h" /> - <ClInclude Include="lol\math\array2d.h" /> - <ClInclude Include="lol\math\array3d.h" /> + <ClInclude Include="lol\math\arraynd.h" /> <ClInclude Include="lol\math\bigint.h" /> <ClInclude Include="lol\math\constants.h" /> <ClInclude Include="lol\math\functions.h" /> @@ -293,7 +292,6 @@ <ClInclude Include="lol\math\polynomial.h" /> <ClInclude Include="lol\math\rand.h" /> <ClInclude Include="lol\math\real.h" /> - <ClInclude Include="lol\math\remez.h" /> <ClInclude Include="lol\math\transform.h" /> <ClInclude Include="lol\math\vector.h" /> <ClInclude Include="lol\public.h" /> @@ -303,7 +301,6 @@ <ClInclude Include="lol\sys\thread.h" /> <ClInclude Include="lol\sys\threadtypes.h" /> <ClInclude Include="lol\sys\timer.h" /> - <ClInclude Include="lol\unit.h" /> <ClInclude Include="mesh\mesh.h" /> <ClInclude Include="mesh\primitivemesh.h" /> <ClInclude Include="messageservice.h" /> @@ -348,7 +345,6 @@ <ClInclude Include="sample.h" /> <ClInclude Include="sampler.h" /> <ClInclude Include="scene.h" /> - <ClInclude Include="simd.h" /> <ClInclude Include="sprite.h" /> <ClInclude Include="text.h" /> <ClInclude Include="textureimage-private.h" /> diff --git a/src/lua/lol-lua.vcxproj b/src/lua/lol-lua.vcxproj index 63cdfe09..096d8728 100644 --- a/src/lua/lol-lua.vcxproj +++ b/src/lua/lol-lua.vcxproj @@ -108,7 +108,6 @@ <ClInclude Include="lstring.h" /> <ClInclude Include="ltable.h" /> <ClInclude Include="ltm.h" /> - <ClInclude Include="lutf8lib.h" /> <ClInclude Include="luaconf.h" /> <ClInclude Include="lua.h" /> <ClInclude Include="lua.hpp" />