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

move light from 3d to base(Windows)

This commit is contained in:
songchengjiang 2014-09-28 17:23:25 +08:00
parent e8904454e9
commit 39deb73c3a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/libcocos2d.vcxproj
View File

@ -208,7 +208,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\3d\CCBillBoard.cpp" /> <ClCompile Include="..\3d\CCBillBoard.cpp" />
<ClCompile Include="..\3d\CCBundle3D.cpp" /> <ClCompile Include="..\3d\CCBundle3D.cpp" />
<ClCompile Include="..\3d\CCBundleReader.cpp" /> <ClCompile Include="..\3d\CCBundleReader.cpp" />
<ClCompile Include="..\3d\CCLight3D.cpp" />
<ClCompile Include="..\3d\CCMesh.cpp" /> <ClCompile Include="..\3d\CCMesh.cpp" />
<ClCompile Include="..\3d\CCMeshSkin.cpp" /> <ClCompile Include="..\3d\CCMeshSkin.cpp" />
<ClCompile Include="..\3d\CCMeshVertexIndexData.cpp" /> <ClCompile Include="..\3d\CCMeshVertexIndexData.cpp" />
@ -247,6 +246,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\base\CCEventTouch.cpp" /> <ClCompile Include="..\base\CCEventTouch.cpp" />
<ClCompile Include="..\base\ccFPSImages.c" /> <ClCompile Include="..\base\ccFPSImages.c" />
<ClCompile Include="..\base\CCIMEDispatcher.cpp" /> <ClCompile Include="..\base\CCIMEDispatcher.cpp" />
<ClCompile Include="..\base\CCLight.cpp" />
<ClCompile Include="..\base\CCNS.cpp" /> <ClCompile Include="..\base\CCNS.cpp" />
<ClCompile Include="..\base\CCProfiling.cpp" /> <ClCompile Include="..\base\CCProfiling.cpp" />
<ClCompile Include="..\base\ccRandom.cpp" /> <ClCompile Include="..\base\ccRandom.cpp" />
@ -547,7 +547,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\3d\CCBundle3D.h" /> <ClInclude Include="..\3d\CCBundle3D.h" />
<ClInclude Include="..\3d\CCBundle3DData.h" /> <ClInclude Include="..\3d\CCBundle3DData.h" />
<ClInclude Include="..\3d\CCBundleReader.h" /> <ClInclude Include="..\3d\CCBundleReader.h" />
<ClInclude Include="..\3d\CCLight3D.h" />
<ClInclude Include="..\3d\CCMesh.h" /> <ClInclude Include="..\3d\CCMesh.h" />
<ClInclude Include="..\3d\CCMeshSkin.h" /> <ClInclude Include="..\3d\CCMeshSkin.h" />
<ClInclude Include="..\3d\CCMeshVertexIndexData.h" /> <ClInclude Include="..\3d\CCMeshVertexIndexData.h" />
@ -591,6 +590,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\base\ccFPSImages.h" /> <ClInclude Include="..\base\ccFPSImages.h" />
<ClInclude Include="..\base\CCIMEDelegate.h" /> <ClInclude Include="..\base\CCIMEDelegate.h" />
<ClInclude Include="..\base\CCIMEDispatcher.h" /> <ClInclude Include="..\base\CCIMEDispatcher.h" />
<ClInclude Include="..\base\CCLight.h" />
<ClInclude Include="..\base\ccMacros.h" /> <ClInclude Include="..\base\ccMacros.h" />
<ClInclude Include="..\base\CCMap.h" /> <ClInclude Include="..\base\CCMap.h" />
<ClInclude Include="..\base\CCNS.h" /> <ClInclude Include="..\base\CCNS.h" />

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

@ -1165,15 +1165,15 @@
<ClCompile Include="..\ui\UIEditBox\UIEditBoxImpl-win32.cpp"> <ClCompile Include="..\ui\UIEditBox\UIEditBoxImpl-win32.cpp">
<Filter>ui\UIWidgets\EditBox</Filter> <Filter>ui\UIWidgets\EditBox</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\3d\CCLight3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIWebViewImpl-win32.cpp"> <ClCompile Include="..\ui\UIWebViewImpl-win32.cpp">
<Filter>ui\UIWidgets</Filter> <Filter>ui\UIWidgets</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\ui\UIWebView.cpp"> <ClCompile Include="..\ui\UIWebView.cpp">
<Filter>ui\UIWidgets</Filter> <Filter>ui\UIWidgets</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\base\CCLight.cpp">
<Filter>base</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h"> <ClInclude Include="..\physics\CCPhysicsBody.h">
@ -2299,9 +2299,6 @@
<ClInclude Include="..\ui\UIEditBox\UIEditBoxImpl-win32.h"> <ClInclude Include="..\ui\UIEditBox\UIEditBoxImpl-win32.h">
<Filter>ui\UIWidgets\EditBox</Filter> <Filter>ui\UIWidgets\EditBox</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\3d\CCLight3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIWebViewImpl-win32.h"> <ClInclude Include="..\ui\UIWebViewImpl-win32.h">
<Filter>ui\UIWidgets</Filter> <Filter>ui\UIWidgets</Filter>
</ClInclude> </ClInclude>
@ -2311,6 +2308,9 @@
<ClInclude Include="..\ui\UIWebView.h"> <ClInclude Include="..\ui\UIWebView.h">
<Filter>ui\UIWidgets</Filter> <Filter>ui\UIWidgets</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\base\CCLight.h">
<Filter>base</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\math\Mat4.inl"> <None Include="..\math\Mat4.inl">