diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-26 17:59:32 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-26 17:59:32 +0000 |
| commit | 48ba56d5faeb2687c654688910b505e2be38fd9c (patch) | |
| tree | c3aa829deaf93c4a27de8b9c813d2ebf5250c4f5 | |
| parent | 5b3d5349bedf37ec6fcf03bac04cf33129fc176a (diff) | |
Update GR_API to support non-Windows DLLs.
Review URL: http://codereview.appspot.com/4441067/
git-svn-id: http://skia.googlecode.com/svn/trunk@1189 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gpu/include/GrConfig.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gpu/include/GrConfig.h b/gpu/include/GrConfig.h index 8b8b28043f..2f89888fe0 100644 --- a/gpu/include/GrConfig.h +++ b/gpu/include/GrConfig.h @@ -171,11 +171,15 @@ typedef unsigned __int64 uint64_t; #define GR_DLL 0 #endif -#if GR_WIN32_BUILD && GR_DLL - #if GR_IMPLEMENTATION - #define GR_API __declspec(dllexport) +#if GR_DLL + #if GR_WIN32_BUILD + #if GR_IMPLEMENTATION + #define GR_API __declspec(dllexport) + #else + #define GR_API __declspec(dllimport) + #endif #else - #define GR_API __declspec(dllimport) + #define GR_API __attribute__((visibility("default"))) #endif #else #define GR_API |