From bf6e059521771c687d173d28f5d6d75f5716e4fd Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 4 Oct 2016 23:41:29 +0200 Subject: [PATCH] [DEV] Update new lutin 2.2.0 (no legacy support) --- lutin_bullet-physics.py | 13 +++--- lutin_linearmath.py | 91 ++++++++++++++++++++--------------------- 2 files changed, 51 insertions(+), 53 deletions(-) diff --git a/lutin_bullet-physics.py b/lutin_bullet-physics.py index 8fd96da..9958e28 100644 --- a/lutin_bullet-physics.py +++ b/lutin_bullet-physics.py @@ -2,7 +2,7 @@ # -------------------------------------------------------- # -- Bullet librairy # -------------------------------------------------------- -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools import os @@ -28,8 +28,7 @@ def get_maintainer(): def get_version(): return [2,82,"r2704"] -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): my_module.add_depend(['linearmath']) #remove compilation warning (specific for external libs): my_module.remove_compile_warning() @@ -37,9 +36,9 @@ def create(target, module_name): '-Wno-write-strings', '-DHAVE_CONFIG_H', '-O2']) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "bullet-physics/src/"), export=True) - my_module.add_path(tools.get_current_path(__file__), export=True) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "bullet-physics/Extras/ConvexDecomposition")) + my_module.add_path("bullet-physics/src", export=True) + my_module.add_path(".", export=True) + my_module.add_path("bullet-physics/Extras/ConvexDecomposition") # lib BulletCollision my_module.add_src_file([ 'bullet-physics/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp', @@ -201,5 +200,5 @@ def create(target, module_name): 'bullet-physics/Extras/HACD/hacdICHull.cpp', 'bullet-physics/Extras/HACD/hacdManifoldMesh.cpp']) """ - return my_module + return True diff --git a/lutin_linearmath.py b/lutin_linearmath.py index 33b1a9a..a158575 100644 --- a/lutin_linearmath.py +++ b/lutin_linearmath.py @@ -2,7 +2,7 @@ # -------------------------------------------------------- # -- Linear Math librairy # -------------------------------------------------------- -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools import os @@ -28,61 +28,60 @@ def get_maintainer(): def get_version(): return [2,82,"r2704"] -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): #remove compilation warning (specific for external libs): my_module.remove_compile_warning() my_module.add_src_file([ - 'bullet-physics/src/LinearMath/btQuickprof.cpp', - 'bullet-physics/src/LinearMath/btGeometryUtil.cpp', - 'bullet-physics/src/LinearMath/btAlignedAllocator.cpp', - 'bullet-physics/src/LinearMath/btSerializer.cpp', - 'bullet-physics/src/LinearMath/btConvexHull.cpp', - 'bullet-physics/src/LinearMath/btPolarDecomposition.cpp', - 'bullet-physics/src/LinearMath/btVector3.cpp', - 'bullet-physics/src/LinearMath/btConvexHullComputer.cpp' - ]) + 'bullet-physics/src/LinearMath/btQuickprof.cpp', + 'bullet-physics/src/LinearMath/btGeometryUtil.cpp', + 'bullet-physics/src/LinearMath/btAlignedAllocator.cpp', + 'bullet-physics/src/LinearMath/btSerializer.cpp', + 'bullet-physics/src/LinearMath/btConvexHull.cpp', + 'bullet-physics/src/LinearMath/btPolarDecomposition.cpp', + 'bullet-physics/src/LinearMath/btVector3.cpp', + 'bullet-physics/src/LinearMath/btConvexHullComputer.cpp' + ]) my_module.add_flag('c++', [ - '-Wno-write-strings', - '-DHAVE_CONFIG_H', - '-O2']) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "bullet-physics/src")) + '-Wno-write-strings', + '-DHAVE_CONFIG_H', + '-O2']) + my_module.add_path("bullet-physics/src") my_module.add_header_file([ - 'bullet-physics/src/LinearMath/btStackAlloc.h', - 'bullet-physics/src/LinearMath/btAlignedObjectArray.h', - 'bullet-physics/src/LinearMath/btScalar.h', - 'bullet-physics/src/LinearMath/btQuickprof.h', - 'bullet-physics/src/LinearMath/btMatrix3x3.h', - 'bullet-physics/src/LinearMath/btIDebugDraw.h', - 'bullet-physics/src/LinearMath/btPoolAllocator.h', - 'bullet-physics/src/LinearMath/btPolarDecomposition.h', - 'bullet-physics/src/LinearMath/btHashMap.h', - 'bullet-physics/src/LinearMath/btRandom.h', - 'bullet-physics/src/LinearMath/btMatrixX.h', - 'bullet-physics/src/LinearMath/btAabbUtil2.h', - 'bullet-physics/src/LinearMath/btMinMax.h', - 'bullet-physics/src/LinearMath/btDefaultMotionState.h', - 'bullet-physics/src/LinearMath/btVector3.h', - 'bullet-physics/src/LinearMath/btConvexHull.h', - 'bullet-physics/src/LinearMath/btMotionState.h', - 'bullet-physics/src/LinearMath/btAlignedAllocator.h', - 'bullet-physics/src/LinearMath/btTransformUtil.h', - 'bullet-physics/src/LinearMath/btGeometryUtil.h', - 'bullet-physics/src/LinearMath/btQuadWord.h', - 'bullet-physics/src/LinearMath/btQuaternion.h', - 'bullet-physics/src/LinearMath/btList.h', - 'bullet-physics/src/LinearMath/btGrahamScan2dConvexHull.h', - 'bullet-physics/src/LinearMath/btConvexHullComputer.h', - 'bullet-physics/src/LinearMath/btSerializer.h', - 'bullet-physics/src/LinearMath/btTransform.h' - ], - destination_path="LinearMath") + 'bullet-physics/src/LinearMath/btStackAlloc.h', + 'bullet-physics/src/LinearMath/btAlignedObjectArray.h', + 'bullet-physics/src/LinearMath/btScalar.h', + 'bullet-physics/src/LinearMath/btQuickprof.h', + 'bullet-physics/src/LinearMath/btMatrix3x3.h', + 'bullet-physics/src/LinearMath/btIDebugDraw.h', + 'bullet-physics/src/LinearMath/btPoolAllocator.h', + 'bullet-physics/src/LinearMath/btPolarDecomposition.h', + 'bullet-physics/src/LinearMath/btHashMap.h', + 'bullet-physics/src/LinearMath/btRandom.h', + 'bullet-physics/src/LinearMath/btMatrixX.h', + 'bullet-physics/src/LinearMath/btAabbUtil2.h', + 'bullet-physics/src/LinearMath/btMinMax.h', + 'bullet-physics/src/LinearMath/btDefaultMotionState.h', + 'bullet-physics/src/LinearMath/btVector3.h', + 'bullet-physics/src/LinearMath/btConvexHull.h', + 'bullet-physics/src/LinearMath/btMotionState.h', + 'bullet-physics/src/LinearMath/btAlignedAllocator.h', + 'bullet-physics/src/LinearMath/btTransformUtil.h', + 'bullet-physics/src/LinearMath/btGeometryUtil.h', + 'bullet-physics/src/LinearMath/btQuadWord.h', + 'bullet-physics/src/LinearMath/btQuaternion.h', + 'bullet-physics/src/LinearMath/btList.h', + 'bullet-physics/src/LinearMath/btGrahamScan2dConvexHull.h', + 'bullet-physics/src/LinearMath/btConvexHullComputer.h', + 'bullet-physics/src/LinearMath/btSerializer.h', + 'bullet-physics/src/LinearMath/btTransform.h' + ], + destination_path="LinearMath") # depend on the cxx library (need and somes things ...) my_module.add_depend([ 'cxx', 'm' ]) - return my_module + return True