mirror of https://github.com/axmolengine/axmol.git
issue #427 android HelloWorld ok
This commit is contained in:
parent
d58a1ac9bc
commit
ff91c91ea9
|
@ -57,6 +57,7 @@ platform/CCNode_mobile.cpp \
|
||||||
platform/CCGL.cpp \
|
platform/CCGL.cpp \
|
||||||
platform/CCImage.cpp \
|
platform/CCImage.cpp \
|
||||||
platform/CCStdC.cpp \
|
platform/CCStdC.cpp \
|
||||||
|
platform/CCSAXParser.cpp \
|
||||||
platform/CCThread.cpp \
|
platform/CCThread.cpp \
|
||||||
platform/CCCommon.cpp \
|
platform/CCCommon.cpp \
|
||||||
platform/CCParticleSystemPoint_mobile.cpp \
|
platform/CCParticleSystemPoint_mobile.cpp \
|
||||||
|
@ -118,23 +119,23 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
|
||||||
$(LOCAL_PATH)/platform/third_party/android/skia/xml
|
$(LOCAL_PATH)/platform/third_party/android/skia/xml
|
||||||
|
|
||||||
#it is used for ndk-r4
|
#it is used for ndk-r4
|
||||||
LOCAL_LDLIBS := -L$(LOCAL_PATH)/platform/third_party/android/libraries \
|
# LOCAL_LDLIBS := -L$(LOCAL_PATH)/platform/third_party/android/libraries \
|
||||||
-lGLESv1_CM -llog -lz \
|
|
||||||
-lpng \
|
|
||||||
-lxml2 \
|
|
||||||
-ljpeg \
|
|
||||||
-lskia
|
|
||||||
|
|
||||||
# it is used for ndk-r5
|
|
||||||
# because the new Windows toolchain doesn't support Cygwin's drive
|
|
||||||
# mapping (i.e /cygdrive/c/ instead of C:/)
|
|
||||||
#LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries) \
|
|
||||||
# -lGLESv1_CM -llog -lz \
|
# -lGLESv1_CM -llog -lz \
|
||||||
# -lpng \
|
# -lpng \
|
||||||
# -lxml2 \
|
# -lxml2 \
|
||||||
# -ljpeg \
|
# -ljpeg \
|
||||||
# -lskia
|
# -lskia
|
||||||
|
|
||||||
|
# it is used for ndk-r5
|
||||||
|
# because the new Windows toolchain doesn't support Cygwin's drive
|
||||||
|
# mapping (i.e /cygdrive/c/ instead of C:/)
|
||||||
|
LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries) \
|
||||||
|
-lGLESv1_CM -llog -lz \
|
||||||
|
-lpng \
|
||||||
|
-lxml2 \
|
||||||
|
-ljpeg \
|
||||||
|
-lskia
|
||||||
|
|
||||||
# define the macro to compile through support/zip_support/ioapi.c
|
# define the macro to compile through support/zip_support/ioapi.c
|
||||||
LOCAL_CFLAGS := -DUSE_FILE32API
|
LOCAL_CFLAGS := -DUSE_FILE32API
|
||||||
|
|
||||||
|
|
|
@ -146,6 +146,9 @@ void CCLog(const char * pszFormat, ...)
|
||||||
|
|
||||||
__android_log_print(ANDROID_LOG_DEBUG, "cocos2d-x debug info", buf);
|
__android_log_print(ANDROID_LOG_DEBUG, "cocos2d-x debug info", buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NS_CC_END;
|
||||||
|
|
||||||
#endif // CC_PLATFORM_ANDROID
|
#endif // CC_PLATFORM_ANDROID
|
||||||
/****************************************************
|
/****************************************************
|
||||||
* airplay
|
* airplay
|
||||||
|
|
Loading…
Reference in New Issue