Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VS and XCode project files have non-existent file references (#17512) 

* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file

* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.

* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.

* Changed extension of CCStencilStateManager.hpp to .h
This commit is contained in:
rh101 2017-03-16 16:54:50 +11:00 committed by minggo
parent 68fc0dbfa9
commit 27935acd64
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -6276,7 +6276,8 @@
29E99D1D1957BA7000046604 /* CocoLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoLoader.h; sourceTree = "<group>"; };
373B910718787C0B00198F86 /* CCComBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCComBase.h; sourceTree = "<group>"; };
37936A341869B76800E974DD /* document.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = document.h; sourceTree = "<group>"; };
37936A351869B76800E974DD /* filestream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filestream.h; sourceTree = "<group>"; };
37936A351869B76800E974DD /* filereadstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filestream.h; sourceTree = "<group>"; };
37936A351869B76800E974DD /* filewritestream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filestream.h; sourceTree = "<group>"; };
37936A371869B76800E974DD /* pow10.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pow10.h; sourceTree = "<group>"; };
37936A381869B76800E974DD /* stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stack.h; sourceTree = "<group>"; };
37936A391869B76800E974DD /* strfunc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strfunc.h; sourceTree = "<group>"; };
@ -9077,7 +9078,8 @@
isa = PBXGroup;
children = (
37936A341869B76800E974DD /* document.h */,
37936A351869B76800E974DD /* filestream.h */,
37936A351869B76800E974DD /* filereadstream.h */,
37936A351869B76800E974DD /* filewritestream.h */,
37936A361869B76800E974DD /* internal */,
37936A3A1869B76800E974DD /* prettywriter.h */,
37936A3B1869B76800E974DD /* rapidjson.h */,

2
cocos/2d/CCClippingNode.cpp
View File

@ -32,7 +32,7 @@
#include "renderer/CCRenderer.h"
#include "renderer/CCRenderState.h"
#include "base/CCDirector.h"
#include "base/CCStencilStateManager.hpp"
#include "base/CCStencilStateManager.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
#define CC_CLIPPING_NODE_OPENGLES 0

4
cocos/2d/libcocos2d.vcxproj
View File

@ -945,7 +945,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\openssl\prebuilt\win32\*.*" "$(OutDir)"
<ClInclude Include="..\..\external\flatbuffers\reflection.h" />
<ClInclude Include="..\..\external\flatbuffers\reflection_generated.h" />
<ClInclude Include="..\..\external\json\document.h" />
<ClInclude Include="..\..\external\json\filestream.h" />
<ClInclude Include="..\..\external\json\filereadstream.h" />
<ClInclude Include="..\..\external\json\filewritestream.h" />
<ClInclude Include="..\..\external\json\internal\pow10.h" />
<ClInclude Include="..\..\external\json\internal\stack.h" />
<ClInclude Include="..\..\external\json\internal\strfunc.h" />
@ -1219,7 +1220,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\openssl\prebuilt\win32\*.*" "$(OutDir)"
<ClInclude Include="..\navmesh\CCNavMeshUtils.h" />
<ClInclude Include="..\network\CCDownloader-curl.h" />
<ClInclude Include="..\network\CCDownloader.h" />
<ClInclude Include="..\network\CCDownloaderImpl.h" />
<ClInclude Include="..\network\CCIDownloaderImpl.h" />
<ClInclude Include="..\network\HttpClient.h" />
<ClInclude Include="..\network\HttpRequest.h" />

8
cocos/2d/libcocos2d.vcxproj.filters
View File

@ -2844,7 +2844,10 @@
<ClInclude Include="..\..\external\json\document.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\filestream.h">
<ClInclude Include="..\..\external\json\filereadstream.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\filewritestream.h">
<Filter>cocostudio\json\rapidjson</Filter>
</ClInclude>
<ClInclude Include="..\..\external\json\prettywriter.h">
@ -3832,9 +3835,6 @@
<ClInclude Include="..\network\CCDownloader.h">
<Filter>network\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\network\CCDownloaderImpl.h">
<Filter>network\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\network\CCIDownloaderImpl.h">
<Filter>network\Header Files</Filter>
</ClInclude>

2
cocos/base/CCStencilStateManager.cpp
View File

@ -23,7 +23,7 @@
THE SOFTWARE.
****************************************************************************/
#include "base/CCStencilStateManager.hpp"
#include "base/CCStencilStateManager.h"
#include "base/CCDirector.h"
#include "renderer/CCGLProgramCache.h"
#include "renderer/ccGLStateCache.h"

0
cocos/base/CCStencilStateManager.hpp → cocos/base/CCStencilStateManager.h
View File

2
cocos/ui/UILayout.cpp
View File

@ -37,7 +37,7 @@ THE SOFTWARE.
#include "2d/CCLayer.h"
#include "2d/CCSprite.h"
#include "base/CCEventFocus.h"
#include "base/CCStencilStateManager.hpp"
#include "base/CCStencilStateManager.h"
#include "editor-support/cocostudio/CocosStudioExtension.h"