Merge branch 'v3_pipu' of https://github.com/pipu/cocos2d-x into v3_pipu

cocos/2d/libcocos2d.vcxproj.filters

@@ -214,19 +214,13 @@
     <Filter Include="audioengine">
       <UniqueIdentifier>{e916e2b4-0a6e-4d25-8b36-66fa03719f48}</UniqueIdentifier>
     </Filter>
-    <Filter Include="external\protocolBuf">
+    <Filter Include="cocostudio\json\protocolBuf">
       <UniqueIdentifier>{cca5b284-43d5-4f19-8a3f-41011ca8fb78}</UniqueIdentifier>
     </Filter>
-    <Filter Include="external\protocolBuf\google">
+    <Filter Include="cocostudio\json\protocolBuf\io">
-      <UniqueIdentifier>{4055fd20-df3e-469e-8e5f-e49635ecaa6d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="external\protocolBuf\google\protobuf">
-      <UniqueIdentifier>{82563e1e-6992-468c-a38a-e53081557cda}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="external\protocolBuf\google\protobuf\io">
       <UniqueIdentifier>{95d0a465-a443-4974-ac90-ca1a46cd3066}</UniqueIdentifier>
     </Filter>
-    <Filter Include="external\protocolBuf\google\protobuf\stubs">
+    <Filter Include="cocostudio\json\protocolBuf\stubs">
       <UniqueIdentifier>{65b452e4-00df-4ab1-803a-af3fb369edc4}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -1206,46 +1200,31 @@
     </ClCompile>
     <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.cpp" />
     <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\io\coded_stream.cc">
-      <Filter>external\protocolBuf\google\protobuf\io</Filter>
+      <Filter>cocostudio\json\protocolBuf\io</Filter>
     </ClCompile>
     <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\io\zero_copy_stream.cc">
-      <Filter>external\protocolBuf\google\protobuf\io</Filter>
+      <Filter>cocostudio\json\protocolBuf\io</Filter>
     </ClCompile>
     <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\io\zero_copy_stream_impl.cc">
-      <Filter>external\protocolBuf\google\protobuf\io</Filter>
+      <Filter>cocostudio\json\protocolBuf\io</Filter>
     </ClCompile>
     <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\io\zero_copy_stream_impl_lite.cc">
-      <Filter>external\protocolBuf\google\protobuf\io</Filter>
+      <Filter>cocostudio\json\protocolBuf\io</Filter>
     </ClCompile>
     <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_x86_gcc.cc">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClCompile>
     <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClCompile>
     <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\stubs\common.cc">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClCompile>
     <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\stubs\once.cc">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClCompile>
     <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\stubs\stringprintf.cc">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\extension_set.cc">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\generated_message_util.cc">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\message_lite.cc">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\repeated_field.cc">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\wire_format_lite.cc">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
     </ClCompile>
     <ClCompile Include="..\editor-support\cocostudio\CSParseBinary.pb.cc">
       <Filter>cocostudio\json</Filter>
@@ -1256,6 +1235,21 @@
     <ClCompile Include="..\ui\UILayoutComponent.cpp">
       <Filter>ui\Layouts</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\extension_set.cc">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\generated_message_util.cc">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\message_lite.cc">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\repeated_field.cc">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\external\protocolBuf\src\google\protobuf\wire_format_lite.cc">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\physics\CCPhysicsBody.h">
@@ -2407,91 +2401,73 @@
     </ClInclude>
     <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.h" />
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\io\coded_stream.h">
-      <Filter>external\protocolBuf\google\protobuf\io</Filter>
+      <Filter>cocostudio\json\protocolBuf\io</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\io\coded_stream_inl.h">
-      <Filter>external\protocolBuf\google\protobuf\io</Filter>
+      <Filter>cocostudio\json\protocolBuf\io</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\io\zero_copy_stream.h">
-      <Filter>external\protocolBuf\google\protobuf\io</Filter>
+      <Filter>cocostudio\json\protocolBuf\io</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\io\zero_copy_stream_impl.h">
-      <Filter>external\protocolBuf\google\protobuf\io</Filter>
+      <Filter>cocostudio\json\protocolBuf\io</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\io\zero_copy_stream_impl_lite.h">
-      <Filter>external\protocolBuf\google\protobuf\io</Filter>
+      <Filter>cocostudio\json\protocolBuf\io</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_arm_gcc.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_arm_qnx.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_atomicword_compat.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_macosx.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_mips_gcc.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_pnacl.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_x86_gcc.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\atomicops_internals_x86_msvc.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\common.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\hash.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\map-util.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\once.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\platform_macros.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\stl_util.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\stringprintf.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\template_util.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\stubs\type_traits.h">
-      <Filter>external\protocolBuf\google\protobuf\stubs</Filter>
+      <Filter>cocostudio\json\protocolBuf\stubs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\extension_set.h">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\generated_message_util.h">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\message_lite.h">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\repeated_field.h">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\wire_format_lite.h">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\wire_format_lite_inl.h">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
     </ClInclude>
     <ClInclude Include="..\editor-support\cocostudio\CSParseBinary.pb.h">
       <Filter>cocostudio\json</Filter>
@@ -2503,7 +2479,25 @@
       <Filter>ui\Layouts</Filter>
     </ClInclude>
     <ClInclude Include="..\..\external\protocolBuf\win32\config.h">
-      <Filter>external\protocolBuf\google\protobuf</Filter>
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\extension_set.h">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\generated_message_util.h">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\message_lite.h">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\repeated_field.h">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\wire_format_lite.h">
+      <Filter>cocostudio\json\protocolBuf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\external\protocolBuf\src\google\protobuf\wire_format_lite_inl.h">
+      <Filter>cocostudio\json\protocolBuf</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>