Merge branch 'v3' into v3-winrt-librecast

cocos/2d/CCActionInterval.cpp

@@ -1464,7 +1464,7 @@ JumpTo* JumpTo::clone() const
 {
     // no copy constructor
     auto a = new (std::nothrow) JumpTo();
-    a->initWithDuration(_duration, _delta, _height, _jumps);
+    a->initWithDuration(_duration, _endPosition, _height, _jumps);
     a->autorelease();
     return a;
 }
@@ -1814,6 +1814,7 @@ bool Blink::initWithDuration(float duration, int blinks)
 
 void Blink::stop()
 {
+    if(NULL != _target)
         _target->setVisible(_originalState);
     ActionInterval::stop();
 }

cocos/navmesh/CCNavMesh.cpp

@@ -485,7 +485,6 @@ void cocos2d::NavMesh::findPath(const Vec3 &start, const Vec3 &end, std::vector<
 {
     static const int MAX_POLYS = 256;
     static const int MAX_SMOOTH = 2048;
-    int pathIterNum = 0;
     float ext[3];
     ext[0] = 2; ext[1] = 4; ext[2] = 2;
     dtQueryFilter filter;

cocos/navmesh/CCNavMeshUtils.cpp

@@ -31,7 +31,7 @@
 NS_CC_BEGIN
 
 LinearAllocator::LinearAllocator(const int cap)
-: buffer(0)
+: buffer(nullptr)
 , capacity(0)
 , top(0)
 , high(0)

templates/cpp-template-default/CMakeLists.txt

@@ -111,8 +111,16 @@ include_directories(
   /usr/local/include/GLFW
   /usr/include/GLFW
   ${COCOS2D_ROOT}/cocos
+  ${COCOS2D_ROOT}/cocos/platform
+  ${COCOS2D_ROOT}/cocos/audio/include/
   Classes
 )
+if ( WIN32 )
+  include_directories(
+  ${COCOS2D_ROOT}/external/glfw3/include/win32
+  ${COCOS2D_ROOT}/external/win32-specific/gles/include/OGLES
+)
+endif( WIN32 )
 
 set(GAME_SRC
   Classes/AppDelegate.cpp
@@ -127,9 +135,17 @@ set(GAME_HEADERS
 )
 
 if(GAME_HEADERS)
+  if ( WIN32 )
+    add_executable(${APP_NAME} WIN32 ${GAME_SRC} ${GAME_HEADERS})
+  else()
     add_executable(${APP_NAME} ${GAME_SRC} ${GAME_HEADERS})
+  endif ( WIN32 )
+else()
+  if ( WIN32 )
+    add_executable(${APP_NAME} WIN32 ${GAME_SRC})
   else()
     add_executable(${APP_NAME} ${GAME_SRC})
+  endif ( WIN32 )
 endif()
 
 target_link_libraries(${APP_NAME} cocos2d)