Merge pull request cocos2d#12 from dumganhar/minggo-releasing

[Android] Fixing path error and reducing dependence for extension.

Author: minggo

AUTHORS

@@ -414,6 +414,8 @@ Developers:
         Added some guards to prevent Eclipse to compile twice the same class.
         Linux Eclipse projects updates
         Refactored emscripten-build.sh, it's no longer need to be edited to make emscripten work.
+        Creation of CCDeprecated-ext.h
+        Use of a single emscripten HTML template file.
 
     elmiro
         Correction of passed buffer size to readlink and verification of result return by readlink.

cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-3e6fb10656859ac83b22bfa48044ade6213d414d
+61930829c286fd6ec795bccee6e841a60e8ba34f

cocos2dx/Android.mk

@@ -170,8 +170,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libtiff_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libwebp_static
 
 # define the macro to compile through support/zip_support/ioapi.c
-LOCAL_CFLAGS   := -Wno-psabi -Wno-deprecated-declarations -DUSE_FILE32API
-LOCAL_EXPORT_CFLAGS   := -Wno-psabi -Wno-deprecated-declarations -DUSE_FILE32API
+LOCAL_CFLAGS   := -Wno-psabi -DUSE_FILE32API
+LOCAL_EXPORT_CFLAGS   := -Wno-psabi -DUSE_FILE32API
 
 include $(BUILD_STATIC_LIBRARY)
 

cocos2dx/actions/CCActionInstant.cpp

@@ -29,6 +29,13 @@
 #include "sprite_nodes/CCSprite.h"
 #include "script_support/CCScriptSupport.h"
 
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#elif _MSC_VER >= 1400 //vs 2005 or higher
+#pragma warning (push)
+#pragma warning (disable: 4996)
+#endif
+
 NS_CC_BEGIN
 //
 // InstantAction
@@ -473,5 +480,137 @@ CallFuncN * CallFuncN::clone() const
 	return a;
 }
 
+//
+// CallFuncND
+//
+
+__CCCallFuncND * __CCCallFuncND::create(Object* selectorTarget, SEL_CallFuncND selector, void* d)
+{
+    __CCCallFuncND* pRet = new __CCCallFuncND();
+    
+    if (pRet && pRet->initWithTarget(selectorTarget, selector, d)) {
+        pRet->autorelease();
+        return pRet;
+    }
+    
+    CC_SAFE_DELETE(pRet);
+    return NULL;
+}
+
+bool __CCCallFuncND::initWithTarget(Object* selectorTarget, SEL_CallFuncND selector, void* d)
+{
+    if (CallFunc::initWithTarget(selectorTarget))
+    {
+        _data = d;
+        _callFuncND = selector;
+        return true;
+    }
+    
+    return false;
+}
+
+void __CCCallFuncND::execute()
+{
+    if (_callFuncND)
+    {
+        (_selectorTarget->*_callFuncND)(_target, _data);
+    }
+}
+
+__CCCallFuncND * __CCCallFuncND::clone() const
+{
+	// no copy constructor
+	auto a = new __CCCallFuncND();
+    
+    if( _selectorTarget)
+    {
+        a->initWithTarget(_selectorTarget, _callFuncND, _data);
+    }
+    
+	a->autorelease();
+	return a;
+}
+
+//
+// CallFuncO
+//
+__CCCallFuncO::__CCCallFuncO() :
+_object(NULL)
+{
+}
+
+__CCCallFuncO::~__CCCallFuncO()
+{
+    CC_SAFE_RELEASE(_object);
+}
+
+void __CCCallFuncO::execute()
+{
+    if (_callFuncO) {
+        (_selectorTarget->*_callFuncO)(_object);
+    }
+}
+
+__CCCallFuncO * __CCCallFuncO::create(Object* selectorTarget, SEL_CallFuncO selector, Object* object)
+{
+    __CCCallFuncO *pRet = new __CCCallFuncO();
+    
+    if (pRet && pRet->initWithTarget(selectorTarget, selector, object)) {
+        pRet->autorelease();
+        return pRet;
+    }
+    
+    CC_SAFE_DELETE(pRet);
+    return NULL;
+}
+
+bool __CCCallFuncO::initWithTarget(Object* selectorTarget, SEL_CallFuncO selector, Object* object)
+{
+    if (CallFunc::initWithTarget(selectorTarget))
+    {
+        _object = object;
+        CC_SAFE_RETAIN(_object);
+        
+        _callFuncO = selector;
+        return true;
+    }
+    
+    return false;
+}
+
+__CCCallFuncO * __CCCallFuncO::clone() const
+{
+	// no copy constructor
+	auto a = new __CCCallFuncO();
+    
+    if( _selectorTarget)
+    {
+        a->initWithTarget(_selectorTarget, _callFuncO, _object);
+    }
+    
+	a->autorelease();
+	return a;
+}
+
+Object* __CCCallFuncO::getObject() const
+{
+    return _object;
+}
+    
+void __CCCallFuncO::setObject(Object* obj)
+{
+    if (obj != _object)
+    {
+        CC_SAFE_RELEASE(_object);
+        _object = obj;
+        CC_SAFE_RETAIN(_object);
+    }
+}
 
 NS_CC_END
