[DEV] Update new lutin 2.2.0 (no legacy support)

This commit is contained in:
Edouard DUPIN 2016-10-04 23:41:29 +02:00
parent 4b4aad9046
commit bf6e059521
2 changed files with 51 additions and 53 deletions

View File

@ -2,7 +2,7 @@
# -------------------------------------------------------- # --------------------------------------------------------
# -- Bullet librairy # -- Bullet librairy
# -------------------------------------------------------- # --------------------------------------------------------
import lutin.module as module import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
import os import os
@ -28,8 +28,7 @@ def get_maintainer():
def get_version(): def get_version():
return [2,82,"r2704"] return [2,82,"r2704"]
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_depend(['linearmath']) my_module.add_depend(['linearmath'])
#remove compilation warning (specific for external libs): #remove compilation warning (specific for external libs):
my_module.remove_compile_warning() my_module.remove_compile_warning()
@ -37,9 +36,9 @@ def create(target, module_name):
'-Wno-write-strings', '-Wno-write-strings',
'-DHAVE_CONFIG_H', '-DHAVE_CONFIG_H',
'-O2']) '-O2'])
my_module.add_path(os.path.join(tools.get_current_path(__file__), "bullet-physics/src/"), export=True) my_module.add_path("bullet-physics/src", export=True)
my_module.add_path(tools.get_current_path(__file__), export=True) my_module.add_path(".", export=True)
my_module.add_path(os.path.join(tools.get_current_path(__file__), "bullet-physics/Extras/ConvexDecomposition")) my_module.add_path("bullet-physics/Extras/ConvexDecomposition")
# lib BulletCollision # lib BulletCollision
my_module.add_src_file([ my_module.add_src_file([
'bullet-physics/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp', '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/hacdICHull.cpp',
'bullet-physics/Extras/HACD/hacdManifoldMesh.cpp']) 'bullet-physics/Extras/HACD/hacdManifoldMesh.cpp'])
""" """
return my_module return True

View File

