minggo 995c2a2f02 fix conflict

2022-01-04 15:36:26 +08:00

..

acl

adapt latest device layer (#129)

2021-02-04 15:08:04 +08:00

boost

update boost & add container lib (#204)

2021-12-16 11:57:40 +08:00

boost-source

update boost & add container lib (#204)

2021-12-16 11:57:40 +08:00

concurrentqueue

adapt latest device layer (#129)

2021-02-04 15:08:04 +08:00

ConvertUTF

external use cmake (#75)

2019-12-25 14:10:32 +08:00

edtaa3func

external use cmake (#75)

2019-12-25 14:10:32 +08:00

EGL/EGL

Update infomations (#177)

2021-08-12 14:41:06 +08:00

enoki

enoki headers (#140)

2021-03-29 18:18:43 +08:00

glslang

unified glslang (#165)

2021-07-30 14:46:37 +08:00

jemalloc

Add 3d libs

2019-12-20 14:28:53 +08:00

json

Update rapidjson

2017-01-10 11:43:11 +08:00

khronos

Update infomations (#177)

2021-08-12 14:41:06 +08:00

MurmurHash2

Add MurmurHash2.h/.cpp

2021-08-25 16:26:37 +08:00

nedmalloc

Add 3d libs

2019-12-20 14:28:53 +08:00

PhysX

native physx (#143)

2021-04-16 10:23:52 +08:00

pvmp3dec

skip change header file of pvmp3dec

2021-12-08 09:36:41 +08:00

rapidjson

Add rapidjson v1.1.0 source code. (#181)

2021-08-21 11:29:26 +08:00

rtm

adapt latest device layer (#129)

2021-02-04 15:08:04 +08:00

SocketRocket

enoki headers (#140)

2021-03-29 18:18:43 +08:00

taskflow

adapt latest device layer (#129)

2021-02-04 15:08:04 +08:00

tbb

adapt latest device layer (#129)

2021-02-04 15:08:04 +08:00

tinydir

Add tinydir 1.2.1 for FileUtils::listFiles

2017-01-13 10:25:30 +08:00

tinyxml2

Update tinyxml2.h

2020-08-27 16:46:55 +08:00

tommyds

Add 3d libs

2019-12-20 14:28:53 +08:00

tremolo

remove google-breakpad

2020-05-25 11:42:24 +08:00

unzip

Upgrade minizip to 1.2.0(sync cocos2d-x) (#150)

2021-07-01 16:15:45 +08:00

xxhash

cocos 2d lite external

2016-03-29 23:27:43 +08:00

xxtea

3dgfx add cmake & remove spidermonkey glfw (#82)

2020-04-02 13:43:14 +08:00

CMakeLists.txt

fix conflict

2022-01-04 15:36:26 +08:00