Skip to content

Commit 9c1f153

Browse files
committed
Merge branch 'v3-win10' of github.com:MSOpenTech/cocos2d-x-3rd-party-libs-bin into v3-win10
2 parents 425d6c0 + 100dc9e commit 9c1f153

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+30096
-1
lines changed

json/rapidjson.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
// Detect with architecture macros
210210
# elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
211211
# define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
212-
# elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
212+
# elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__) || defined(_M_ARM)
213213
# define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
214214
# elif defined(RAPIDJSON_DOXYGEN_RUNNING)
215215
# define RAPIDJSON_ENDIAN

recast/Android.mk

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
include $(CLEAR_VARS)
4+
5+
LOCAL_MODULE := recast_static
6+
7+
LOCAL_MODULE_FILENAME := librecast
8+
9+
LOCAL_SRC_FILES := \
10+
DebugUtils/DebugDraw.cpp \
11+
DebugUtils/DetourDebugDraw.cpp \
12+
Detour/DetourAlloc.cpp \
13+
Detour/DetourCommon.cpp \
14+
Detour/DetourNavMesh.cpp \
15+
Detour/DetourNavMeshBuilder.cpp \
16+
Detour/DetourNavMeshQuery.cpp \
17+
Detour/DetourNode.cpp \
18+
DetourCrowd/DetourCrowd.cpp \
19+
DetourCrowd/DetourLocalBoundary.cpp \
20+
DetourCrowd/DetourObstacleAvoidance.cpp \
21+
DetourCrowd/DetourPathCorridor.cpp \
22+
DetourCrowd/DetourPathQueue.cpp \
23+
DetourCrowd/DetourProximityGrid.cpp \
24+
DetourTileCache/DetourTileCache.cpp \
25+
DetourTileCache/DetourTileCacheBuilder.cpp \
26+
fastlz/fastlz.c
27+
28+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
29+
30+
LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
31+
32+
include $(BUILD_STATIC_LIBRARY)

recast/CMakeLists.txt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
set(RECAST_SRC
2+
DebugUtils/DebugDraw.cpp
3+
DebugUtils/DetourDebugDraw.cpp
4+
Detour/DetourAlloc.cpp
5+
Detour/DetourCommon.cpp
6+
Detour/DetourNavMesh.cpp
7+
Detour/DetourNavMeshBuilder.cpp
8+
Detour/DetourNavMeshQuery.cpp
9+
Detour/DetourNode.cpp
10+
DetourCrowd/DetourCrowd.cpp
11+
DetourCrowd/DetourLocalBoundary.cpp
12+
DetourCrowd/DetourObstacleAvoidance.cpp
13+
DetourCrowd/DetourPathCorridor.cpp
14+
DetourCrowd/DetourPathQueue.cpp
15+
DetourCrowd/DetourProximityGrid.cpp
16+
DetourTileCache/DetourTileCache.cpp
17+
DetourTileCache/DetourTileCacheBuilder.cpp
18+
fastlz/fastlz.c
19+
)
20+
21+
include_directories(
22+
..
23+
)
24+
25+
add_library(recast STATIC
26+
${RECAST_SRC}
27+
)
28+
29+
set_target_properties(recast
30+
PROPERTIES
31+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
32+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
33+
)

0 commit comments

Comments
 (0)