# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1274785601 -10800 # Node ID 65f103b6ab60440690fe94ffdcb0e13d6c1ab5ca # Parent 5e51caaeeb72dda00e9e04497a5c814bfb2ce2d7 Revision: 201019 Kit: 2010121 diff -r 5e51caaeeb72 -r 65f103b6ab60 graphics_plat/m3g_core_api/inc/M3G/m3g_core.h --- a/graphics_plat/m3g_core_api/inc/M3G/m3g_core.h Tue May 11 17:25:23 2010 +0300 +++ b/graphics_plat/m3g_core_api/inc/M3G/m3g_core.h Tue May 25 14:06:41 2010 +0300 @@ -31,16 +31,18 @@ * binding layer. */ -#if defined (__ARMCC_2_2__) -# define M3G_API __declspec(dllimport) -#endif - -#if defined(M3G_BUILD_DLL) -# define M3G_API __declspec(dllexport) -#endif - -#if !defined(M3G_API) -# define M3G_API +#if (__ARMCC_VERSION >= 220000) +# if defined(M3G_BUILD_DLL) +# define M3G_API __declspec(dllexport) +# else +# define M3G_API __declspec(dllimport) +# endif +#else +# if defined(M3G_BUILD_DLL) +# define M3G_API __declspec(dllexport) +# else +# define M3G_API +# endif #endif /*---------------------------------------------------------------------- @@ -916,7 +918,7 @@ M3G_API M3GCamera m3gGetCamera (M3GRenderContext hCtx); M3G_API void m3gSetAlphaWrite (M3GRenderContext ctx, M3Gbool enable); M3G_API M3Gbool m3gGetAlphaWrite (M3GRenderContext ctx); - +M3G_API void m3gFreeGLESResources (M3GRenderContext ctx); /* -------- SkinnedMesh -------- */