[DEV] set bulit linearMath in a sub librairy
This commit is contained in:
parent
0004c7710f
commit
bb3307f736
32
external/bullet/Generic.mk
vendored
32
external/bullet/Generic.mk
vendored
@ -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/
|
||||
|
||||
|
14
external/bullet/file.mk
vendored
14
external/bullet/file.mk
vendored
@ -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 \
|
||||
|
2
external/etk
vendored
2
external/etk
vendored
@ -1 +1 @@
|
||||
Subproject commit 4e1977c17a69724c70d267b569fd3189a4dd2ccd
|
||||
Subproject commit d7d32588c2a77c994f17bd54300ee86f6266b68d
|
@ -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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user