diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index 7b26969cea..6c96a4c1e9 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -71,7 +71,7 @@ enum { kNodeOnCleanup }; -bool nodeComparisonLess(Node* n1, Node* n2); +bool CC_DLL nodeComparisonLess(Node* n1, Node* n2); class EventListener; diff --git a/cocos/2d/CCNodeGrid.h b/cocos/2d/CCNodeGrid.h index 12266b1a41..36671ae7b0 100644 --- a/cocos/2d/CCNodeGrid.h +++ b/cocos/2d/CCNodeGrid.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class GridBase; -class NodeGrid : public Node +class CC_DLL NodeGrid : public Node { public: static NodeGrid* create(); diff --git a/cocos/2d/CCTweenFunction.h b/cocos/2d/CCTweenFunction.h index acf8e17afb..e9bf6e21c5 100644 --- a/cocos/2d/CCTweenFunction.h +++ b/cocos/2d/CCTweenFunction.h @@ -84,63 +84,63 @@ namespace tweenfunc { //tween functions for CCActionEase - float easeIn(float time, float rate); - float easeOut(float time, float rate); - float easeInOut(float time, float rate); + float CC_DLL easeIn(float time, float rate); + float CC_DLL easeOut(float time, float rate); + float CC_DLL easeInOut(float time, float rate); - float bezieratFunction( float a, float b, float c, float d, float t ); + float CC_DLL bezieratFunction( float a, float b, float c, float d, float t ); - float quadraticIn(float time); - float quadraticOut(float time); - float quadraticInOut(float time); + float CC_DLL quadraticIn(float time); + float CC_DLL quadraticOut(float time); + float CC_DLL quadraticInOut(float time); - float tweenTo(float time, TweenType type, float *easingParam); + float CC_DLL tweenTo(float time, TweenType type, float *easingParam); - float linear(float time); + float CC_DLL linear(float time); - float sineEaseIn(float time); - float sineEaseOut(float time); - float sineEaseInOut(float time); + float CC_DLL sineEaseIn(float time); + float CC_DLL sineEaseOut(float time); + float CC_DLL sineEaseInOut(float time); - float quadEaseIn(float time); - float quadEaseOut(float time); - float quadEaseInOut(float time); + float CC_DLL quadEaseIn(float time); + float CC_DLL quadEaseOut(float time); + float CC_DLL quadEaseInOut(float time); - float cubicEaseIn(float time); - float cubicEaseOut(float time); - float cubicEaseInOut(float time); + float CC_DLL cubicEaseIn(float time); + float CC_DLL cubicEaseOut(float time); + float CC_DLL cubicEaseInOut(float time); - float quartEaseIn(float time); - float quartEaseOut(float time); - float quartEaseInOut(float time); + float CC_DLL quartEaseIn(float time); + float CC_DLL quartEaseOut(float time); + float CC_DLL quartEaseInOut(float time); - float quintEaseIn(float time); - float quintEaseOut(float time); - float quintEaseInOut(float time); + float CC_DLL quintEaseIn(float time); + float CC_DLL quintEaseOut(float time); + float CC_DLL quintEaseInOut(float time); - float expoEaseIn(float time); - float expoEaseOut(float time); - float expoEaseInOut(float time); + float CC_DLL expoEaseIn(float time); + float CC_DLL expoEaseOut(float time); + float CC_DLL expoEaseInOut(float time); - float circEaseIn(float time); - float circEaseOut(float time); - float circEaseInOut(float time); + float CC_DLL circEaseIn(float time); + float CC_DLL circEaseOut(float time); + float CC_DLL circEaseInOut(float time); - float elasticEaseIn(float time, float period); - float elasticEaseOut(float time, float period); - float elasticEaseInOut(float time, float period); + float CC_DLL elasticEaseIn(float time, float period); + float CC_DLL elasticEaseOut(float time, float period); + float CC_DLL elasticEaseInOut(float time, float period); - float backEaseIn(float time); - float backEaseOut(float time); - float backEaseInOut(float time); + float CC_DLL backEaseIn(float time); + float CC_DLL backEaseOut(float time); + float CC_DLL backEaseInOut(float time); - float bounceEaseIn(float time); - float bounceEaseOut(float time); - float bounceEaseInOut(float time); + float CC_DLL bounceEaseIn(float time); + float CC_DLL bounceEaseOut(float time); + float CC_DLL bounceEaseInOut(float time); - float customEase(float time, float *easingParam); + float CC_DLL customEase(float time, float *easingParam); } NS_CC_END diff --git a/cocos/base/CCEventFocus.h b/cocos/base/CCEventFocus.h index 83fc989143..c43399d446 100644 --- a/cocos/base/CCEventFocus.h +++ b/cocos/base/CCEventFocus.h @@ -35,7 +35,7 @@ namespace ui { class Widget; } -class EventFocus : public Event +class CC_DLL EventFocus : public Event { public: EventFocus(ui::Widget* widgetLoseFocus, ui::Widget* widgetGetFocus); diff --git a/cocos/base/CCEventKeyboard.h b/cocos/base/CCEventKeyboard.h index c043d67e45..392cb4c867 100644 --- a/cocos/base/CCEventKeyboard.h +++ b/cocos/base/CCEventKeyboard.h @@ -30,7 +30,7 @@ NS_CC_BEGIN -class EventKeyboard : public Event +class CC_DLL EventKeyboard : public Event { public: /** diff --git a/cocos/base/CCEventListenerFocus.h b/cocos/base/CCEventListenerFocus.h index dec59f774a..2b0f61eb31 100644 --- a/cocos/base/CCEventListenerFocus.h +++ b/cocos/base/CCEventListenerFocus.h @@ -35,7 +35,7 @@ namespace ui { class Widget; } -class EventListenerFocus : public EventListener +class CC_DLL EventListenerFocus : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerKeyboard.h b/cocos/base/CCEventListenerKeyboard.h index 5f14abc2e9..decf898094 100644 --- a/cocos/base/CCEventListenerKeyboard.h +++ b/cocos/base/CCEventListenerKeyboard.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class Event; -class EventListenerKeyboard : public EventListener +class CC_DLL EventListenerKeyboard : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerMouse.h b/cocos/base/CCEventListenerMouse.h index 22708e137b..fb54c27bac 100644 --- a/cocos/base/CCEventListenerMouse.h +++ b/cocos/base/CCEventListenerMouse.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class Event; -class EventListenerMouse : public EventListener +class CC_DLL EventListenerMouse : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventMouse.h b/cocos/base/CCEventMouse.h index f1cfc19a90..d5a9d2def3 100644 --- a/cocos/base/CCEventMouse.h +++ b/cocos/base/CCEventMouse.h @@ -39,7 +39,7 @@ NS_CC_BEGIN -class EventMouse : public Event +class CC_DLL EventMouse : public Event { public: /** diff --git a/cocos/base/CCEventTouch.h b/cocos/base/CCEventTouch.h index 60b0c96f0c..1a0e34a594 100644 --- a/cocos/base/CCEventTouch.h +++ b/cocos/base/CCEventTouch.h @@ -33,7 +33,7 @@ NS_CC_BEGIN #define TOUCH_PERF_DEBUG 1 -class EventTouch : public Event +class CC_DLL EventTouch : public Event { public: static const int MAX_TOUCHES = 5; diff --git a/cocos/base/CCIMEDelegate.h b/cocos/base/CCIMEDelegate.h index a4f0f65740..15988c6477 100644 --- a/cocos/base/CCIMEDelegate.h +++ b/cocos/base/CCIMEDelegate.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include "math/CCGeometry.h" NS_CC_BEGIN -extern const std::string STD_STRING_EMPTY; +extern const std::string CC_DLL STD_STRING_EMPTY; /** * @addtogroup input diff --git a/cocos/base/ccTypes.h b/cocos/base/ccTypes.h index cdd342398c..f9bf620f47 100644 --- a/cocos/base/ccTypes.h +++ b/cocos/base/ccTypes.h @@ -497,8 +497,8 @@ public: Acceleration(): x(0), y(0), z(0), timestamp(0) {} }; -extern const std::string STD_STRING_EMPTY; -extern const ssize_t CC_INVALID_INDEX; +extern const std::string CC_DLL STD_STRING_EMPTY; +extern const ssize_t CC_DLL CC_INVALID_INDEX; NS_CC_END diff --git a/cocos/deprecated/CCString.h b/cocos/deprecated/CCString.h index 0bf66dcf8e..18d2002a56 100644 --- a/cocos/deprecated/CCString.h +++ b/cocos/deprecated/CCString.h @@ -215,7 +215,7 @@ std::string toString(T arg) return ss.str(); } -std::string format(const char* format, ...) CC_FORMAT_PRINTF(1, 2); +std::string CC_DLL format(const char* format, ...) CC_FORMAT_PRINTF(1, 2); } // namespace StringUtils { diff --git a/cocos/physics/CCPhysicsWorld.h b/cocos/physics/CCPhysicsWorld.h index 8c3c9a3528..be3620fdd5 100644 --- a/cocos/physics/CCPhysicsWorld.h +++ b/cocos/physics/CCPhysicsWorld.h @@ -226,7 +226,7 @@ protected: friend class PhysicsWorld; }; -extern const float PHYSICS_INFINITY; +extern const float CC_DLL PHYSICS_INFINITY; NS_CC_END