From 9e4b987ffaa3799a7b37351dcb347f455f4bc288 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 18 Apr 2013 01:55:05 +0200 Subject: [PATCH] [BUILD] basic makefile for python maker --- build | 2 +- external/agg | 2 +- external/bullet/Makefile_bullet.py | 188 ++++++++++++++++++++ external/bullet/Makefile_linearmath.py | 34 ++++ external/etk | 2 +- external/freetype | 2 +- external/lua | 2 +- external/parsersvg | 2 +- external/png | 2 +- external/tinyxml | 2 +- external/z/Makefile_z.py | 9 + external/zip | 2 +- sources/{ewol_Linux.py => Makefile_ewol.py} | 9 +- 13 files changed, 245 insertions(+), 13 deletions(-) create mode 100644 external/bullet/Makefile_bullet.py create mode 100644 external/bullet/Makefile_linearmath.py create mode 100644 external/z/Makefile_z.py rename sources/{ewol_Linux.py => Makefile_ewol.py} (96%) diff --git a/build b/build index 38753834..9e4b2ff8 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 38753834f928f7ff520f281d59812b6cf0d80ed0 +Subproject commit 9e4b2ff89557761d2b39dd4781c69fe226131309 diff --git a/external/agg b/external/agg index bf7295f4..432d7f74 160000 --- a/external/agg +++ b/external/agg @@ -1 +1 @@ -Subproject commit bf7295f49b5675bd960b75d98b738c34eaebc7e4 +Subproject commit 432d7f7422d43b747f912c6e94528bfdfbbcc7aa diff --git a/external/bullet/Makefile_bullet.py b/external/bullet/Makefile_bullet.py new file mode 100644 index 00000000..d6e834a4 --- /dev/null +++ b/external/bullet/Makefile_bullet.py @@ -0,0 +1,188 @@ +#!/usr/bin/python +# -------------------------------------------------------- +# -- Bullet librairy +# -------------------------------------------------------- +import module +import buildTools + +myModule = module.module(__file__, 'bullet', 'LIBRARY') + +myModule.AddModuleDepend(['linearmath']) + +myModule.CompileFlags_CC([ + '-Wno-write-strings', + '-DHAVE_CONFIG_H', + '-O2']) + +myModule.AddExportPath(buildTools.GetCurrentPath(__file__)+"/bullet/src/") +myModule.AddExportPath(buildTools.GetCurrentPath(__file__)) +myModule.AddPath(buildTools.GetCurrentPath(__file__)+"/bullet/Extras/ConvexDecomposition") + +# lib BulletCollision +myModule.AddSrcFile([ + 'bullet/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp', + 'bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btGhostObject.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btUnionFind.cpp', + 'bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btShapeHull.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btCompoundShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btConeShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btSphereShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btEmptyShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btCollisionShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btConvexShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btConcaveShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btBoxShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btBox2dShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btCylinderShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp', + 'bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btDbvt.cpp', + 'bullet/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp', + 'bullet/src/BulletCollision/Gimpact/btGImpactBvh.cpp', + 'bullet/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp', + 'bullet/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp', + 'bullet/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp', + 'bullet/src/BulletCollision/Gimpact/btGImpactShape.cpp', + 'bullet/src/BulletCollision/Gimpact/gim_box_set.cpp', + 'bullet/src/BulletCollision/Gimpact/gim_contact.cpp', + 'bullet/src/BulletCollision/Gimpact/gim_memory.cpp', + 'bullet/src/BulletCollision/Gimpact/gim_tri_collision.cpp']) + + + + + +# lib BulletDynamics +myModule.AddSrcFile([ + 'bullet/src/BulletDynamics/Dynamics/btRigidBody.cpp', + 'bullet/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp', + 'bullet/src/BulletDynamics/Dynamics/Bullet-C-API.cpp', + 'bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp', + 'bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp', + 'bullet/src/BulletDynamics/Vehicle/btWheelInfo.cpp', + 'bullet/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp', + 'bullet/src/BulletDynamics/Character/btKinematicCharacterController.cpp']) + + +# lib BulletSoftBody +myModule.AddSrcFile([ + 'bullet/src/BulletSoftBody/btDefaultSoftBodySolver.cpp', + 'bullet/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp', + 'bullet/src/BulletSoftBody/btSoftBody.cpp', + 'bullet/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp', + 'bullet/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp', + 'bullet/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp', + 'bullet/src/BulletSoftBody/btSoftBodyHelpers.cpp', + 'bullet/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp']) + +# lib gimpactutils +myModule.AddSrcFile([ + 'bullet/Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.cpp']) + +""" +# lib convexdecomposition +myModule.AddSrcFile([ + 'bullet/Extras/ConvexDecomposition/concavity.cpp', + 'bullet/Extras/ConvexDecomposition/ConvexDecomposition.cpp', + 'bullet/Extras/ConvexDecomposition/vlookup.cpp', + 'bullet/Extras/ConvexDecomposition/bestfit.cpp', + 'bullet/Extras/ConvexDecomposition/ConvexBuilder.cpp', + 'bullet/Extras/ConvexDecomposition/cd_hull.cpp', + 'bullet/Extras/ConvexDecomposition/raytri.cpp', + 'bullet/Extras/ConvexDecomposition/splitplane.cpp', + 'bullet/Extras/ConvexDecomposition/float_math.cpp', + 'bullet/Extras/ConvexDecomposition/planetri.cpp', + 'bullet/Extras/ConvexDecomposition/cd_wavefront.cpp', + 'bullet/Extras/ConvexDecomposition/bestfitobb.cpp', + 'bullet/Extras/ConvexDecomposition/meshvolume.cpp', + 'bullet/Extras/ConvexDecomposition/fitsphere.cpp']) +""" + +""" +# lib HACD +myModule.AddSrcFile([ + 'bullet/Extras/HACD/hacdGraph.cpp', + 'bullet/Extras/HACD/hacdHACD.cpp', + 'bullet/Extras/HACD/hacdICHull.cpp', + 'bullet/Extras/HACD/hacdManifoldMesh.cpp']) +""" + +# add the currrent module at the +module.AddModule(myModule) + + diff --git a/external/bullet/Makefile_linearmath.py b/external/bullet/Makefile_linearmath.py new file mode 100644 index 00000000..66afe395 --- /dev/null +++ b/external/bullet/Makefile_linearmath.py @@ -0,0 +1,34 @@ +#!/usr/bin/python +# -------------------------------------------------------- +# -- Linear Math librairy +# -------------------------------------------------------- +import module +import buildTools + +myModule = module.module(__file__, 'linearmath', 'LIBRARY') + +myModule.AddSrcFile([ + 'bullet/src/LinearMath/btQuickprof.cpp', + 'bullet/src/LinearMath/btGeometryUtil.cpp', + 'bullet/src/LinearMath/btAlignedAllocator.cpp', + 'bullet/src/LinearMath/btSerializer.cpp', + 'bullet/src/LinearMath/btConvexHull.cpp', + 'bullet/src/LinearMath/btPolarDecomposition.cpp', + 'bullet/src/LinearMath/btVector3.cpp', + 'bullet/src/LinearMath/btConvexHullComputer.cpp']) + +myModule.CompileFlags_CC([ + '-Wno-write-strings', + '-DHAVE_CONFIG_H', + '-O2']) + +myModule.AddExportPath(buildTools.GetCurrentPath(__file__)+"/bullet/src/") + +# add the currrent module at the +module.AddModule(myModule) + + + + + + diff --git a/external/etk b/external/etk index 0f6a9a50..10502962 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 0f6a9a502ed69aeb88fb49808d60d904c0c5f683 +Subproject commit 105029620e408192a514b10278d34c05396350c5 diff --git a/external/freetype b/external/freetype index 7e7434f1..17237771 160000 --- a/external/freetype +++ b/external/freetype @@ -1 +1 @@ -Subproject commit 7e7434f1ed0816e0a7811ea5cebb808d3ad35264 +Subproject commit 17237771d525fc3c8a79c0f6c719ecc41c1d259f diff --git a/external/lua b/external/lua index 871233ac..83657ba9 160000 --- a/external/lua +++ b/external/lua @@ -1 +1 @@ -Subproject commit 871233acc6e0d578b5aaedca8f5dc82c7d2132e2 +Subproject commit 83657ba925522244b65b99fbc7281123a99d2e27 diff --git a/external/parsersvg b/external/parsersvg index 928deb22..26375523 160000 --- a/external/parsersvg +++ b/external/parsersvg @@ -1 +1 @@ -Subproject commit 928deb22eeec43ee683f331c33547845f6304d1f +Subproject commit 26375523d5dcf4137588f57bd950162b9ffda56c diff --git a/external/png b/external/png index 29ed7179..5494f9db 160000 --- a/external/png +++ b/external/png @@ -1 +1 @@ -Subproject commit 29ed717922c583f058908cfabf9afa142c542b92 +Subproject commit 5494f9db01f8471cc69f617e380a57b9562a69d5 diff --git a/external/tinyxml b/external/tinyxml index 296634cf..26006265 160000 --- a/external/tinyxml +++ b/external/tinyxml @@ -1 +1 @@ -Subproject commit 296634cfe883f1dd3ecc0d1905add999c44e872d +Subproject commit 260062656ed7bfe9877b0a130420685342eb96dc diff --git a/external/z/Makefile_z.py b/external/z/Makefile_z.py new file mode 100644 index 00000000..dc7aa624 --- /dev/null +++ b/external/z/Makefile_z.py @@ -0,0 +1,9 @@ +#!/usr/bin/python +import module + +myModule = module.module(__file__, 'zlib', 'LIBRARY') + +myModule.AddExportflag_LD('-lz') + +# add the currrent module at the +module.AddModule(myModule) \ No newline at end of file diff --git a/external/zip b/external/zip index bc39bbab..f4d6ad96 160000 --- a/external/zip +++ b/external/zip @@ -1 +1 @@ -Subproject commit bc39bbab0164b41379e7c1104bcda5a894b45db1 +Subproject commit f4d6ad96a2a58bd17d51f3f2136335c4934e9c5e diff --git a/sources/ewol_Linux.py b/sources/Makefile_ewol.py similarity index 96% rename from sources/ewol_Linux.py rename to sources/Makefile_ewol.py index 7bb9c212..fc7266c2 100755 --- a/sources/ewol_Linux.py +++ b/sources/Makefile_ewol.py @@ -1,11 +1,12 @@ #!/usr/bin/python -import make +import module +import buildTools # prevent erro integration #del myModule # module name is 'edn' and type binary. -myModule = make.module(__file__, 'ewol', 'LIBRARY') +myModule = module.module(__file__, 'ewol', 'LIBRARY') # add the file to compile: myModule.AddSrcFile([ 'ewol/ewol.cpp', @@ -137,7 +138,7 @@ myModule.AddModuleDepend(['etk', 'freetype', 'tinyxml', 'libpng', 'parsersvg']) #myModule.AddModuleDepend('portaudio') #endif -myModule.AddExportPath(make.GetCurrentPath(__file__)) +myModule.AddExportPath(buildTools.GetCurrentPath(__file__)) myModule.AddExportflag_LD('-lGL') #`pkg-config --cflags directfb` `pkg-config --libs directfb` @@ -172,4 +173,4 @@ myModule.AddSrcFile('ewol/renderer/os/gui.X11.cpp') # add the currrent module at the -make.AddModule(myModule) +module.AddModule(myModule)