+
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
+#pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#elif _MSC_VER >= 1400 //vs 2005 or higher
+#pragma warning (pop)
+#endif

cocos2dx/actions/CCActionInstant.h

@@ -341,6 +341,87 @@ class CC_DLL CallFuncN : public CallFunc, public TypeInfo
     std::function<void(Node*)> _functionN;
 };
 
+/**
+ @deprecated Please use CallFuncN instead.
+ @brief Calls a 'callback' with the node as the first argument and the 2nd argument is data
+ * ND means: Node and Data. Data is void *, so it could be anything.
+ */
+
+class CC_DLL  __CCCallFuncND : public CallFunc
+{
+public:
+    /** creates the action with the callback and the data to pass as an argument */
+    CC_DEPRECATED_ATTRIBUTE static __CCCallFuncND * create(Object* selectorTarget, SEL_CallFuncND selector, void* d);
+    
+    virtual long getClassTypeInfo() {
+        static const long id = cocos2d::getHashCodeByString(typeid(cocos2d::CallFunc).name());
+		return id;
+    }
+    
+protected:
+    /** initializes the action with the callback and the data to pass as an argument */
+    bool initWithTarget(Object* selectorTarget, SEL_CallFuncND selector, void* d);
+    
+public:
+    //
+    // Overrides
+    //
+	virtual __CCCallFuncND* clone() const override;
+    virtual void execute() override;
+    
+protected:
+    SEL_CallFuncND _callFuncND;
+    void* _data;
+};
+
+
+/**
+ @deprecated Please use CallFuncN instead.
+ @brief Calls a 'callback' with an object as the first argument.
+ O means Object.
+ @since v0.99.5
+ */
+
+class CC_DLL __CCCallFuncO : public CallFunc, public TypeInfo
+{
+public:
+    /** creates the action with the callback
+     
+     typedef void (Object::*SEL_CallFuncO)(Object*);
+     */
+    CC_DEPRECATED_ATTRIBUTE static __CCCallFuncO * create(Object* selectorTarget, SEL_CallFuncO selector, Object* object);
+    
+    __CCCallFuncO();
+    virtual ~__CCCallFuncO();
+    
+    virtual long getClassTypeInfo() {
+	    static const long id = cocos2d::getHashCodeByString(typeid(cocos2d::CallFunc).name());
+		return id;
+    }
+    
+protected:
+    /** initializes the action with the callback
+     
+     typedef void (Object::*SEL_CallFuncO)(Object*);
+     */
+    bool initWithTarget(Object* selectorTarget, SEL_CallFuncO selector, Object* object);
+    
+public:
+    //
+    // Overrides
+    //
+	virtual __CCCallFuncO* clone() const override;
+    virtual void execute() override;
+    
+    Object* getObject() const;
+    void setObject(Object* obj);
+    
+protected:
+    /** object to be passed as argument */
+    Object* _object;
+    SEL_CallFuncO _callFuncO;
+};
+
 // end of actions group
 /// @}
 

