From d420ae39e272fb3abc3c90631e174916059140b9 Mon Sep 17 00:00:00 2001 From: martell Date: Sat, 20 Sep 2014 00:13:55 +0100 Subject: [PATCH] Added CC_STATIC support for 3d, all these commits will be squashed and renamed, structured and signed at the end Signed-off-by: martell --- cocos/3d/3dExport.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cocos/3d/3dExport.h b/cocos/3d/3dExport.h index 2639bab2eb..e2066a0f28 100644 --- a/cocos/3d/3dExport.h +++ b/cocos/3d/3dExport.h @@ -6,13 +6,16 @@ #include #endif - #if defined(_USE3DDLL) - #define CC_3D_DLL __declspec(dllexport) - #else /* use a DLL library */ - #define CC_3D_DLL __declspec(dllimport) + #if defined(CC_STATIC) + #define CC_3D_DLL + #else + #if defined(_USE3DDLL) + #define CC_3D_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_3D_DLL __declspec(dllimport) + #endif #endif - /* Define NULL pointer value */ #ifndef NULL #ifdef __cplusplus