Merge pull request #21 from minggo/v3

not use jpeg, webp, tiff as modules

Author: minggo

jpeg/CCModuleJPEG.cpp

@@ -1,28 +1,8 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := jpeg_static
-LOCAL_MODULE_FILENAME := jpeg_internal
+LOCAL_MODULE := cocos_jpeg_static
+LOCAL_MODULE_FILENAME := jpeg
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libjpeg.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
 include $(PREBUILT_STATIC_LIBRARY)
-
-# CCModuleTIFF + jpeg.a
-include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_jpeg_static
-LOCAL_MODULE_FILENAME := libjpeg
-
-LOCAL_SRC_FILES := $(LOCAL_PATH)/../../CCModuleJPEG.cpp
-
-LOCAL_STATIC_LIBRARIES := jpeg_static
-LOCAL_STATIC_LIBRARIES += cocos2dx_static
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos \
-                    $(LOCAL_PATH)/../../../../cocos/platform/android \
-                    $(LOCAL_PATH)/../../include/android
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../..
-
-include $(BUILD_STATIC_LIBRARY)
-
-$(call import-module,jpeg/prebuilt/android)