From bb3307f736b037f05627bad52fa0e3592b5add6e Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 23 Jan 2013 22:01:41 +0100 Subject: [PATCH] [DEV] set bulit linearMath in a sub librairy --- external/bullet/Generic.mk | 32 ++++++++++++++++++++++ external/bullet/file.mk | 14 +--------- external/etk | 2 +- sources/ewol/renderer/resources/Resource.h | 5 ++++ 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/external/bullet/Generic.mk b/external/bullet/Generic.mk index 32b251c3..de82b157 100644 --- a/external/bullet/Generic.mk +++ b/external/bullet/Generic.mk @@ -1,9 +1,41 @@ + +# -------------------------------------------------------- +# -- Linear Math librairy +# -------------------------------------------------------- LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_MODULE := linearmath + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/bullet/src/ + +LOCAL_CFLAGS := -Wno-write-strings \ + -DHAVE_CONFIG_H \ + -O2 + +LOCAL_SRC_FILES := \ + 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 + +include $(BUILD_STATIC_LIBRARY) + + +# -------------------------------------------------------- +# -- Bullet librairy +# -------------------------------------------------------- +include $(CLEAR_VARS) + LOCAL_MODULE := bullet +LOCAL_LIBRARIES := linearmath + LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/bullet/src/ diff --git a/external/bullet/file.mk b/external/bullet/file.mk index 30a321bb..e18f7844 100644 --- a/external/bullet/file.mk +++ b/external/bullet/file.mk @@ -1,18 +1,6 @@ - -# lib LinearMath -FILE_LIST = \ - 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 - # lib BulletCollision -FILE_LIST+= \ +FILE_LIST:= \ bullet/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp \ bullet/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp \ bullet/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp \ diff --git a/external/etk b/external/etk index 4e1977c1..d7d32588 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 4e1977c17a69724c70d267b569fd3189a4dd2ccd +Subproject commit d7d32588c2a77c994f17bd54300ee86f6266b68d diff --git a/sources/ewol/renderer/resources/Resource.h b/sources/ewol/renderer/resources/Resource.h index dedc4565..9c6fad70 100644 --- a/sources/ewol/renderer/resources/Resource.h +++ b/sources/ewol/renderer/resources/Resource.h @@ -20,6 +20,11 @@ namespace ewol { // class resources is pure virtual class Resource { + /* + public: + void* operator new(size_t elmeentSize); + void operator delete(void* elementPointer); + */ private: static uint32_t valBase; protected: