diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index d1e4765f8a..9847873cda 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -119,23 +119,23 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \ $(LOCAL_PATH)/platform/third_party/android/skia/xml #it is used for ndk-r4 -# 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) \ +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 \ +# -lpng \ +# -lxml2 \ +# -ljpeg \ +# -lskia + # define the macro to compile through support/zip_support/ioapi.c LOCAL_CFLAGS := -DUSE_FILE32API diff --git a/cocos2dx/platform/CCPlatformConfig.h b/cocos2dx/platform/CCPlatformConfig.h index 53abc42a2e..ef65ba89a5 100644 --- a/cocos2dx/platform/CCPlatformConfig.h +++ b/cocos2dx/platform/CCPlatformConfig.h @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_CONFIG_H_YANGWS_20100110__ -#define __CC_CONFIG_H_YANGWS_20100110__ +#ifndef __CC_PLATFORM_CONFIG_H__ +#define __CC_PLATFORM_CONFIG_H__ /** @file @@ -172,8 +172,10 @@ There are config below: #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) #endif // CC_PLATFORM_WIN32 + #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #error cofnig -#endif -#endif // __CC_CONFIG_H_YANGWS_20100110__ +#endif // CC_PLATFORM_MAC + +#endif // __CC_PLATFORM_CONFIG_H__ diff --git a/cocos2dx/support/zip_support/ioapi.h b/cocos2dx/support/zip_support/ioapi.h index d0f37123eb..29c6147b1e 100644 --- a/cocos2dx/support/zip_support/ioapi.h +++ b/cocos2dx/support/zip_support/ioapi.h @@ -21,6 +21,8 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H +#include "CCPlatformConfig.h" + #if (!defined(_WIN32)) && (!defined(WIN32)) // Linux needs this to support file operation on files larger then 4+GB