From 195605c85dc9f04569a9223e646d1cae5b87ebc1 Mon Sep 17 00:00:00 2001 From: James Chen Date: Sun, 23 Jun 2013 17:21:13 +0800 Subject: [PATCH] issue #2322: Macro CC_DLL take no effect now since we are using static library. --- CocosDenshion/include/Export.h | 4 ++-- cocos2dx/platform/win32/CCPlatformDefine.h | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CocosDenshion/include/Export.h b/CocosDenshion/include/Export.h index e0f6331255..30096064c4 100644 --- a/CocosDenshion/include/Export.h +++ b/CocosDenshion/include/Export.h @@ -6,11 +6,11 @@ #define EXPORT_DLL _EXPORT_ #elif defined(_WIN32) #if defined(_EXPORT_DLL_) - #define EXPORT_DLL __declspec(dllexport) + #define EXPORT_DLL// __declspec(dllexport) #elif defined(IGNORE_EXPORT) #define EXPORT_DLL #else /* use a DLL library */ - #define EXPORT_DLL __declspec(dllimport) + #define EXPORT_DLL// __declspec(dllimport) #endif #else #if defined(_SHARED_) diff --git a/cocos2dx/platform/win32/CCPlatformDefine.h b/cocos2dx/platform/win32/CCPlatformDefine.h index 44221017fe..80447f0c73 100644 --- a/cocos2dx/platform/win32/CCPlatformDefine.h +++ b/cocos2dx/platform/win32/CCPlatformDefine.h @@ -5,11 +5,13 @@ #include #endif -#if defined(_USRDLL) - #define CC_DLL __declspec(dllexport) -#else /* use a DLL library */ - #define CC_DLL __declspec(dllimport) -#endif +//#if defined(_USRDLL) +// #define CC_DLL __declspec(dllexport) +//#else /* use a DLL library */ +// #define CC_DLL __declspec(dllimport) +//#endif + +#define CC_DLL #include