Commit c6415ee

committed

Merge branch 'v3' of https://github.com/super626/cocos2d-x-3rd-party-libs-bin into v3

Conflicts: bullet/vectormath/sse/vec_aos.h

2 parents 7ca9550 + ab82d8f commit c6415eeCopy full SHA for c6415ee

2,392 files changed

+404339

-415222

lines changed

Box2D/proj.wp8
- Box2D.vcxproj.filters
- Box2D.vcxproj
bullet
- BulletCollision/CollisionShapes
  - btConvexHullShape.cpp
  - btConvexHullShape.h
- LinearMath
  - btScalar.h
- vectormath/sse
  - vec_aos.h
chipmunk
- include/chipmunk
- prebuilt
  - android
    - Android.mk
    - armeabi-v7a
      - libchipmunk.a
    - armeabi
      - libchipmunk.a
    - x86
      - libchipmunk.a
  - ios
    - libchipmunk.a
  - linux
    - 32-bit
      - libchipmunk.a
    - 64-bit
      - libchipmunk.a
  - mac
    - libchipmunk.a
  - win32
    - debug-lib
      - libchipmunk.lib
    - release-lib
      - libchipmunk.lib
  - winrt_8.1
    - arm
      - chipmunk.lib
      - libchipmunk.lib
    - win32
      - chipmunk.lib
      - libchipmunk.lib
  - wp8
    - ARM
      - libchipmunk.lib
    - win32
      - libchipmunk.lib
  - wp_8.1
    - arm
      - chipmunk.lib
      - libchipmunk.lib
    - win32
      - chipmunk.lib
      - libchipmunk.lib
curl
- include
  - android/curl
  - ios/curl
  - mac/curl
  - win32/curl
    - curl.h
    - curlver.h
  - winrt_8.1/curl
  - wp8/curl
  - wp_8.1/curl
- prebuilt
  - android
    - armeabi-v7a
    - armeabi
    - x86
  - ios
  - mac
  - win32
  - winrt_8.1
    - arm
    - win32
  - wp8
    - arm
    - win32
  - wp_8.1
    - arm
    - win32
fbx-conv
- mac
  - fbx-conv
- win
  - fbx-conv.exe
freetype2
- include
- prebuilt
  - android
    - Android.mk
    - armeabi-v7a
      - libfreetype.a
    - armeabi
      - libfreetype.a
    - x86
      - libfreetype.a
  - ios
    - libfreetype.a
  - linux/64-bit
    - libfreetype.a
  - mac
    - libfreetype.a
  - win32
    - freetype250.lib
  - winrt_8.1
    - arm
      - freetype.lib
      - freetype250.lib
    - win32
      - freetype.lib
      - freetype250.lib
  - winrt
    - ARM
      - freetype.lib
    - Win32
      - freetype.lib
  - wp8
    - ARM
      - freetype.lib
    - Win32
      - freetype.lib
  - wp_8.1
    - arm
      - freetype.lib
      - freetype250.lib
    - win32
      - freetype.lib
      - freetype250.lib
jpeg
- include
- prebuilt
  - winrt_8.1
    - arm
      - libjpeg.lib
    - win32
      - libjpeg.lib
  - winrt
    - ARM
      - libjpeg.lib
    - Win32
      - libjpeg.lib
  - wp8
    - ARM
      - libjpeg.lib
    - Win32
      - libjpeg.lib
  - wp_8.1
    - arm
      - libjpeg.lib
    - win32
      - libjpeg.lib
lua
- luajit
- quick
png
- include
  - android
  - ios
  - mac
  - win32
  - winrt_8.1
  - winrt
  - wp8
  - wp_8.1
- prebuilt
  - android
    - armeabi-v7a
      - libpng.a
    - armeabi
      - libpng.a
    - x86
      - libpng.a
  - ios
    - libpng.a
  - mac
    - libpng.a
  - win32
    - libpng.lib
  - winrt_8.1
    - arm
      - libpng.lib
    - win32
      - libpng.lib
  - winrt
    - ARM
      - libpng.lib
    - Win32
      - libpng.lib
  - wp8
    - ARM
      - libpng.lib
    - Win32
      - libpng.lib
  - wp_8.1
    - arm
      - libpng.lib
    - win32
      - libpng.lib
poly2tri
- common
- poly2tri.h
- sweep
spidermonkey
sqlite3/libraries/wp8
- arm
  - sqlite3.dll
  - sqlite3.lib
- win32
  - sqlite3.dll
  - sqlite3.lib
tiff
- include
  - winrt_8.1
  - winrt
  - wp8
  - wp_8.1
- prebuilt
  - winrt_8.1
    - arm
      - libtiff.lib
    - win32
      - libtiff.lib
  - winrt
    - ARM
      - libtiff.lib
    - Win32
      - libtiff.lib
  - wp8
    - ARM
      - libtiff.lib
    - Win32
      - libtiff.lib
  - wp_8.1
    - arm
      - libtiff.lib
    - win32
      - libtiff.lib
version.json
websockets
- include/wp8
  - libwebsockets.h
  - lws_config.h
  - private-libwebsockets.h
  - win32helpers
    - getopt.h
    - gettimeofday.h
- prebuilt/wp8
  - arm
    - libwebsockets.dll
    - libwebsockets.lib
  - win32
    - libwebsockets.dll
    - libwebsockets.lib
winrt_8.1-specific/angle
- include
  - EGL
    - eglext.h
  - platform
    - Platform.h
- prebuilt
  - arm
  - win32
wp8-specific
- angle
  - include
    - EGL
    - GLES2
    - GLSLANG
      - ShaderLang.h
    - KHR
      - khrplatform.h
    - esUtil.h
    - winrtangle.h
  - prebuilt
    - ARM
    - Win32
- zlib
  - include
  - prebuilt
    - ARM
      - zlib.lib
    - Win32
      - zlib.lib
wp_8.1-specific/angle
- include
  - EGL
    - eglext.h
  - platform
    - Platform.h
- prebuilt
  - arm
  - win32
zlib
- include
  - zconf.h
  - zlib.h
- prebuilt
  - android
    - Android.mk
    - armeabi-v7a
      - libz.a
    - armeabi
      - libz.a
    - x86
      - libz.a
  - mac
    - libz.a

2,392 files changed

+404339

-415222

lines changed

`‎Box2D/proj.wp8/Box2D.vcxproj`

This file was deleted.

Comments

(0)