diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-23 08:05:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-23 08:05:55 +0400 |
| commit | c6976e7351e448b8ab82757b9e1a665162b0960c (patch) | |
| tree | a057c5455a6970bca5a10515f361fdd54320b508 | |
| parent | 54b3508444d8ae62f8af9d5b9a9ace6c44f95903 (diff) | |
use explicit file paths for CMake rather then globing, This is recommended by cmake devs.
globbing vs explicit is discussed here.
http://www.cmake.org/pipermail/cmake/2008-December/025694.html
Practical implications are:
- developers need to keep CMakeLists.txt files up to date.
- Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
92 files changed, 1649 insertions, 271 deletions
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 3054ed98908..91d1cba425f 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -24,20 +24,125 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC . src) +SET(INC + . + src +) -FILE(GLOB SRC - src/LinearMath/*.cpp - src/BulletCollision/BroadphaseCollision/*.cpp - src/BulletCollision/CollisionShapes/*.cpp - src/BulletCollision/NarrowPhaseCollision/*.cpp - src/BulletCollision/Gimpact/*.cpp - src/BulletCollision/CollisionDispatch/*.cpp - src/BulletDynamics/ConstraintSolver/*.cpp - src/BulletDynamics/Vehicle/*.cpp - src/BulletDynamics/Dynamics/*.cpp - src/BulletSoftBody/*.cpp +SET(SRC + src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp + src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp + src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp + src/BulletCollision/BroadphaseCollision/btDbvt.cpp + src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp + src/BulletCollision/BroadphaseCollision/btDispatcher.cpp + src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp + src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp + src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp + src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp + src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp + src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp + src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp + src/BulletCollision/CollisionDispatch/btCollisionObject.cpp + src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp + src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp + src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btGhostObject.cpp + src/BulletCollision/CollisionDispatch/btManifoldResult.cpp + src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp + src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btUnionFind.cpp + src/BulletCollision/CollisionShapes/btBoxShape.cpp + src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btCapsuleShape.cpp + src/BulletCollision/CollisionShapes/btCollisionShape.cpp + src/BulletCollision/CollisionShapes/btCompoundShape.cpp + src/BulletCollision/CollisionShapes/btConcaveShape.cpp + src/BulletCollision/CollisionShapes/btConeShape.cpp + src/BulletCollision/CollisionShapes/btConvexHullShape.cpp + src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp + src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp + src/BulletCollision/CollisionShapes/btConvexShape.cpp + src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btCylinderShape.cpp + src/BulletCollision/CollisionShapes/btEmptyShape.cpp + src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp + src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp + src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp + src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp + src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp + src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btShapeHull.cpp + src/BulletCollision/CollisionShapes/btSphereShape.cpp + src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp + src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp + src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp + src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp + src/BulletCollision/CollisionShapes/btTriangleCallback.cpp + src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp + src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp + src/BulletCollision/CollisionShapes/btTriangleMesh.cpp + src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp + src/BulletCollision/Gimpact/btContactProcessing.cpp + src/BulletCollision/Gimpact/btGImpactBvh.cpp + src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp + src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp + src/BulletCollision/Gimpact/btGImpactShape.cpp + src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp + src/BulletCollision/Gimpact/btTriangleShapeEx.cpp + src/BulletCollision/Gimpact/gim_box_set.cpp + src/BulletCollision/Gimpact/gim_contact.cpp + src/BulletCollision/Gimpact/gim_memory.cpp + src/BulletCollision/Gimpact/gim_tri_collision.cpp + src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp + src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp + src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp + src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp + src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp + src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp + src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp + src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp + src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp + src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp + src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp + src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp + src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp + src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp + src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp + src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp + src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp + src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp + src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp + src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp + src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp + src/BulletDynamics/Dynamics/Bullet-C-API.cpp + src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp + src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp + src/BulletDynamics/Dynamics/btRigidBody.cpp + src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp + src/BulletDynamics/Vehicle/btRaycastVehicle.cpp + src/BulletDynamics/Vehicle/btWheelInfo.cpp + src/BulletSoftBody/btSoftBody.cpp + src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp + src/BulletSoftBody/btSoftBodyHelpers.cpp + src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp + src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp + src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp + src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp + src/LinearMath/btAlignedAllocator.cpp + src/LinearMath/btConvexHull.cpp + src/LinearMath/btGeometryUtil.cpp + src/LinearMath/btQuickprof.cpp ) BLENDERLIB(extern_bullet "${SRC}" "${INC}") - diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt index 8cdd804dfba..ff55c598504 100644 --- a/extern/libopenjpeg/CMakeLists.txt +++ b/extern/libopenjpeg/CMakeLists.txt @@ -24,7 +24,29 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC .) +SET(INC + . +) + +SET(SRC + bio.c + cio.c + dwt.c + event.c + image.c + j2k.c + j2k_lib.c + jp2.c + jpt.c + mct.c + mqc.c + openjpeg.c + pi.c + raw.c + t1.c + t2.c + tcd.c + tgt.c +) -FILE(GLOB SRC *.c) BLENDERLIB(extern_openjpeg "${SRC}" "${INC}") diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt index 15aa5264e37..773d3880f93 100644 --- a/extern/lzma/CMakeLists.txt +++ b/extern/lzma/CMakeLists.txt @@ -24,8 +24,16 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC . ) +SET(INC + . +) -FILE(GLOB SRC ./*.c) +SET(SRC + Alloc.c + LzFind.c + LzmaDec.c + LzmaEnc.c + LzmaLib.c +) BLENDERLIB(extern_lzma "${SRC}" "${INC}") diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt index 1563300d509..6cfbd86a2fc 100644 --- a/extern/lzo/CMakeLists.txt +++ b/extern/lzo/CMakeLists.txt @@ -24,7 +24,12 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC include) -SET(SRC minilzo/minilzo.c) +SET(INC + include +) + +SET(SRC + minilzo/minilzo.c +) BLENDERLIB(extern_minilzo "${SRC}" "${INC}") diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 6982bd83276..2dd4694d8a9 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -28,52 +28,156 @@ SET(INC ${LIBSAMPLERATE_INC} ) -FILE(GLOB SRC - intern/*.cpp - intern/*.h - FX/*.cpp - SRC/*.cpp +SET(SRC + FX/AUD_AccumulatorFactory.cpp + FX/AUD_BaseIIRFilterReader.cpp + FX/AUD_ButterworthFactory.cpp + FX/AUD_CallbackIIRFilterReader.cpp + FX/AUD_DelayFactory.cpp + FX/AUD_DelayReader.cpp + FX/AUD_DoubleFactory.cpp + FX/AUD_DoubleReader.cpp + FX/AUD_EffectFactory.cpp + FX/AUD_EffectReader.cpp + FX/AUD_EnvelopeFactory.cpp + FX/AUD_FaderFactory.cpp + FX/AUD_FaderReader.cpp + FX/AUD_HighpassFactory.cpp + FX/AUD_IIRFilterFactory.cpp + FX/AUD_IIRFilterReader.cpp + FX/AUD_LimiterFactory.cpp + FX/AUD_LimiterReader.cpp + FX/AUD_LoopFactory.cpp + FX/AUD_LoopReader.cpp + FX/AUD_LowpassFactory.cpp + FX/AUD_PingPongFactory.cpp + FX/AUD_PitchFactory.cpp + FX/AUD_PitchReader.cpp + FX/AUD_RectifyFactory.cpp + FX/AUD_ReverseFactory.cpp + FX/AUD_ReverseReader.cpp + FX/AUD_SquareFactory.cpp + FX/AUD_SumFactory.cpp + FX/AUD_SuperposeFactory.cpp + FX/AUD_SuperposeReader.cpp + FX/AUD_VolumeFactory.cpp + SRC/AUD_SRCResampleFactory.cpp + SRC/AUD_SRCResampleReader.cpp + intern/AUD_3DMath.h + intern/AUD_Buffer.cpp + intern/AUD_Buffer.h + intern/AUD_BufferReader.cpp + intern/AUD_BufferReader.h + intern/AUD_C-API.cpp + intern/AUD_C-API.h + intern/AUD_ChannelMapperFactory.cpp + intern/AUD_ChannelMapperFactory.h + intern/AUD_ChannelMapperReader.cpp + intern/AUD_ChannelMapperReader.h + intern/AUD_ConverterFactory.cpp + intern/AUD_ConverterFactory.h + intern/AUD_ConverterFunctions.cpp + intern/AUD_ConverterFunctions.h + intern/AUD_ConverterReader.cpp + intern/AUD_ConverterReader.h + intern/AUD_DefaultMixer.cpp + intern/AUD_DefaultMixer.h + intern/AUD_FileFactory.cpp + intern/AUD_FileFactory.h + intern/AUD_I3DDevice.h + intern/AUD_IDevice.h + intern/AUD_IFactory.h + intern/AUD_IReader.h + intern/AUD_LinearResampleFactory.cpp + intern/AUD_LinearResampleFactory.h + intern/AUD_LinearResampleReader.cpp + intern/AUD_LinearResampleReader.h + intern/AUD_Mixer.cpp + intern/AUD_Mixer.h + intern/AUD_MixerFactory.cpp + intern/AUD_MixerFactory.h + intern/AUD_NULLDevice.cpp + intern/AUD_NULLDevice.h + intern/AUD_PyInit.h + intern/AUD_ReadDevice.cpp + intern/AUD_ReadDevice.h + intern/AUD_Reference.h + intern/AUD_ResampleFactory.h + intern/AUD_SequencerFactory.cpp + intern/AUD_SequencerFactory.h + intern/AUD_SequencerReader.cpp + intern/AUD_SequencerReader.h + intern/AUD_SilenceFactory.cpp + intern/AUD_SilenceFactory.h + intern/AUD_SilenceReader.cpp + intern/AUD_SilenceReader.h + intern/AUD_SinusFactory.cpp + intern/AUD_SinusFactory.h + intern/AUD_SinusReader.cpp + intern/AUD_SinusReader.h + intern/AUD_SoftwareDevice.cpp + intern/AUD_SoftwareDevice.h + intern/AUD_Space.h + intern/AUD_StreamBufferFactory.cpp + intern/AUD_StreamBufferFactory.h ) IF(WITH_FFMPEG) - LIST(APPEND INC ffmpeg ${FFMPEG_INC}) - FILE(GLOB FFMPEGSRC ffmpeg/*.cpp) ADD_DEFINITIONS(-DWITH_FFMPEG) + LIST(APPEND INC ffmpeg ${FFMPEG_INC}) + SET(FFMPEGSRC + ffmpeg/AUD_FFMPEGFactory.cpp + ffmpeg/AUD_FFMPEGReader.cpp + ) ENDIF(WITH_FFMPEG) IF(WITH_SDL) - LIST(APPEND INC SDL ${SDL_INCLUDE_DIR}) - FILE(GLOB SDLSRC SDL/*.cpp) ADD_DEFINITIONS(-DWITH_SDL) + LIST(APPEND INC SDL ${SDL_INCLUDE_DIR}) + SET(SDLSRC + SDL/AUD_SDLDevice.cpp + ) ENDIF(WITH_SDL) IF(WITH_OPENAL) - LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) - FILE(GLOB OPENALSRC OpenAL/*.cpp) ADD_DEFINITIONS(-DWITH_OPENAL) + LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) + SET(OPENALSRC + OpenAL/AUD_OpenALDevice.cpp + ) ENDIF(WITH_OPENAL) IF(WITH_JACK) - LIST(APPEND INC jack ${JACK_INC}) - FILE(GLOB JACKSRC jack/*.cpp) ADD_DEFINITIONS(-DWITH_JACK) + LIST(APPEND INC jack ${JACK_INC}) + SET(JACKSRC + jack/AUD_JackDevice.cpp + ) ENDIF(WITH_JACK) IF(WITH_SNDFILE) - LIST(APPEND INC sndfile ${SNDFILE_INC}) - FILE(GLOB SNDFILESRC sndfile/*.cpp) ADD_DEFINITIONS(-DWITH_SNDFILE) + LIST(APPEND INC sndfile ${SNDFILE_INC}) + SET(SNDFILESRC + sndfile/AUD_SndFileFactory.cpp + sndfile/AUD_SndFileReader.cpp + ) ENDIF(WITH_SNDFILE) #IF(WITH_FFTW3) -# LIST(APPEND INC fftw ${FFTW3_INC}) -# FILE(GLOB FFTW3SRC fftw/*.cpp) # ADD_DEFINITIONS(-DWITH_FFTW3) +# LIST(APPEND INC fftw ${FFTW3_INC}) +# SET(FFTW3SRC +# fftw/AUD_BandPassFactory.cpp +# fftw/AUD_BandPassReader.cpp +# ) #ENDIF(WITH_FFTW3) IF(WITH_PYTHON) LIST(APPEND INC Python ${PYTHON_INC}) - FILE(GLOB PYTHONSRC Python/*.cpp) + SET(PYTHONSRC + Python/AUD_PyAPI.cpp + ) ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt index 91500712a4c..4b261900521 100644 --- a/intern/boolop/CMakeLists.txt +++ b/intern/boolop/CMakeLists.txt @@ -36,6 +36,23 @@ SET(INC ../../source/blender/makesdna ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/BOP_BBox.cpp + intern/BOP_BSPNode.cpp + intern/BOP_BSPTree.cpp + intern/BOP_Edge.cpp + intern/BOP_Face.cpp + intern/BOP_Face2Face.cpp + intern/BOP_Interface.cpp + intern/BOP_MathUtils.cpp + intern/BOP_Merge.cpp + intern/BOP_Merge2.cpp + intern/BOP_Mesh.cpp + intern/BOP_Segment.cpp + intern/BOP_Splitter.cpp + intern/BOP_Tag.cpp + intern/BOP_Triangulator.cpp + intern/BOP_Vertex.cpp +) BLENDERLIB(bf_intern_bop "${SRC}" "${INC}") diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt index debbc86c240..358c02fec73 100644 --- a/intern/bsp/CMakeLists.txt +++ b/intern/bsp/CMakeLists.txt @@ -31,6 +31,10 @@ SET(INC ../memutil ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/BSP_CSGMesh.cpp + intern/BSP_MeshPrimitives.cpp + intern/CSG_BooleanOps.cpp +) BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}") diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt index 9ae684ec542..393883cb148 100644 --- a/intern/container/CMakeLists.txt +++ b/intern/container/CMakeLists.txt @@ -24,8 +24,12 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC .) +SET(INC + . +) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/CTR_List.cpp +) BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}") diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt index 77ab6249e7f..c284ed087fd 100644 --- a/intern/decimation/CMakeLists.txt +++ b/intern/decimation/CMakeLists.txt @@ -31,6 +31,15 @@ SET(INC ../moto/include ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/LOD_EdgeCollapser.cpp + intern/LOD_ExternNormalEditor.cpp + intern/LOD_FaceNormalEditor.cpp + intern/LOD_ManMesh2.cpp + intern/LOD_MeshPrimitives.cpp + intern/LOD_QSDecimator.cpp + intern/LOD_QuadricEditor.cpp + intern/LOD_decimation.cpp +) BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}") diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index 57fb6180adb..a4ee5927216 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -24,9 +24,37 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ${PNG_INC} ${ZLIB_INC} extern) +SET(INC + extern + ${PNG_INC} + ${ZLIB_INC} +) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/attributes.cpp + intern/controlparticles.cpp + intern/elbeem.cpp + intern/elbeem_control.cpp + intern/isosurface.cpp + intern/mvmcoords.cpp + intern/ntl_blenderdumper.cpp + intern/ntl_bsptree.cpp + intern/ntl_geometrymodel.cpp + intern/ntl_geometryobject.cpp + intern/ntl_lighting.cpp + intern/ntl_ray.cpp + intern/ntl_world.cpp + intern/parametrizer.cpp + intern/particletracer.cpp + intern/simulation_object.cpp + intern/solver_adap.cpp + intern/solver_control.cpp + intern/solver_init.cpp + intern/solver_interface.cpp + intern/solver_main.cpp + intern/solver_util.cpp + intern/utilities.cpp +) ADD_DEFINITIONS(-DNOGUI -DELBEEM_BLENDER=1) IF(WINDOWS) diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt index 50ae78d6d16..11bad7ed5f6 100644 --- a/intern/iksolver/CMakeLists.txt +++ b/intern/iksolver/CMakeLists.txt @@ -30,6 +30,13 @@ SET(INC ../moto/include ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/IK_QJacobian.cpp + intern/IK_QJacobianSolver.cpp + intern/IK_QSegment.cpp + intern/IK_QTask.cpp + intern/IK_Solver.cpp + intern/MT_ExpMap.cpp +) BLENDERLIB(bf_intern_ik "${SRC}" "${INC}") diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index 88f902b38c8..c8d2bbb6987 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -24,8 +24,46 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ../../extern/Eigen2) +SET(INC + ../../extern/Eigen2 +) -FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp) +SET(SRC + Armature.cpp + Cache.cpp + ConstraintSet.cpp + ControlledObject.cpp + CopyPose.cpp + Distance.cpp + FixedObject.cpp + MovingFrame.cpp + Scene.cpp + UncontrolledObject.cpp + WDLSSolver.cpp + WSDLSSolver.cpp + WorldObject.cpp + eigen_types.cpp + kdl/chain.cpp + kdl/chainfksolverpos_recursive.cpp + kdl/chainjnttojacsolver.cpp + kdl/frameacc.cpp + kdl/frames.cpp + kdl/frames_io.cpp + kdl/framevel.cpp + kdl/inertia.cpp + kdl/jacobian.cpp + kdl/jntarray.cpp + kdl/jntarrayacc.cpp + kdl/jntarrayvel.cpp + kdl/joint.cpp + kdl/kinfam_io.cpp + kdl/segment.cpp + kdl/tree.cpp + kdl/treefksolverpos_recursive.cpp + kdl/treejnttojacsolver.cpp + kdl/utilities/error_stack.cpp + kdl/utilities/utility.cpp + kdl/utilities/utility_io.cpp +) BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}") diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt index ebbc53403f4..10bb6733c93 100644 --- a/intern/memutil/CMakeLists.txt +++ b/intern/memutil/CMakeLists.txt @@ -24,7 +24,10 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC . ..) +SET(INC + . + .. +) SET(SRC ./intern/MEM_CacheLimiterC-Api.cpp diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt index 91c523eced9..f3300ec562b 100644 --- a/intern/moto/CMakeLists.txt +++ b/intern/moto/CMakeLists.txt @@ -24,8 +24,23 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC include) +SET(INC + include +) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/MT_Assert.cpp + intern/MT_CmMatrix4x4.cpp + intern/MT_Matrix3x3.cpp + intern/MT_Matrix4x4.cpp + intern/MT_Plane3.cpp + intern/MT_Point3.cpp + intern/MT_Quaternion.cpp + intern/MT_Transform.cpp + intern/MT_Vector2.cpp + intern/MT_Vector3.cpp + intern/MT_Vector4.cpp + intern/MT_random.cpp +) BLENDERLIB(bf_intern_moto "${SRC}" "${INC}") diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt index b29eaa680b6..900bad543ac 100644 --- a/intern/opennl/CMakeLists.txt +++ b/intern/opennl/CMakeLists.txt @@ -24,8 +24,44 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC extern superlu) +SET(INC + extern + superlu +) -FILE(GLOB SRC intern/*.c superlu/*.c) +SET(SRC + intern/opennl.c + superlu/colamd.c + superlu/get_perm_c.c + superlu/heap_relax_snode.c + superlu/lsame.c + superlu/memory.c + superlu/mmd.c + superlu/relax_snode.c + superlu/scolumn_bmod.c + superlu/scolumn_dfs.c + superlu/scopy_to_ucol.c + superlu/sgssv.c + superlu/sgstrf.c + superlu/sgstrs.c + superlu/smemory.c + superlu/smyblas2.c + superlu/sp_coletree.c + superlu/sp_ienv.c + superlu/sp_preorder.c + superlu/spanel_bmod.c + superlu/spanel_dfs.c + superlu/spivotL.c + superlu/spruneL.c + superlu/ssnode_bmod.c + superlu/ssnode_dfs.c + superlu/ssp_blas2.c + superlu/ssp_blas3.c + superlu/strsv.c + superlu/superlu_timer.c + superlu/sutil.c + superlu/util.c + superlu/xerbla.c +) BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}") diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 6c844cbd232..741301f04da 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -33,7 +33,16 @@ SET(INC ${ZLIB_INC} ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/EIGENVALUE_HELPER.cpp + intern/FLUID_3D.cpp + intern/FLUID_3D_SOLVERS.cpp + intern/FLUID_3D_STATIC.cpp + intern/LU_HELPER.cpp + intern/SPHERE.cpp + intern/WTURBULENCE.cpp + intern/smoke_API.cpp +) IF(WITH_OPENMP) ADD_DEFINITIONS(-DPARALLEL=1) diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt index a1b130d93be..399de33e043 100644 --- a/intern/string/CMakeLists.txt +++ b/intern/string/CMakeLists.txt @@ -24,7 +24,12 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC .) -SET(SRC ./intern/STR_String.cpp) +SET(INC + . +) + +SET(SRC + ./intern/STR_String.cpp +) BLENDERLIB(bf_intern_string "${SRC}" "${INC}") diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt index b1ddb8c7895..62bf51dada3 100644 --- a/source/blender/avi/CMakeLists.txt +++ b/source/blender/avi/CMakeLists.txt @@ -24,12 +24,20 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC . ../../../intern/guardedalloc ${JPEG_INC} ) +SET(SRC + intern/avi.c + intern/avirgb.c + intern/codecs.c + intern/endian.c + intern/mjpeg.c + intern/options.c + intern/rgb32.c +) + BLENDERLIB(bf_avi "${SRC}" "${INC}") diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index abaf769bd3c..f6afa31a28d 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -22,8 +22,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC . ../blenlib @@ -35,6 +33,15 @@ SET(INC ${FREETYPE_INCLUDE_DIRS} ) +SET(SRC + intern/blf.c + intern/blf_dir.c + intern/blf_font.c + intern/blf_glyph.c + intern/blf_lang.c + intern/blf_util.c +) + IF(WITH_INTERNATIONAL) LIST(APPEND INC ${GETTEXT_INC}) ADD_DEFINITIONS(-DINTERNATIONAL) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index f6c8febd955..a63f0031eed 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC . ../avi @@ -54,6 +52,93 @@ SET(INC ${ZLIB_INC} ) +SET(SRC + intern/BME_Customdata.c + intern/BME_conversions.c + intern/BME_eulers.c + intern/BME_mesh.c + intern/BME_structure.c + intern/BME_tools.c + intern/CCGSubSurf.c + intern/DerivedMesh.c + intern/action.c + intern/anim.c + intern/anim_sys.c + intern/armature.c + intern/blender.c + intern/bmfont.c + intern/boids.c + intern/booleanops_mesh.c + intern/brush.c + intern/bullet.c + intern/bvhutils.c + intern/cdderivedmesh.c + intern/cloth.c + intern/collision.c + intern/colortools.c + intern/constraint.c + intern/context.c + intern/curve.c + intern/customdata.c + intern/customdata_file.c + intern/deform.c + intern/depsgraph.c + intern/displist.c + intern/effect.c + intern/exotic.c + intern/fcurve.c + intern/fluidsim.c + intern/fmodifier.c + intern/font.c + intern/gpencil.c + intern/group.c + intern/icons.c + intern/idcode.c + intern/idprop.c + intern/image.c + intern/image_gen.c + intern/implicit.c + intern/ipo.c + intern/key.c + intern/lattice.c + intern/library.c + intern/material.c + intern/mball.c + intern/mesh.c + intern/modifier.c + intern/multires.c + intern/nla.c + intern/node.c + intern/object.c + intern/packedFile.c + intern/paint.c + intern/particle.c + intern/particle_system.c + intern/pointcache.c + intern/property.c + intern/report.c + intern/sca.c + intern/scene.c + intern/screen.c + intern/script.c + intern/seqcache.c + intern/seqeffects.c + intern/sequencer.c + intern/shrinkwrap.c + intern/sketch.c + intern/smoke.c + intern/softbody.c + intern/sound.c + intern/subsurf_ccg.c + intern/suggestions.c + intern/text.c + intern/texture.c + intern/unit.c + intern/world.c + intern/writeavi.c + intern/writeffmpeg.c + intern/writeframeserver.c +) ADD_DEFINITIONS(-DGLEW_STATIC) diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 320d4ac783f..a37723a8287 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC . ../makesdna @@ -38,9 +36,52 @@ SET(INC ${FREETYPE_INCLUDE_DIRS} ) -# unused -LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/BLI_bfile.c") - +SET(SRC + intern/BLI_args.c + intern/BLI_dynstr.c + intern/BLI_ghash.c + intern/BLI_heap.c + intern/BLI_kdopbvh.c + intern/BLI_kdtree.c + intern/BLI_linklist.c + intern/BLI_memarena.c + intern/BLI_mempool.c + intern/DLRB_tree.c + intern/boxpack2d.c + intern/bpath.c + intern/cpu.c + intern/dynlib.c + intern/edgehash.c + intern/fileops.c + intern/fnmatch.c + intern/freetypefont.c + intern/graph.c + intern/gsqueue.c + intern/jitter.c + intern/listbase.c + intern/math_base.c + intern/math_base_inline.c + intern/math_color.c + intern/math_geom.c + intern/math_geom_inline.c + intern/math_matrix.c + intern/math_rotation.c + intern/math_vector.c + intern/math_vector_inline.c + intern/noise.c + intern/path_util.c + intern/pbvh.c + intern/rand.c + intern/rct.c + intern/scanfill.c + intern/storage.c + intern/string.c + intern/threads.c + intern/time.c + intern/uvproject.c + intern/voxel.c + intern/winstuff.c +) IF(CMAKE_SYSTEM_NAME MATCHES "Linux") LIST(APPEND INC "${BINRELOC_INC}") diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index cc70d3355f2..144b1d1b1a1 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC . ../blenlib @@ -39,4 +37,11 @@ SET(INC ${ZLIB_INC} ) +SET(SRC + intern/readblenentry.c + intern/readfile.c + intern/undofile.c + intern/writefile.c +) + BLENDERLIB(bf_blenloader "${SRC}" "${INC}") diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index 3abf1e44449..41ec5864382 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC . .. @@ -35,6 +33,10 @@ SET(INC ../../../intern/guardedalloc ) +SET(SRC + intern/pluginapi.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index a72ecc4be6c..bcc407b6b68 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -24,43 +24,55 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - -IF(APPLE) SET(INC - . - ../blenlib - ../blenkernel - ../windowmanager - ../makesdna - ../makesrna - ../editors/include - ../../../intern/guardedalloc - ${OPENCOLLADA_INC}/COLLADAStreamWriter - ${OPENCOLLADA_INC}/COLLADABaseUtils - ${OPENCOLLADA_INC}/COLLADAFramework - ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader + . + ../blenlib + ../blenkernel + ../windowmanager + ../makesdna + ../makesrna + ../editors/include + ../../../intern/guardedalloc ) +IF(APPLE) + LIST(APPEND INC + ${OPENCOLLADA_INC}/COLLADAStreamWriter + ${OPENCOLLADA_INC}/COLLADABaseUtils + ${OPENCOLLADA_INC}/COLLADAFramework + ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader + ) ELSE(APPLE) + LIST(APPEND INC + ${OPENCOLLADA_INC}/COLLADAStreamWriter/include + ${OPENCOLLADA_INC}/COLLADABaseUtils/include + ${OPENCOLLADA_INC}/COLLADAFramework/include + ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include + ) +ENDIF(APPLE) -SET(INC - . - ../blenlib - ../blenkernel - ../windowmanager - ../makesdna - ../makesrna - ../editors/include - ../../../intern/guardedalloc - ${OPENCOLLADA_INC}/COLLADAStreamWriter/include - ${OPENCOLLADA_INC}/COLLADABaseUtils/include - ${OPENCOLLADA_INC}/COLLADAFramework/include - ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include +SET(SRC + AnimationImporter.cpp + ArmatureExporter.cpp + ArmatureImporter.cpp + CameraExporter.cpp + DocumentExporter.cpp + DocumentImporter.cpp + EffectExporter.cpp + GeometryExporter.cpp + ImageExporter.cpp + InstanceWriter.cpp + LightExporter.cpp + MaterialExporter.cpp + MeshImporter.cpp + SkinInfo.cpp + TransformReader.cpp + TransformWriter.cpp + collada.cpp + collada_internal.cpp + collada_utils.cpp ) -ENDIF(APPLE) - IF(WITH_BUILDINFO) ADD_DEFINITIONS(-DNAN_BUILDINFO) ENDIF(WITH_BUILDINFO) diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index d5eef6bbd34..7954e2c8313 100644 --- a/source/blender/editors/animation/CMakeLists.txt +++ b/source/blender/editors/animation/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,22 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + anim_channels_defines.c + anim_channels_edit.c + anim_deps.c + anim_draw.c + anim_filter.c + anim_ipo_utils.c + anim_markers.c + anim_ops.c + drivers.c + fmodifier_ui.c + keyframes_draw.c + keyframes_edit.c + keyframes_general.c + keyframing.c + keyingsets.c +) + BLENDERLIB(bf_editor_animation "${SRC}" "${INC}") diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index b5634921343..62b76655010 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -32,6 +30,20 @@ SET(INC ../../../../intern/opennl/extern ) +SET(SRC + armature_ops.c + editarmature.c + editarmature_generate.c + editarmature_retarget.c + editarmature_sketch.c + meshlaplacian.c + poseSlide.c + poseUtils.c + poselib.c + poseobject.c + reeb.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index ab45d73a2de..8e47dc9c264 100644 --- a/source/blender/editors/curve/CMakeLists.txt +++ b/source/blender/editors/curve/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,11 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + curve_ops.c + editcurve.c + editfont.c + lorem.c +) + BLENDERLIB(bf_editor_curve "${SRC}" "${INC}") diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index d37ee338733..7683db8ab7a 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -19,8 +19,45 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC "") +SET(SRC + Bfont.c + add.png.c + bfont.ttf.c + blenderbuttons.c + blob.png.c + blur.png.c + bmonofont.ttf.c + clay.png.c + clone.png.c + crease.png.c + darken.png.c + draw.png.c + fill.png.c + flatten.png.c + grab.png.c + inflate.png.c + layer.png.c + lighten.png.c + mix.png.c + multiply.png.c + nudge.png.c + pinch.png.c + preview.blend.c + prvicons.c + scrape.png.c + smear.png.c + smooth.png.c + snake_hook.png.c + soften.png.c + splash.png.c + startup.blend.c + subtract.png.c + texdraw.png.c + thumb.png.c + twist.png.c + vertexdraw.png.c +) + BLENDERLIB(bf_editor_datafiles "${SRC}" "${INC}") diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt index 394418b5688..ab92f0a9b41 100644 --- a/source/blender/editors/gpencil/CMakeLists.txt +++ b/source/blender/editors/gpencil/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -32,4 +30,13 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + drawgpencil.c + editaction_gpencil.c + gpencil_buttons.c + gpencil_edit.c + gpencil_ops.c + gpencil_paint.c +) + BLENDERLIB(bf_editor_gpencil "${SRC}" "${INC}") diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 4b4590aeee5..31de4537c24 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenfont @@ -35,6 +33,25 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + interface.c + interface_anim.c + interface_draw.c + interface_handlers.c + interface_icons.c + interface_layout.c + interface_ops.c + interface_panel.c + interface_regions.c + interface_style.c + interface_templates.c + interface_utils.c + interface_widgets.c + resources.c + view2d.c + view2d_ops.c +) + IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DINTERNATIONAL) ENDIF(WITH_INTERNATIONAL) diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 4145f251a64..1e26f273b41 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -33,6 +31,20 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + editface.c + editmesh.c + editmesh_add.c + editmesh_lib.c + editmesh_loop.c + editmesh_mods.c + editmesh_tools.c + loopcut.c + mesh_data.c + mesh_ops.c + meshtools.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index 5e821a5c1e8..9b9ca809f25 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -32,4 +30,9 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + mball_edit.c + mball_ops.c +) + BLENDERLIB(bf_editor_metaball "${SRC}" "${INC}") diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index 10fbd62a098..bfcb233e466 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -36,12 +34,29 @@ SET(INC ../../../../intern/guardedalloc ) -IF(NOT WITH_PYTHON) - ADD_DEFINITIONS(-DDISABLE_PYTHON) -ENDIF(NOT WITH_PYTHON) +SET(SRC + object_add.c + object_bake.c + object_constraint.c + object_edit.c + object_group.c + object_hook.c + object_lattice.c + object_modifier.c + object_ops.c + object_relations.c + object_select.c + object_shapekey.c + object_transform.c + object_vgroup.c +) IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) +IF(NOT WITH_PYTHON) + ADD_DEFINITIONS(-DDISABLE_PYTHON) +ENDIF(NOT WITH_PYTHON) + BLENDERLIB(bf_editor_object "${SRC}" "${INC}") diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 49f20bb9ed0..5d36038b76a 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -32,6 +30,19 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + particle_boids.c + particle_edit.c + particle_object.c + physics_fluid.c + physics_ops.c + physics_pointcache.c +) + +IF(WIN32) + LIST(APPEND INC ${PTHREADS_INC}) +ENDIF(WIN32) + IF(NOT WITH_FLUID) ADD_DEFINITIONS(-DDISABLE_ELBEEM) ENDIF(NOT WITH_FLUID) @@ -40,8 +51,4 @@ IF(WITH_OPENMP) ADD_DEFINITIONS(-DPARALLEL=1) ENDIF(WITH_OPENMP) -IF(WIN32) - LIST(APPEND INC ${PTHREADS_INC}) -ENDIF(WIN32) - BLENDERLIB(bf_editor_physics "${SRC}" "${INC}") diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index d494355a1e9..57ee27c3b6b 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenfont @@ -37,6 +35,14 @@ SET(INC ../../../../extern/glew/include ) +SET(SRC + render_internal.c + render_opengl.c + render_ops.c + render_preview.c + render_shading.c +) + IF(WITH_QUICKTIME) LIST(APPEND INC ../../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index f7dfd81dba9..4ea056ac400 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenfont @@ -33,6 +31,15 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + area.c + glutil.c + screen_context.c + screen_edit.c + screen_ops.c + screendump.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 3211763b619..364677f9a8d 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -34,6 +32,17 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + paint_image.c + paint_ops.c + paint_stroke.c + paint_undo.c + paint_utils.c + paint_vertex.c + sculpt.c + sculpt_undo.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 456c02d947e..377643a5463 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -32,4 +30,8 @@ SET(INC ../../../../intern/audaspace/intern ) +SET(SRC + sound_ops.c +) + BLENDERLIB(bf_editor_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index 3c0585c31ca..2ddc60a9e59 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,12 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + action_draw.c + action_edit.c + action_ops.c + action_select.c + space_action.c +) + BLENDERLIB(bf_editor_space_action "${SRC}" "${INC}") diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index da140fe0982..5436d8207c5 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,9 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + space.c + spacetypes.c +) + BLENDERLIB(bf_editor_space_api "${SRC}" "${INC}") diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index f8e9536ecf8..b92f2051e74 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,11 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + buttons_context.c + buttons_header.c + buttons_ops.c + space_buttons.c +) + BLENDERLIB(bf_editor_space_buttons "${SRC}" "${INC}") diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index 59074bcbb79..b1d9920fed4 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenfont @@ -33,6 +31,13 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + console_draw.c + console_ops.c + console_report.c + space_console.c +) + IF(NOT WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(NOT WITH_PYTHON) diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 2a204d67537..3130e6d6c14 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenfont @@ -35,6 +33,17 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + file_draw.c + file_ops.c + file_panels.c + filelist.c + filesel.c + fsmenu.c + space_file.c + writeimage.c +) + IF(WITH_IMAGE_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR) diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 33ddbcea019..d5c295cf251 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -32,4 +30,14 @@ SET(INC ../../../../intern/audaspace/intern ) +SET(SRC + graph_buttons.c + graph_draw.c + graph_edit.c + graph_ops.c + graph_select.c + graph_utils.c + space_graph.c +) + BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}") diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 750c4b324d6..c2166164b0a 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -33,6 +31,15 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + image_buttons.c + image_draw.c + image_header.c + image_ops.c + image_render.c + space_image.c +) + IF(WITH_IMAGE_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR) diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index 9d439c4ec00..4187afd8df4 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -32,4 +30,10 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + info_ops.c + info_stats.c + space_info.c +) + BLENDERLIB(bf_editor_space_info "${SRC}" "${INC}") diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt index 6f0a260124d..64519d606f1 100644 --- a/source/blender/editors/space_logic/CMakeLists.txt +++ b/source/blender/editors/space_logic/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -32,6 +30,13 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + logic_buttons.c + logic_ops.c + logic_window.c + space_logic.c +) + IF(WITH_GAMEENGINE) ADD_DEFINITIONS(-DGAMEBLENDER) ENDIF(WITH_GAMEENGINE) diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 6bb656cba8c..0a5f484bb05 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,14 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + nla_buttons.c + nla_channels.c + nla_draw.c + nla_edit.c + nla_ops.c + nla_select.c + space_nla.c +) + BLENDERLIB(bf_editor_space_nla "${SRC}" "${INC}") diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index ae298a611e9..887d79f8fb3 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -35,6 +33,18 @@ SET(INC ../../../../intern/opennl/extern ) +SET(SRC + drawnode.c + node_buttons.c + node_draw.c + node_edit.c + node_header.c + node_ops.c + node_select.c + node_state.c + space_node.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 5ebe47f8c5e..33128bde986 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -33,4 +31,10 @@ SET(INC ../../../../intern/opennl/extern ) +SET(SRC + outliner.c + outliner_ops.c + space_outliner.c +) + BLENDERLIB(bf_editor_space_outliner "${SRC}" "${INC}") diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index 7abaa4db441..88c0ea56ab2 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,6 +29,13 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + script_edit.c + script_header.c + script_ops.c + space_script.c +) + IF(WITH_PYTHON) LIST(APPEND INC ${PYTHON_INC} ../../python) ELSE(WITH_PYTHON) diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index fa99d35a7cd..673c6af74c7 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -33,4 +31,15 @@ SET(INC ../../../../intern/audaspace/intern ) +SET(SRC + sequencer_add.c + sequencer_buttons.c + sequencer_draw.c + sequencer_edit.c + sequencer_ops.c + sequencer_scopes.c + sequencer_select.c + space_sequencer.c +) + BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}") diff --git a/source/blender/editors/space_sound/CMakeLists.txt b/source/blender/editors/space_sound/CMakeLists.txt index c78fc11a908..0f94e8a518e 100644 --- a/source/blender/editors/space_sound/CMakeLists.txt +++ b/source/blender/editors/space_sound/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,9 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + sound_header.c + space_sound.c +) + BLENDERLIB(bf_editor_space_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index eabf508b5f6..b53a86fbe39 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenfont @@ -32,6 +30,14 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + space_text.c + text_draw.c + text_header.c + text_ops.c + text_python.c +) + IF(WITH_PYTHON) LIST(APPEND INC ${PYTHON_INC} ../../python) ELSE(WITH_PYTHON) diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt index 4da42ec1f42..65f71e0b89b 100644 --- a/source/blender/editors/space_time/CMakeLists.txt +++ b/source/blender/editors/space_time/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,9 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + space_time.c + time_ops.c +) + BLENDERLIB(bf_editor_space_time "${SRC}" "${INC}") diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index d57661bb166..b8a04a16edc 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,9 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + space_userpref.c + userpref_ops.c +) + BLENDERLIB(bf_editor_space_userpref "${SRC}" "${INC}") diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 48747898981..855d770c784 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenfont @@ -36,6 +34,24 @@ SET(INC ../../../../intern/smoke/extern ) +SET(SRC + drawanimviz.c + drawarmature.c + drawmesh.c + drawobject.c + drawvolume.c + space_view3d.c + view3d_buttons.c + view3d_draw.c + view3d_edit.c + view3d_header.c + view3d_ops.c + view3d_select.c + view3d_snap.c + view3d_toolbar.c + view3d_view.c +) + IF(WITH_GAMEENGINE) LIST(APPEND INC ../../../kernel/gen_system) ADD_DEFINITIONS(-DGAMEBLENDER) diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index e28ed89c80c..61508a48ecd 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,17 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + transform.c + transform_constraints.c + transform_conversions.c + transform_generics.c + transform_input.c + transform_manipulator.c + transform_ndofinput.c + transform_ops.c + transform_orientations.c + transform_snap.c +) + BLENDERLIB(bf_editor_transform "${SRC}" "${INC}") diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index be700b17b7a..99f0d4bc2b2 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -31,4 +29,11 @@ SET(INC ../../../../intern/guardedalloc ) +SET(SRC + ed_util.c + editmode_undo.c + numinput.c + undo.c +) + BLENDERLIB(bf_editor_util "${SRC}" "${INC}") diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 36cd1274ec7..33251cc6344 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -19,8 +19,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC ../include ../../blenkernel @@ -32,4 +30,11 @@ SET(INC ../../../../intern/opennl/extern ) +SET(SRC + uvedit_draw.c + uvedit_ops.c + uvedit_parametrizer.c + uvedit_unwrap_ops.c +) + BLENDERLIB(bf_editor_uvedit "${SRC}" "${INC}") diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 5de7b0c5281..02a43abf098 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC . ../blenlib @@ -39,6 +37,16 @@ SET(INC ../../../intern/smoke/extern ) +SET(SRC + intern/gpu_buffers.c + intern/gpu_codegen.c + intern/gpu_draw.c + intern/gpu_extensions.c + intern/gpu_material.c + intern/gpu_shader_material.glsl.c + intern/gpu_shader_vertex.glsl.c +) + IF(WIN32) INCLUDE_DIRECTORIES(${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt index 79f33effb87..61d5ff4f7fe 100644 --- a/source/blender/ikplugin/CMakeLists.txt +++ b/source/blender/ikplugin/CMakeLists.txt @@ -24,12 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** - -SET(SRC - ./intern/ikplugin_api.c - ./intern/iksolver_plugin.c -) - SET(INC ../blenlib ../makesdna @@ -40,6 +34,11 @@ SET(INC ../../../intern/iksolver/extern ) +SET(SRC + ./intern/ikplugin_api.c + ./intern/iksolver_plugin.c +) + IF(WITH_IK_ITASC) ADD_DEFINITIONS(-DWITH_IK_ITASC) LIST(APPEND INC ../../../extern/Eigen2) diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 699ed6e1b00..f89ef033d78 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -24,9 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - - SET(INC . ../avi @@ -40,6 +37,35 @@ SET(INC ${ZLIB_INC} ) +SET(SRC + intern/allocimbuf.c + intern/anim_movie.c + intern/bmp.c + intern/cache.c + intern/divers.c + intern/filetype.c + intern/filter.c + intern/imageprocess.c + intern/iris.c + intern/jp2.c + intern/jpeg.c + intern/md5.c + intern/metadata.c + intern/module.c + intern/png.c + intern/radiance_hdr.c + intern/readimage.c + intern/rectop.c + intern/rotate.c + intern/scaling.c + intern/targa.c + intern/thumbs.c + intern/thumbs_blend.c + intern/tiff.c + intern/util.c + intern/writeimage.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index 5633d2a66f6..a39235b20ec 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -24,17 +24,24 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC . + intern/include .. ../../ - intern/include ../../../blenkernel ../../../blenlib ../../../makesdna ../../../../../intern/guardedalloc ) +SET(SRC + cineon_dpx.c + cineonlib.c + dpxlib.c + logImageCore.c + logImageLib.c + logmemfile.c +) + BLENDERLIB(bf_cineon "${SRC}" "${INC}") diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt index 620d4041703..78513b35b87 100644 --- a/source/blender/imbuf/intern/dds/CMakeLists.txt +++ b/source/blender/imbuf/intern/dds/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE (GLOB SRC *.cpp) - SET(INC . .. @@ -37,6 +35,15 @@ SET(INC ../../../../../intern/guardedalloc ) +SET(SRC + BlockDXT.cpp + ColorBlock.cpp + DirectDrawSurface.cpp + Image.cpp + Stream.cpp + dds_api.cpp +) + if(WITH_IMAGE_DDS) ADD_DEFINITIONS(-DWITH_DDS) ENDIF(WITH_IMAGE_DDS) diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index cfc977ff155..836958f4b09 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC openexr_api.cpp) - SET(INC . ../../../blenkernel @@ -38,6 +36,10 @@ SET(INC ${OPENEXR_INC} ) +SET(SRC + openexr_api.cpp +) + IF(WITH_IMAGE_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR) diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index b6dcc9c03f9..99e8c05b1ae 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC . ./intern ../blenlib @@ -40,6 +38,47 @@ SET(INC ${ZLIB_INC} ) +SET(SRC + intern/MOD_armature.c + intern/MOD_array.c + intern/MOD_bevel.c + intern/MOD_boolean.c + intern/MOD_boolean_util.c + intern/MOD_build.c + intern/MOD_cast.c + intern/MOD_cloth.c + intern/MOD_collision.c + intern/MOD_curve.c + intern/MOD_decimate.c + intern/MOD_displace.c + intern/MOD_edgesplit.c + intern/MOD_explode.c + intern/MOD_fluidsim.c + intern/MOD_fluidsim_util.c + intern/MOD_hook.c + intern/MOD_lattice.c + intern/MOD_mask.c + intern/MOD_meshdeform.c + intern/MOD_mirror.c + intern/MOD_multires.c + intern/MOD_none.c + intern/MOD_particleinstance.c + intern/MOD_particlesystem.c + intern/MOD_screw.c + intern/MOD_shapekey.c + intern/MOD_shrinkwrap.c + intern/MOD_simpledeform.c + intern/MOD_smoke.c + intern/MOD_smooth.c + intern/MOD_softbody.c + intern/MOD_solidify.c + intern/MOD_subsurf.c + intern/MOD_surface.c + intern/MOD_util.c + intern/MOD_uvproject.c + intern/MOD_wave.c +) + IF(NOT WITH_FLUID) ADD_DEFINITIONS(-DDISABLE_ELBEEM) ENDIF(NOT WITH_FLUID) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 8d8423cc19b..d4383f330c4 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -23,8 +23,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c intern/TEX_nodes/*.c) - SET(INC . ../blenkernel @@ -39,6 +37,109 @@ SET(INC ../../../extern/glew/include ) +SET(SRC + intern/CMP_nodes/CMP_alphaOver.c + intern/CMP_nodes/CMP_bilateralblur.c + intern/CMP_nodes/CMP_blur.c + intern/CMP_nodes/CMP_brightness.c + intern/CMP_nodes/CMP_channelMatte.c + intern/CMP_nodes/CMP_chromaMatte.c + intern/CMP_nodes/CMP_colorMatte.c + intern/CMP_nodes/CMP_colorSpill.c + intern/CMP_nodes/CMP_colorbalance.c + intern/CMP_nodes/CMP_composite.c + intern/CMP_nodes/CMP_crop.c + intern/CMP_nodes/CMP_curves.c + intern/CMP_nodes/CMP_defocus.c + intern/CMP_nodes/CMP_diffMatte.c + intern/CMP_nodes/CMP_dilate.c + intern/CMP_nodes/CMP_directionalblur.c + intern/CMP_nodes/CMP_displace.c + intern/CMP_nodes/CMP_distanceMatte.c + intern/CMP_nodes/CMP_filter.c + intern/CMP_nodes/CMP_flip.c + intern/CMP_nodes/CMP_gamma.c + intern/CMP_nodes/CMP_glare.c + intern/CMP_nodes/CMP_hueSatVal.c + intern/CMP_nodes/CMP_huecorrect.c + intern/CMP_nodes/CMP_idMask.c + intern/CMP_nodes/CMP_image.c + intern/CMP_nodes/CMP_invert.c + intern/CMP_nodes/CMP_lensdist.c + intern/CMP_nodes/CMP_levels.c + intern/CMP_nodes/CMP_lummaMatte.c + intern/CMP_nodes/CMP_mapUV.c + intern/CMP_nodes/CMP_mapValue.c + intern/CMP_nodes/CMP_math.c + intern/CMP_nodes/CMP_mixrgb.c + intern/CMP_nodes/CMP_normal.c + intern/CMP_nodes/CMP_normalize.c + intern/CMP_nodes/CMP_outputFile.c + intern/CMP_nodes/CMP_premulkey.c + intern/CMP_nodes/CMP_rgb.c + intern/CMP_nodes/CMP_rotate.c + intern/CMP_nodes/CMP_scale.c + intern/CMP_nodes/CMP_sepcombHSVA.c + intern/CMP_nodes/CMP_sepcombRGBA.c + intern/CMP_nodes/CMP_sepcombYCCA.c + intern/CMP_nodes/CMP_sepcombYUVA.c + intern/CMP_nodes/CMP_setalpha.c + intern/CMP_nodes/CMP_splitViewer.c + intern/CMP_nodes/CMP_texture.c + intern/CMP_nodes/CMP_tonemap.c + intern/CMP_nodes/CMP_translate.c + intern/CMP_nodes/CMP_valToRgb.c + intern/CMP_nodes/CMP_value.c + intern/CMP_nodes/CMP_vecBlur.c + intern/CMP_nodes/CMP_viewer.c + intern/CMP_nodes/CMP_zcombine.c + intern/CMP_util.c + intern/SHD_nodes/SHD_camera.c + intern/SHD_nodes/SHD_curves.c + intern/SHD_nodes/SHD_dynamic.c + intern/SHD_nodes/SHD_geom.c + intern/SHD_nodes/SHD_hueSatVal.c + intern/SHD_nodes/SHD_invert.c + intern/SHD_nodes/SHD_mapping.c + intern/SHD_nodes/SHD_material.c + intern/SHD_nodes/SHD_math.c + intern/SHD_nodes/SHD_mixRgb.c + intern/SHD_nodes/SHD_normal.c + intern/SHD_nodes/SHD_output.c + intern/SHD_nodes/SHD_rgb.c + intern/SHD_nodes/SHD_sepcombRGB.c + intern/SHD_nodes/SHD_squeeze.c + intern/SHD_nodes/SHD_texture.c + intern/SHD_nodes/SHD_valToRgb.c + intern/SHD_nodes/SHD_value.c + intern/SHD_nodes/SHD_vectMath.c + intern/SHD_util.c + intern/TEX_nodes/TEX_at.c + intern/TEX_nodes/TEX_bricks.c + intern/TEX_nodes/TEX_checker.c + intern/TEX_nodes/TEX_compose.c + intern/TEX_nodes/TEX_coord.c + intern/TEX_nodes/TEX_curves.c + intern/TEX_nodes/TEX_decompose.c + intern/TEX_nodes/TEX_distance.c + intern/TEX_nodes/TEX_hueSatVal.c + intern/TEX_nodes/TEX_image.c + intern/TEX_nodes/TEX_invert.c + intern/TEX_nodes/TEX_math.c + intern/TEX_nodes/TEX_mixRgb.c + intern/TEX_nodes/TEX_output.c + intern/TEX_nodes/TEX_proc.c + intern/TEX_nodes/TEX_rotate.c + intern/TEX_nodes/TEX_scale.c + intern/TEX_nodes/TEX_texture.c + intern/TEX_nodes/TEX_translate.c + intern/TEX_nodes/TEX_valToNor.c + intern/TEX_nodes/TEX_valToRgb.c + intern/TEX_nodes/TEX_viewer.c + intern/TEX_util.c + intern/node_util.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt index adb60528f51..3ffdb46e72e 100644 --- a/source/blender/python/CMakeLists.txt +++ b/source/blender/python/CMakeLists.txt @@ -25,8 +25,6 @@ ADD_SUBDIRECTORY(generic) -FILE(GLOB SRC intern/*.c) - SET(INC . ../blenlib @@ -40,6 +38,21 @@ SET(INC ${PYTHON_INC} ) +SET(SRC + intern/bpy.c + intern/bpy_app.c + intern/bpy_array.c + intern/bpy_driver.c + intern/bpy_interface.c + intern/bpy_operator.c + intern/bpy_operator_wrap.c + intern/bpy_props.c + intern/bpy_rna.c + intern/bpy_rna_callback.c + intern/bpy_util.c + intern/stubs.c +) + # only to check if buildinfo is available IF(WITH_BUILDINFO) ADD_DEFINITIONS(-DBUILD_DATE) diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 1a91abfbec8..4ac3fc36ebd 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -18,8 +18,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC . ../../blenlib @@ -31,4 +29,20 @@ SET(INC ${PYTHON_INC} ) +SET(SRC + IDProp.c + bgl.c + blf_api.c + bpy_internal_import.c + geometry.c + mathutils.c + mathutils_color.c + mathutils_euler.c + mathutils_matrix.c + mathutils_quat.c + mathutils_vector.c + noise.c + py_capi_utils.c +) + BLENDERLIB(bf_python_ext "${SRC}" "${INC}") diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt index a6522ffa758..0917599f3d4 100644 --- a/source/blender/readblenfile/CMakeLists.txt +++ b/source/blender/readblenfile/CMakeLists.txt @@ -24,10 +24,18 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC - . ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging + . + ../blenloader + ../blenloader/intern + ../blenkernel + ../blenlib + ../makesdna + ../../kernel/gen_messaging +) + +SET(SRC + intern/BLO_readblenfile.c ) BLENDERLIB(bf_readblenfile "${SRC}" "${INC}") diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index e6478098dad..f2da8f4d13e 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -27,8 +27,6 @@ # remove warning until render branch merged. STRING(REGEX REPLACE "-Wunused-parameter" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) -FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp) - SET(INC intern/include extern/include @@ -44,6 +42,42 @@ SET(INC ../../../intern/guardedalloc ) +SET(SRC + intern/raytrace/rayobject.cpp + intern/raytrace/rayobject_qbvh.cpp + intern/raytrace/rayobject_rtbuild.cpp + intern/raytrace/rayobject_svbvh.cpp + intern/raytrace/rayobject_vbvh.cpp + intern/source/convertblender.c + intern/source/envmap.c + intern/source/gammaCorrectionTables.c + intern/source/imagetexture.c + intern/source/initrender.c + intern/source/occlusion.c + intern/source/pipeline.c + intern/source/pixelblending.c + intern/source/pixelshading.c + intern/source/pointdensity.c + intern/source/rayobject_blibvh.c + intern/source/rayobject_instance.c + intern/source/rayobject_octree.c + intern/source/rayobject_raycounter.c + intern/source/rayshade.c + intern/source/rendercore.c + intern/source/renderdatabase.c + intern/source/shadbuf.c + intern/source/shadeinput.c + intern/source/shadeoutput.c + intern/source/sss.c + intern/source/strand.c + intern/source/sunsky.c + intern/source/texture.c + intern/source/volume_precache.c + intern/source/volumetric.c + intern/source/voxeldata.c + intern/source/zbuf.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 1919bf8e571..36d9f2b5c8c 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - SET(INC . ../nodes @@ -50,6 +48,23 @@ SET(INC ${OPENGL_INCLUDE_DIR} ) +SET(SRC + intern/wm.c + intern/wm_apple.c + intern/wm_cursors.c + intern/wm_dragdrop.c + intern/wm_draw.c + intern/wm_event_system.c + intern/wm_files.c + intern/wm_gesture.c + intern/wm_init_exit.c + intern/wm_jobs.c + intern/wm_keymap.c + intern/wm_operators.c + intern/wm_subwindow.c + intern/wm_window.c +) + ADD_DEFINITIONS(-DGLEW_STATIC) IF(WITH_INTERNATIONAL) diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index 473cc823f12..a40c0f19725 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -27,13 +27,6 @@ # this warning on generated files gets annoying STRING(REGEX REPLACE "-Wunused-parameter" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) -FILE(GLOB SRC stubs.c) - -IF(WITH_BUILDINFO) - ADD_DEFINITIONS(-DBUILD_DATE) - FILE(GLOB SRC ${SRC} ../../creator/buildinfo.c) -ENDIF(WITH_BUILDINFO) - SET(INC . .. @@ -43,6 +36,17 @@ SET(INC ../../../source/blender/blenkernel ) +SET(SRC + stubs.c +) + +IF(WITH_BUILDINFO) + ADD_DEFINITIONS(-DBUILD_DATE) + LIST(APPEND SRC + ../../creator/buildinfo.c + ) +ENDIF(WITH_BUILDINFO) + IF(WITH_GAMEENGINE) ADD_DEFINITIONS(-DGAMEBLENDER) ENDIF(WITH_GAMEENGINE) diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index 853cba543a4..661f9c5b25d 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -1,6 +1,4 @@ -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -37,6 +35,17 @@ SET(INC ../../../extern/glew/include ) +SET(SRC + BL_KetsjiEmbedStart.cpp + KX_BlenderCanvas.cpp + KX_BlenderGL.cpp + KX_BlenderInputDevice.cpp + KX_BlenderKeyboardDevice.cpp + KX_BlenderMouseDevice.cpp + KX_BlenderRenderTools.cpp + KX_BlenderSystem.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) IF(WITH_FFMPEG) diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index 87e413c3a44..e6b5f6c81a0 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -63,6 +61,30 @@ SET(INC ../../../extern/bullet2/src ) +SET(SRC + BL_ActionActuator.cpp + BL_ArmatureActuator.cpp + BL_ArmatureChannel.cpp + BL_ArmatureConstraint.cpp + BL_ArmatureObject.cpp + BL_BlenderDataConversion.cpp + BL_DeformableGameObject.cpp + BL_MeshDeformer.cpp + BL_ModifierDeformer.cpp + BL_ShapeActionActuator.cpp + BL_ShapeDeformer.cpp + BL_SkinDeformer.cpp + BlenderWorldInfo.cpp + KX_BlenderScalarInterpolator.cpp + KX_BlenderSceneConverter.cpp + KX_ConvertActuators.cpp + KX_ConvertControllers.cpp + KX_ConvertProperties.cpp + KX_ConvertSensors.cpp + KX_IpoConvert.cpp + KX_SoftBodyDeformer.cpp +) + IF(WITH_PYTHON) LIST(APPEND INC ${PYTHON_INC}) ELSE(WITH_PYTHON) diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt index 126192d2188..828afa7ae92 100644 --- a/source/gameengine/Expressions/CMakeLists.txt +++ b/source/gameengine/Expressions/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -36,6 +34,28 @@ SET(INC ../../../source/blender/blenloader ) +SET(SRC + BoolValue.cpp + ConstExpr.cpp + EXP_C-Api.cpp + EmptyValue.cpp + ErrorValue.cpp + Expression.cpp + FloatValue.cpp + IdentifierExpr.cpp + IfExpr.cpp + InputParser.cpp + IntValue.cpp + KX_HashedPtr.cpp + ListValue.cpp + Operator1Expr.cpp + Operator2Expr.cpp + PyObjectPlus.cpp + StringValue.cpp + Value.cpp + VectorValue.cpp +) + IF(WITH_PYTHON) LIST(APPEND INC ${PYTHON_INC}) ELSE(WITH_PYTHON) diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt index 84d915847e9..57150a90e99 100644 --- a/source/gameengine/GameLogic/CMakeLists.txt +++ b/source/gameengine/GameLogic/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp Joystick/*.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -36,6 +34,51 @@ SET(INC ../../../source/gameengine/Rasterizer ) +SET(SRC + Joystick/SCA_Joystick.cpp + Joystick/SCA_JoystickEvents.cpp + SCA_2DFilterActuator.cpp + SCA_ANDController.cpp + SCA_ActuatorEventManager.cpp + SCA_ActuatorSensor.cpp + SCA_AlwaysEventManager.cpp + SCA_AlwaysSensor.cpp + SCA_BasicEventManager.cpp + SCA_DelaySensor.cpp + SCA_EventManager.cpp + SCA_ExpressionController.cpp + SCA_IActuator.cpp + SCA_IController.cpp + SCA_IInputDevice.cpp + SCA_ILogicBrick.cpp + SCA_IObject.cpp + SCA_IScene.cpp + SCA_ISensor.cpp + SCA_JoystickManager.cpp + SCA_JoystickSensor.cpp + SCA_KeyboardManager.cpp + SCA_KeyboardSensor.cpp + SCA_LogicManager.cpp + SCA_MouseManager.cpp + SCA_MouseSensor.cpp + SCA_NANDController.cpp + SCA_NORController.cpp + SCA_ORController.cpp + SCA_PropertyActuator.cpp + SCA_PropertyEventManager.cpp + SCA_PropertySensor.cpp + SCA_PythonController.cpp + SCA_PythonKeyboard.cpp + SCA_PythonMouse.cpp + SCA_RandomActuator.cpp + SCA_RandomEventManager.cpp + SCA_RandomNumberGenerator.cpp + SCA_RandomSensor.cpp + SCA_TimeEventManager.cpp + SCA_XNORController.cpp + SCA_XORController.cpp +) + IF(WITH_SDL) SET(INC ${INC} ${SDL_INCLUDE_DIR}) ELSE(WITH_SDL) diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index 08a4aa50a00..47ac7f73a51 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -24,19 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC - bmfont.cpp - GPC_Canvas.cpp - GPC_Engine.cpp - GPC_KeyboardDevice.cpp - GPC_MouseDevice.cpp - GPC_RawImage.cpp - GPC_RawLoadDotBlendArray.cpp - GPC_RawLogoArrays.cpp - GPC_RenderTools.cpp - GPC_System.cpp -) - SET(INC . ../../../../intern/string @@ -71,6 +58,19 @@ SET(INC ${ZLIB_INC} ) +SET(SRC + bmfont.cpp + GPC_Canvas.cpp + GPC_Engine.cpp + GPC_KeyboardDevice.cpp + GPC_MouseDevice.cpp + GPC_RawImage.cpp + GPC_RawLoadDotBlendArray.cpp + GPC_RawLogoArrays.cpp + GPC_RenderTools.cpp + GPC_System.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) BLENDERLIB_NOLIST(gp_common "${SRC}" "${INC}") diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index 8164878762c..6ce9f7be280 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -24,14 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC - GPG_Application.cpp - GPG_Canvas.cpp - GPG_ghost.cpp - GPG_KeyboardDevice.cpp - GPG_System.cpp -) - SET(INC . ../../../../intern/string @@ -66,6 +58,14 @@ SET(INC ${PYTHON_INC} ) +SET(SRC + GPG_Application.cpp + GPG_Canvas.cpp + GPG_ghost.cpp + GPG_KeyboardDevice.cpp + GPG_System.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) IF(WITH_FFMPEG) diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index b128f33c6e4..68f0a0de994 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -59,6 +57,76 @@ SET(INC ../../../extern/glew/include ) +SET(SRC + BL_BlenderShader.cpp + BL_Material.cpp + BL_Shader.cpp + BL_Texture.cpp + KX_ArmatureSensor.cpp + KX_BlenderMaterial.cpp + KX_BulletPhysicsController.cpp + KX_Camera.cpp + KX_CameraActuator.cpp + KX_CameraIpoSGController.cpp + KX_ConstraintActuator.cpp + KX_ConstraintWrapper.cpp + KX_ConvertPhysicsObjects.cpp + KX_Dome.cpp + KX_EmptyObject.cpp + KX_GameActuator.cpp + KX_GameObject.cpp + KX_IPO_SGController.cpp + KX_IPhysicsController.cpp + KX_IpoActuator.cpp + KX_KetsjiEngine.cpp + KX_Light.cpp + KX_LightIpoSGController.cpp + KX_MaterialIpoController.cpp + KX_MeshProxy.cpp + KX_MotionState.cpp + KX_MouseFocusSensor.cpp + KX_NearSensor.cpp + KX_ObColorIpoSGController.cpp + KX_ObjectActuator.cpp + KX_OrientationInterpolator.cpp + KX_ParentActuator.cpp + KX_PhysicsObjectWrapper.cpp + KX_PolyProxy.cpp + KX_PolygonMaterial.cpp + KX_PositionInterpolator.cpp + KX_PyConstraintBinding.cpp + KX_PyMath.cpp + KX_PythonInit.cpp + KX_PythonInitTypes.cpp + KX_PythonSeq.cpp + KX_RadarSensor.cpp + KX_RayCast.cpp + KX_RayEventManager.cpp + KX_RaySensor.cpp + KX_SCA_AddObjectActuator.cpp + KX_SCA_DynamicActuator.cpp + KX_SCA_EndObjectActuator.cpp + KX_SCA_ReplaceMeshActuator.cpp + KX_SG_BoneParentNodeRelationship.cpp + KX_SG_NodeRelationships.cpp + KX_ScalarInterpolator.cpp + KX_ScalingInterpolator.cpp + KX_Scene.cpp + KX_SceneActuator.cpp + KX_SoundActuator.cpp + KX_StateActuator.cpp + KX_TimeCategoryLogger.cpp + KX_TimeLogger.cpp + KX_TouchEventManager.cpp + KX_TouchSensor.cpp + KX_TrackToActuator.cpp + KX_VehicleWrapper.cpp + KX_VertexProxy.cpp + KX_VisibilityActuator.cpp + KX_WorldInfo.cpp + KX_WorldIpoController.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) IF(WITH_SDL) diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt index 106d1a84a92..2b1c1a698f3 100644 --- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt +++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../../source/kernel/gen_system @@ -38,6 +36,14 @@ SET(INC ../../../../source/gameengine/Network ) +SET(SRC + KX_NetworkEventManager.cpp + KX_NetworkMessageActuator.cpp + KX_NetworkMessageSensor.cpp + KX_NetworkObjectActuator.cpp + KX_NetworkObjectSensor.cpp +) + IF(WITH_PYTHON) LIST(APPEND INC ${PYTHON_INC}) ELSE(WITH_PYTHON) diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt index 795e63b47c3..3dde84d29c1 100644 --- a/source/gameengine/Network/CMakeLists.txt +++ b/source/gameengine/Network/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -33,4 +31,10 @@ SET(INC ../../../intern/moto/include ) +SET(SRC + NG_NetworkMessage.cpp + NG_NetworkObject.cpp + NG_NetworkScene.cpp +) + BLENDERLIB(bf_ngnetwork "${SRC}" "${INC}") diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt index e7c34f5a2a0..eae2971ce6a 100644 --- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt +++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC NG_LoopBackNetworkDeviceInterface.cpp) - SET(INC . ../../../../source/kernel/gen_system @@ -33,4 +31,8 @@ SET(INC ../../../../source/gameengine/Network ) +SET(SRC + NG_LoopBackNetworkDeviceInterface.cpp +) + BLENDERLIB(bf_loopbacknetwork "${SRC}" "${INC}") diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt index ba6f3bef0db..faa9385a745 100644 --- a/source/gameengine/Physics/Bullet/CMakeLists.txt +++ b/source/gameengine/Physics/Bullet/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp CcdGraphicController.cpp) - SET(INC . ../common @@ -46,6 +44,12 @@ SET(INC ${PYTHON_INC} ) +SET(SRC + CcdPhysicsEnvironment.cpp + CcdPhysicsController.cpp + CcdGraphicController.cpp +) + IF(WITH_BULLET) ADD_DEFINITIONS(-DUSE_BULLET) ENDIF(WITH_BULLET) diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt index 18330392cd7..501fbcd94de 100644 --- a/source/gameengine/Physics/Dummy/CMakeLists.txt +++ b/source/gameengine/Physics/Dummy/CMakeLists.txt @@ -24,11 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC DummyPhysicsEnvironment.cpp) - SET(INC . ../common ) +SET(SRC + DummyPhysicsEnvironment.cpp +) + BLENDERLIB(bf_dummy "${SRC}" "${INC}") diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt index 0f8f59f3b78..0389280340f 100644 --- a/source/gameengine/Physics/common/CMakeLists.txt +++ b/source/gameengine/Physics/common/CMakeLists.txt @@ -24,12 +24,19 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp PHY_IGraphicController.cpp PHY_IPhysicsEnvironment.cpp PHY_IVehicle.cpp) - SET(INC . ../Dummy ../../../intern/moto/include ) +SET(SRC + PHY_IMotionState.cpp + PHY_IController.cpp + PHY_IPhysicsController.cpp + PHY_IGraphicController.cpp + PHY_IPhysicsEnvironment.cpp + PHY_IVehicle.cpp +) + BLENDERLIB(bf_common "${SRC}" "${INC}") diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt index d718bf3e507..9bbf7e144d5 100644 --- a/source/gameengine/Rasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -40,6 +38,19 @@ SET(INC ${PYTHON_INC} ) +SET(SRC + RAS_2DFilterManager.cpp + RAS_BucketManager.cpp + RAS_FramingManager.cpp + RAS_IPolygonMaterial.cpp + RAS_IRenderTools.cpp + RAS_MaterialBucket.cpp + RAS_MeshObject.cpp + RAS_Polygon.cpp + RAS_TexVert.cpp + RAS_texmatrix.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) BLENDERLIB(bf_rasterizer "${SRC}" "${INC}") diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt index cc48952dc20..a89faae3c73 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC ../../../../source/kernel/gen_system ../../../../intern/string @@ -41,6 +39,13 @@ SET(INC ../../../../source/blender/blenloader ) +SET(SRC + RAS_GLExtensionManager.cpp + RAS_ListRasterizer.cpp + RAS_OpenGLRasterizer.cpp + RAS_VAOpenGLRasterizer.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}") diff --git a/source/gameengine/SceneGraph/CMakeLists.txt b/source/gameengine/SceneGraph/CMakeLists.txt index a73130531c0..d1b207b6efa 100644 --- a/source/gameengine/SceneGraph/CMakeLists.txt +++ b/source/gameengine/SceneGraph/CMakeLists.txt @@ -24,11 +24,18 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../intern/moto/include ) +SET(SRC + SG_BBox.cpp + SG_Controller.cpp + SG_IObject.cpp + SG_Node.cpp + SG_Spatial.cpp + SG_Tree.cpp +) + BLENDERLIB(bf_scenegraph "${SRC}" "${INC}") diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt index 34a32328e29..1c624482d30 100644 --- a/source/gameengine/VideoTexture/CMakeLists.txt +++ b/source/gameengine/VideoTexture/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/gameengine/Ketsji @@ -51,6 +49,25 @@ SET(INC ../../../extern/glew/include ) +SET(SRC + Exception.cpp + FilterBase.cpp + FilterBlueScreen.cpp + FilterColor.cpp + FilterNormal.cpp + FilterSource.cpp + ImageBase.cpp + ImageBuff.cpp + ImageMix.cpp + ImageRender.cpp + ImageViewport.cpp + PyTypeList.cpp + Texture.cpp + VideoBase.cpp + VideoFFmpeg.cpp + blendVideoTex.cpp +) + IF(WITH_FFMPEG) SET(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) diff --git a/source/kernel/CMakeLists.txt b/source/kernel/CMakeLists.txt index 66d14014587..1665a3c1525 100644 --- a/source/kernel/CMakeLists.txt +++ b/source/kernel/CMakeLists.txt @@ -32,7 +32,7 @@ SET(INC ../../source/blender/blenloader ) -FILE(GLOB SRC +SET(SRC gen_messaging/intern/messaging.c gen_system/GEN_HashedPtr.cpp gen_system/GEN_Matrix4x4.cpp |