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

fix other platform compile error

This commit is contained in:
andyque 2014-06-04 14:53:32 +08:00
parent 54e93f6c41
commit d089b251db
10 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/Android.mk
View File

@ -132,6 +132,7 @@ base/ccUTF8.cpp \
base/ccUtils.cpp \ base/ccUtils.cpp \
base/etc1.cpp \ base/etc1.cpp \
base/s3tc.cpp \ base/s3tc.cpp \
base/ObjectFactory.cpp \
renderer/CCBatchCommand.cpp \ renderer/CCBatchCommand.cpp \
renderer/CCCustomCommand.cpp \ renderer/CCCustomCommand.cpp \
renderer/CCGLProgram.cpp \ renderer/CCGLProgram.cpp \

1
cocos/base/CMakeLists.txt
View File

@ -41,4 +41,5 @@ set(COCOS_BASE_SRC
base/ccUtils.cpp base/ccUtils.cpp
base/etc1.cpp base/etc1.cpp
base/s3tc.cpp base/s3tc.cpp
base/ObjectFactory.cpp
) )

1
cocos/editor-support/cocostudio/Android.mk
View File

@ -36,7 +36,6 @@ CCInputDelegate.cpp \
DictionaryHelper.cpp \ DictionaryHelper.cpp \
CCSGUIReader.cpp \ CCSGUIReader.cpp \
CCSSceneReader.cpp \ CCSSceneReader.cpp \
ObjectFactory.cpp \
TriggerBase.cpp \ TriggerBase.cpp \
TriggerMng.cpp \ TriggerMng.cpp \
TriggerObj.cpp \ TriggerObj.cpp \

1
cocos/editor-support/cocostudio/CMakeLists.txt
View File

@ -30,7 +30,6 @@ set(CS_SRC
DictionaryHelper.cpp DictionaryHelper.cpp
CCSGUIReader.cpp CCSGUIReader.cpp
CCSSceneReader.cpp CCSSceneReader.cpp
ObjectFactory.cpp
TriggerBase.cpp TriggerBase.cpp
TriggerMng.cpp TriggerMng.cpp
TriggerObj.cpp TriggerObj.cpp

1
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj
View File

@ -42,7 +42,6 @@
<ClCompile Include="..\CCTween.cpp" /> <ClCompile Include="..\CCTween.cpp" />
<ClCompile Include="..\CCUtilMath.cpp" /> <ClCompile Include="..\CCUtilMath.cpp" />
<ClCompile Include="..\DictionaryHelper.cpp" /> <ClCompile Include="..\DictionaryHelper.cpp" />
<ClCompile Include="..\ObjectFactory.cpp" />
<ClCompile Include="..\TriggerBase.cpp" /> <ClCompile Include="..\TriggerBase.cpp" />
<ClCompile Include="..\TriggerMng.cpp" /> <ClCompile Include="..\TriggerMng.cpp" />
<ClCompile Include="..\TriggerObj.cpp" /> <ClCompile Include="..\TriggerObj.cpp" />

3
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
View File

@ -177,9 +177,6 @@
<ClCompile Include="..\CCActionObject.cpp"> <ClCompile Include="..\CCActionObject.cpp">
<Filter>action</Filter> <Filter>action</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\ObjectFactory.cpp">
<Filter>trigger</Filter>
</ClCompile>
<ClCompile Include="..\TriggerBase.cpp"> <ClCompile Include="..\TriggerBase.cpp">
<Filter>trigger</Filter> <Filter>trigger</Filter>
</ClCompile> </ClCompile>

1
cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj
View File

@ -194,7 +194,6 @@
<ClCompile Include="..\CCTween.cpp" /> <ClCompile Include="..\CCTween.cpp" />
<ClCompile Include="..\CCUtilMath.cpp" /> <ClCompile Include="..\CCUtilMath.cpp" />
<ClCompile Include="..\DictionaryHelper.cpp" /> <ClCompile Include="..\DictionaryHelper.cpp" />
<ClCompile Include="..\ObjectFactory.cpp" />
<ClCompile Include="..\TriggerBase.cpp" /> <ClCompile Include="..\TriggerBase.cpp" />
<ClCompile Include="..\TriggerMng.cpp" /> <ClCompile Include="..\TriggerMng.cpp" />
<ClCompile Include="..\TriggerObj.cpp" /> <ClCompile Include="..\TriggerObj.cpp" />

3
cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters
View File

@ -177,9 +177,6 @@
<ClCompile Include="..\CCActionObject.cpp"> <ClCompile Include="..\CCActionObject.cpp">
<Filter>action</Filter> <Filter>action</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\ObjectFactory.cpp">
<Filter>trigger</Filter>
</ClCompile>
<ClCompile Include="..\TriggerBase.cpp"> <ClCompile Include="..\TriggerBase.cpp">
<Filter>trigger</Filter> <Filter>trigger</Filter>
</ClCompile> </ClCompile>

3
cocos/ui/UIVideoPlayerAndroid.cpp
View File

@ -30,6 +30,9 @@
#include <jni.h> #include <jni.h>
#include <string> #include <string>
#include "jni/JniHelper.h" #include "jni/JniHelper.h"
#include "base/CCDirector.h"
#include "CCGLView.h"
#include "base/CCEventListenerKeyboard.h"
//----------------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------------
#define CLASS_NAME "org/cocos2dx/lib/Cocos2dxVideoHelper" #define CLASS_NAME "org/cocos2dx/lib/Cocos2dxVideoHelper"

1
templates/cocos2dx_files.json
View File

@ -317,6 +317,7 @@
"cocos/base/CCTouch.cpp", "cocos/base/CCTouch.cpp",
"cocos/base/CCTouch.h", "cocos/base/CCTouch.h",
"cocos/base/CCUserDefault.cpp", "cocos/base/CCUserDefault.cpp",
"cocos/base/ObjectFactory.cpp",
"cocos/base/CCUserDefault.h", "cocos/base/CCUserDefault.h",
"cocos/base/CCUserDefault.mm", "cocos/base/CCUserDefault.mm",
"cocos/base/CCUserDefaultAndroid.cpp", "cocos/base/CCUserDefaultAndroid.cpp",