Update KHRONOS_APICALL for _WIN32 platform.
Use __declspec(dllexport) when KHRONOS_DLL_EXPORTS is defined.
This commit is contained in:
@@ -98,7 +98,11 @@
|
|||||||
* This precedes the return type of the function in the function prototype.
|
* This precedes the return type of the function in the function prototype.
|
||||||
*/
|
*/
|
||||||
#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
|
#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
|
||||||
# define KHRONOS_APICALL __declspec(dllimport)
|
# if defined(KHRONOS_DLL_EXPORTS)
|
||||||
|
# define KHRONOS_APICALL __declspec(dllexport)
|
||||||
|
# else
|
||||||
|
# define KHRONOS_APICALL __declspec(dllimport)
|
||||||
|
# endif
|
||||||
#elif defined (__SYMBIAN32__)
|
#elif defined (__SYMBIAN32__)
|
||||||
# define KHRONOS_APICALL IMPORT_C
|
# define KHRONOS_APICALL IMPORT_C
|
||||||
#elif (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
|
#elif (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
|
||||||
|
@@ -34,28 +34,17 @@
|
|||||||
#ifndef _VGPLATFORM_H
|
#ifndef _VGPLATFORM_H
|
||||||
#define _VGPLATFORM_H
|
#define _VGPLATFORM_H
|
||||||
|
|
||||||
|
#include <KHR/khrplatform.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
|
|
||||||
# define VG_API_CALL __attribute__((visibility("default")))
|
|
||||||
# define VGU_API_CALL __attribute__((visibility("default")))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef VG_API_CALL
|
#ifndef VG_API_CALL
|
||||||
#if defined(OPENVG_STATIC_LIBRARY)
|
#if defined(OPENVG_STATIC_LIBRARY)
|
||||||
# define VG_API_CALL
|
# define VG_API_CALL
|
||||||
#else
|
#else
|
||||||
# if defined(_WIN32) || defined(__VC32__) /* Win32 */
|
# define VG_API_CALL KHRONOS_APICALL
|
||||||
# if defined (OPENVG_DLL_EXPORTS)
|
|
||||||
# define VG_API_CALL __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define VG_API_CALL __declspec(dllimport)
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
# define VG_API_CALL extern
|
|
||||||
# endif /* defined(_WIN32) ||... */
|
|
||||||
#endif /* defined OPENVG_STATIC_LIBRARY */
|
#endif /* defined OPENVG_STATIC_LIBRARY */
|
||||||
#endif /* ifndef VG_API_CALL */
|
#endif /* ifndef VG_API_CALL */
|
||||||
|
|
||||||
@@ -63,15 +52,7 @@ extern "C" {
|
|||||||
#if defined(OPENVG_STATIC_LIBRARY)
|
#if defined(OPENVG_STATIC_LIBRARY)
|
||||||
# define VGU_API_CALL
|
# define VGU_API_CALL
|
||||||
#else
|
#else
|
||||||
# if defined(_WIN32) || defined(__VC32__) /* Win32 */
|
# define VGU_API_CALL KHRONOS_APICALL
|
||||||
# if defined (OPENVG_DLL_EXPORTS)
|
|
||||||
# define VGU_API_CALL __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define VGU_API_CALL __declspec(dllimport)
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
# define VGU_API_CALL extern
|
|
||||||
# endif /* defined(_WIN32) ||... */
|
|
||||||
#endif /* defined OPENVG_STATIC_LIBRARY */
|
#endif /* defined OPENVG_STATIC_LIBRARY */
|
||||||
#endif /* ifndef VGU_API_CALL */
|
#endif /* ifndef VGU_API_CALL */
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user