@ -2,7 +2,7 @@
# -------------------------------------------------------- # --------------------------------------------------------
# -- Linear Math librairy # -- Linear Math librairy
# -------------------------------------------------------- # --------------------------------------------------------
import lutin.module as module import lutin.debug as debug
import lutin.tools as tools import lutin.tools as tools
import os import os
@ -28,61 +28,60 @@ def get_maintainer():
def get_version(): def get_version():
return [2,82,"r2704"] return [2,82,"r2704"]
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
#remove compilation warning (specific for external libs): #remove compilation warning (specific for external libs):
my_module.remove_compile_warning() my_module.remove_compile_warning()
my_module.add_src_file([ my_module.add_src_file([
'bullet-physics/src/LinearMath/btQuickprof.cpp', 'bullet-physics/src/LinearMath/btQuickprof.cpp',
'bullet-physics/src/LinearMath/btGeometryUtil.cpp', 'bullet-physics/src/LinearMath/btGeometryUtil.cpp',
'bullet-physics/src/LinearMath/btAlignedAllocator.cpp', 'bullet-physics/src/LinearMath/btAlignedAllocator.cpp',
'bullet-physics/src/LinearMath/btSerializer.cpp', 'bullet-physics/src/LinearMath/btSerializer.cpp',
'bullet-physics/src/LinearMath/btConvexHull.cpp', 'bullet-physics/src/LinearMath/btConvexHull.cpp',
'bullet-physics/src/LinearMath/btPolarDecomposition.cpp', 'bullet-physics/src/LinearMath/btPolarDecomposition.cpp',
'bullet-physics/src/LinearMath/btVector3.cpp', 'bullet-physics/src/LinearMath/btVector3.cpp',
'bullet-physics/src/LinearMath/btConvexHullComputer.cpp' 'bullet-physics/src/LinearMath/btConvexHullComputer.cpp'
]) ])
my_module.add_flag('c++', [ my_module.add_flag('c++', [
'-Wno-write-strings', '-Wno-write-strings',
'-DHAVE_CONFIG_H', '-DHAVE_CONFIG_H',
'-O2']) '-O2'])
my_module.add_path(os.path.join(tools.get_current_path(__file__), "bullet-physics/src")) my_module.add_path("bullet-physics/src")
my_module.add_header_file([ my_module.add_header_file([
'bullet-physics/src/LinearMath/btStackAlloc.h', 'bullet-physics/src/LinearMath/btStackAlloc.h',
'bullet-physics/src/LinearMath/btAlignedObjectArray.h', 'bullet-physics/src/LinearMath/btAlignedObjectArray.h',
'bullet-physics/src/LinearMath/btScalar.h', 'bullet-physics/src/LinearMath/btScalar.h',
'bullet-physics/src/LinearMath/btQuickprof.h', 'bullet-physics/src/LinearMath/btQuickprof.h',
'bullet-physics/src/LinearMath/btMatrix3x3.h', 'bullet-physics/src/LinearMath/btMatrix3x3.h',
'bullet-physics/src/LinearMath/btIDebugDraw.h', 'bullet-physics/src/LinearMath/btIDebugDraw.h',
'bullet-physics/src/LinearMath/btPoolAllocator.h', 'bullet-physics/src/LinearMath/btPoolAllocator.h',
'bullet-physics/src/LinearMath/btPolarDecomposition.h', 'bullet-physics/src/LinearMath/btPolarDecomposition.h',
'bullet-physics/src/LinearMath/btHashMap.h', 'bullet-physics/src/LinearMath/btHashMap.h',
'bullet-physics/src/LinearMath/btRandom.h', 'bullet-physics/src/LinearMath/btRandom.h',
'bullet-physics/src/LinearMath/btMatrixX.h', 'bullet-physics/src/LinearMath/btMatrixX.h',
'bullet-physics/src/LinearMath/btAabbUtil2.h', 'bullet-physics/src/LinearMath/btAabbUtil2.h',
'bullet-physics/src/LinearMath/btMinMax.h', 'bullet-physics/src/LinearMath/btMinMax.h',
'bullet-physics/src/LinearMath/btDefaultMotionState.h', 'bullet-physics/src/LinearMath/btDefaultMotionState.h',
'bullet-physics/src/LinearMath/btVector3.h', 'bullet-physics/src/LinearMath/btVector3.h',
'bullet-physics/src/LinearMath/btConvexHull.h', 'bullet-physics/src/LinearMath/btConvexHull.h',
'bullet-physics/src/LinearMath/btMotionState.h', 'bullet-physics/src/LinearMath/btMotionState.h',
'bullet-physics/src/LinearMath/btAlignedAllocator.h', 'bullet-physics/src/LinearMath/btAlignedAllocator.h',
'bullet-physics/src/LinearMath/btTransformUtil.h', 'bullet-physics/src/LinearMath/btTransformUtil.h',
'bullet-physics/src/LinearMath/btGeometryUtil.h', 'bullet-physics/src/LinearMath/btGeometryUtil.h',
'bullet-physics/src/LinearMath/btQuadWord.h', 'bullet-physics/src/LinearMath/btQuadWord.h',
'bullet-physics/src/LinearMath/btQuaternion.h', 'bullet-physics/src/LinearMath/btQuaternion.h',
'bullet-physics/src/LinearMath/btList.h', 'bullet-physics/src/LinearMath/btList.h',
'bullet-physics/src/LinearMath/btGrahamScan2dConvexHull.h', 'bullet-physics/src/LinearMath/btGrahamScan2dConvexHull.h',
'bullet-physics/src/LinearMath/btConvexHullComputer.h', 'bullet-physics/src/LinearMath/btConvexHullComputer.h',
'bullet-physics/src/LinearMath/btSerializer.h', 'bullet-physics/src/LinearMath/btSerializer.h',
'bullet-physics/src/LinearMath/btTransform.h' 'bullet-physics/src/LinearMath/btTransform.h'
], ],
destination_path="LinearMath") destination_path="LinearMath")
# depend on the cxx library (need <new> and somes things ...) # depend on the cxx library (need <new> and somes things ...)
my_module.add_depend([ my_module.add_depend([
'cxx', 'cxx',
'm' 'm'
]) ])
return my_module return True