Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2322: Macro CC_DLL take no effect now since we are using static library.

This commit is contained in:
James Chen 2013-06-23 17:21:13 +08:00
parent aaeb4e13b0
commit 195605c85d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CocosDenshion/include/Export.h
View File

@ -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_)

12
cocos2dx/platform/win32/CCPlatformDefine.h
View File

@ -5,11 +5,13 @@
#include <string.h>
#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 <assert.h>