cocos2dx/cocos2d.cpp

@@ -30,7 +30,7 @@ NS_CC_BEGIN
 
 const char* cocos2dVersion()
 {
-    return "3.0-alpha0-pre";
+    return "3.0-pre-alpha0";
 }
 
 NS_CC_END

cocos2dx/include/CCDeprecated.h

@@ -622,6 +622,9 @@ CC_DEPRECATED_ATTRIBUTE typedef FlipX CCFlipX;
 CC_DEPRECATED_ATTRIBUTE typedef FlipY CCFlipY;
 CC_DEPRECATED_ATTRIBUTE typedef Place CCPlace;
 CC_DEPRECATED_ATTRIBUTE typedef CallFunc CCCallFunc;
+CC_DEPRECATED_ATTRIBUTE typedef CallFuncN CCCallFuncN;
+CC_DEPRECATED_ATTRIBUTE typedef __CCCallFuncND CCCallFuncND;
+CC_DEPRECATED_ATTRIBUTE typedef __CCCallFuncO CCCallFuncO;
 CC_DEPRECATED_ATTRIBUTE typedef GridAction CCGridAction;
 CC_DEPRECATED_ATTRIBUTE typedef Grid3DAction CCGrid3DAction;
 CC_DEPRECATED_ATTRIBUTE typedef TiledGrid3DAction CCTiledGrid3DAction;
@@ -760,6 +763,7 @@ CC_DEPRECATED_ATTRIBUTE typedef Timer CCTimer;
 CC_DEPRECATED_ATTRIBUTE typedef Scheduler CCScheduler;
 CC_DEPRECATED_ATTRIBUTE typedef EGLView CCEGLView;
 
+CC_DEPRECATED_ATTRIBUTE typedef Component CCComponent;
 CC_DEPRECATED_ATTRIBUTE typedef AffineTransform CCAffineTransform;
 CC_DEPRECATED_ATTRIBUTE typedef Point CCPoint;
 CC_DEPRECATED_ATTRIBUTE typedef Size CCSize;

cocos2dx/include/ccTypes.h

@@ -83,7 +83,7 @@ struct Color4B
     a(_a)
     {}
 
-    Color4B(): r(0.f), g(0.f), b(0.f), a(0.f) {}
+    Color4B(): r(0), g(0), b(0), a(0) {}
 
     // This function should use Color4F, so implement it in .cpp file.
     explicit Color4B(const Color4F &color4F);

cocos2dx/menu_nodes/CCMenuItem.cpp

@@ -33,6 +33,13 @@ THE SOFTWARE.
 #include <stdarg.h>
 #include <cstring>
 
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#elif _MSC_VER >= 1400 //vs 2005 or higher
+#pragma warning (push)
+#pragma warning (disable: 4996)
+#endif
+
 NS_CC_BEGIN
 
 static unsigned int _globalFontSize = kItemSize;
@@ -986,3 +993,9 @@ MenuItem* MenuItemToggle::getSelectedItem()
 }
 
 NS_CC_END
+
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
+#pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#elif _MSC_VER >= 1400 //vs 2005 or higher
+#pragma warning (pop)
+#endif

cocos2dx/misc_nodes/CCRenderTexture.h

@@ -104,7 +104,10 @@ class CC_DLL RenderTexture : public Node
     /* creates a new Image from with the texture's data.
        Caller is responsible for releasing it by calling delete.
      */
+    
     Image* newImage(bool flipImage = true);
+    
+    CC_DEPRECATED_ATTRIBUTE Image* newCCImage(bool flipImage = true) { return newImage(flipImage); };
 
     /** saves the texture into a file using JPEG format. The file will be saved in the Documents folder.
         Returns YES if the operation is successful.