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

fix android compile error

This commit is contained in:
andyque 2015-05-07 10:37:19 +08:00
parent bedd62296f
commit db95034798
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/2d/CCNode.h
View File

@ -1048,11 +1048,6 @@ public:
*/ */
virtual void setGLProgramState(GLProgramState *glProgramState); virtual void setGLProgramState(GLProgramState *glProgramState);
/** Returns the Material used for this Node */
Material* getMaterial() const;
/** Sets the Material used for this Node */
void setMaterial(Material* material);
/// @} end of Shader Program /// @} end of Shader Program

1
cocos/Android.mk
View File

@ -223,7 +223,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../external/poly2tri/sweep $(LOCAL_PATH)/../external/poly2tri/sweep
LOCAL_C_INCLUDES := $(LOCAL_PATH) \ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/. \
$(LOCAL_PATH)/platform \ $(LOCAL_PATH)/platform \
$(LOCAL_PATH)/../external \ $(LOCAL_PATH)/../external \
$(LOCAL_PATH)/../external/tinyxml2 \ $(LOCAL_PATH)/../external/tinyxml2 \

3
cocos/audio/android/ccdandroidUtils.cpp
View File

@ -23,11 +23,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "ccdandroidUtils.h" #include "ccdandroidUtils.h"
#include "cocos2d.h"
#include <jni.h> #include <jni.h>
#include <android/log.h> #include <android/log.h>
#include "jni/JniHelper.h" #include "jni/JniHelper.h"
#include "platform/CCFileUtils.h"
USING_NS_CC; USING_NS_CC;

5
cocos/platform/android/jni/CocosPlayClient.cpp
View File

@ -22,11 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CocosPlayClient.h" #include "CocosPlayClient.h"
#include "cocos2d.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
#include <map> #include <map>
#include<unordered_map>
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
#include "jni/JniHelper.h" #include "jni/JniHelper.h"
#include "platform/CCCommon.h" #include "platform/CCCommon.h"
#include "platform/CCFileUtils.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.h
View File

@ -4,7 +4,6 @@
#include <jni.h> #include <jni.h>
#include <string> #include <string>
#include <vector> #include <vector>
#include "cocos2d.h"
using namespace std; using namespace std;
@ -12,7 +11,6 @@ extern "C" {
#include "lua.h" #include "lua.h"
} }
using namespace cocos2d;
#define LUAJ_ERR_OK 0 #define LUAJ_ERR_OK 0
#define LUAJ_ERR_TYPE_NOT_SUPPORT (-1) #define LUAJ_ERR_TYPE_NOT_SUPPORT (-1)