Add export specifier to objects in GraphicsDefs and make them const. Fixes #621.

Source/Urho3D/Graphics/GraphicsDefs.cpp

@@ -21,6 +21,7 @@
 //
 
 #include "Precompiled.h"
+#include "../Graphics/GraphicsDefs.h"
 #include "../Math/StringHash.h"
 #include "../Math/Vector3.h"
 
@@ -29,65 +30,65 @@
 namespace Urho3D
 {
 
-StringHash VSP_AMBIENTSTARTCOLOR("AmbientStartColor");
-StringHash VSP_AMBIENTENDCOLOR("AmbientEndColor");
-StringHash VSP_BILLBOARDROT("BillboardRot");
-StringHash VSP_CAMERAPOS("CameraPos");
-StringHash VSP_CAMERAROT("CameraRot");
-StringHash VSP_NEARCLIP("NearClip");
-StringHash VSP_FARCLIP("FarClip");
-StringHash VSP_DEPTHMODE("DepthMode");
-StringHash VSP_DELTATIME("DeltaTime");
-StringHash VSP_ELAPSEDTIME("ElapsedTime");
-StringHash VSP_FRUSTUMSIZE("FrustumSize");
-StringHash VSP_GBUFFEROFFSETS("GBufferOffsets");
-StringHash VSP_LIGHTDIR("LightDir");
-StringHash VSP_LIGHTPOS("LightPos");
-StringHash VSP_MODEL("Model");
-StringHash VSP_VIEWPROJ("ViewProj");
-StringHash VSP_UOFFSET("UOffset");
-StringHash VSP_VOFFSET("VOffset");
-StringHash VSP_ZONE("Zone");
-StringHash VSP_LIGHTMATRICES("LightMatrices");
-StringHash VSP_SKINMATRICES("SkinMatrices");
-StringHash VSP_VERTEXLIGHTS("VertexLights");
-StringHash PSP_AMBIENTCOLOR("AmbientColor");
-StringHash PSP_CAMERAPOS("CameraPosPS");
-StringHash PSP_DELTATIME("DeltaTimePS");
-StringHash PSP_DEPTHRECONSTRUCT("DepthReconstruct");
-StringHash PSP_ELAPSEDTIME("ElapsedTimePS");
-StringHash PSP_FOGCOLOR("FogColor");
-StringHash PSP_FOGPARAMS("FogParams");
-StringHash PSP_GBUFFERINVSIZE("GBufferInvSize");
-StringHash PSP_LIGHTCOLOR("LightColor");
-StringHash PSP_LIGHTDIR("LightDirPS");
-StringHash PSP_LIGHTPOS("LightPosPS");
-StringHash PSP_MATDIFFCOLOR("MatDiffColor");
-StringHash PSP_MATEMISSIVECOLOR("MatEmissiveColor");
-StringHash PSP_MATENVMAPECOLOR("MatEnvMapColor");
-StringHash PSP_MATSPECCOLOR("MatSpecColor");
-StringHash PSP_NEARCLIP("NearClipPS");
-StringHash PSP_FARCLIP("FarClipPS");
-StringHash PSP_SHADOWCUBEADJUST("ShadowCubeAdjust");
-StringHash PSP_SHADOWDEPTHFADE("ShadowDepthFade");
-StringHash PSP_SHADOWINTENSITY("ShadowIntensity");
-StringHash PSP_SHADOWMAPINVSIZE("ShadowMapInvSize");
-StringHash PSP_SHADOWSPLITS("ShadowSplits");
-StringHash PSP_LIGHTMATRICES("LightMatricesPS");
+URHO3D_API const StringHash VSP_AMBIENTSTARTCOLOR("AmbientStartColor");
+URHO3D_API const StringHash VSP_AMBIENTENDCOLOR("AmbientEndColor");
+URHO3D_API const StringHash VSP_BILLBOARDROT("BillboardRot");
+URHO3D_API const StringHash VSP_CAMERAPOS("CameraPos");
+URHO3D_API const StringHash VSP_CAMERAROT("CameraRot");
+URHO3D_API const StringHash VSP_NEARCLIP("NearClip");
+URHO3D_API const StringHash VSP_FARCLIP("FarClip");
+URHO3D_API const StringHash VSP_DEPTHMODE("DepthMode");
+URHO3D_API const StringHash VSP_DELTATIME("DeltaTime");
+URHO3D_API const StringHash VSP_ELAPSEDTIME("ElapsedTime");
+URHO3D_API const StringHash VSP_FRUSTUMSIZE("FrustumSize");
+URHO3D_API const StringHash VSP_GBUFFEROFFSETS("GBufferOffsets");
+URHO3D_API const StringHash VSP_LIGHTDIR("LightDir");
+URHO3D_API const StringHash VSP_LIGHTPOS("LightPos");
+URHO3D_API const StringHash VSP_MODEL("Model");
+URHO3D_API const StringHash VSP_VIEWPROJ("ViewProj");
+URHO3D_API const StringHash VSP_UOFFSET("UOffset");
+URHO3D_API const StringHash VSP_VOFFSET("VOffset");
+URHO3D_API const StringHash VSP_ZONE("Zone");
+URHO3D_API const StringHash VSP_LIGHTMATRICES("LightMatrices");
+URHO3D_API const StringHash VSP_SKINMATRICES("SkinMatrices");
+URHO3D_API const StringHash VSP_VERTEXLIGHTS("VertexLights");
+URHO3D_API const StringHash PSP_AMBIENTCOLOR("AmbientColor");
+URHO3D_API const StringHash PSP_CAMERAPOS("CameraPosPS");
+URHO3D_API const StringHash PSP_DELTATIME("DeltaTimePS");
+URHO3D_API const StringHash PSP_DEPTHRECONSTRUCT("DepthReconstruct");
+URHO3D_API const StringHash PSP_ELAPSEDTIME("ElapsedTimePS");
+URHO3D_API const StringHash PSP_FOGCOLOR("FogColor");
+URHO3D_API const StringHash PSP_FOGPARAMS("FogParams");
+URHO3D_API const StringHash PSP_GBUFFERINVSIZE("GBufferInvSize");
+URHO3D_API const StringHash PSP_LIGHTCOLOR("LightColor");
+URHO3D_API const StringHash PSP_LIGHTDIR("LightDirPS");
+URHO3D_API const StringHash PSP_LIGHTPOS("LightPosPS");
+URHO3D_API const StringHash PSP_MATDIFFCOLOR("MatDiffColor");
+URHO3D_API const StringHash PSP_MATEMISSIVECOLOR("MatEmissiveColor");
+URHO3D_API const StringHash PSP_MATENVMAPECOLOR("MatEnvMapColor");
+URHO3D_API const StringHash PSP_MATSPECCOLOR("MatSpecColor");
+URHO3D_API const StringHash PSP_NEARCLIP("NearClipPS");
+URHO3D_API const StringHash PSP_FARCLIP("FarClipPS");
+URHO3D_API const StringHash PSP_SHADOWCUBEADJUST("ShadowCubeAdjust");
+URHO3D_API const StringHash PSP_SHADOWDEPTHFADE("ShadowDepthFade");
+URHO3D_API const StringHash PSP_SHADOWINTENSITY("ShadowIntensity");
+URHO3D_API const StringHash PSP_SHADOWMAPINVSIZE("ShadowMapInvSize");
+URHO3D_API const StringHash PSP_SHADOWSPLITS("ShadowSplits");
+URHO3D_API const StringHash PSP_LIGHTMATRICES("LightMatricesPS");
 
-StringHash PASS_BASE("base");
-StringHash PASS_LITBASE("litbase");
-StringHash PASS_LIGHT("light");
-StringHash PASS_ALPHA("alpha");
-StringHash PASS_LITALPHA("litalpha");
-StringHash PASS_SHADOW("shadow");
-StringHash PASS_DEFERRED("deferred");
-StringHash PASS_PREPASS("prepass");
-StringHash PASS_MATERIAL("material");
-StringHash PASS_POSTOPAQUE("postopaque");
-StringHash PASS_REFRACT("refract");
-StringHash PASS_POSTALPHA("postalpha");
+URHO3D_API const StringHash PASS_BASE("base");
+URHO3D_API const StringHash PASS_LITBASE("litbase");
+URHO3D_API const StringHash PASS_LIGHT("light");
+URHO3D_API const StringHash PASS_ALPHA("alpha");
+URHO3D_API const StringHash PASS_LITALPHA("litalpha");
+URHO3D_API const StringHash PASS_SHADOW("shadow");
+URHO3D_API const StringHash PASS_DEFERRED("deferred");
+URHO3D_API const StringHash PASS_PREPASS("prepass");
+URHO3D_API const StringHash PASS_MATERIAL("material");
+URHO3D_API const StringHash PASS_POSTOPAQUE("postopaque");
+URHO3D_API const StringHash PASS_REFRACT("refract");
+URHO3D_API const StringHash PASS_POSTALPHA("postalpha");
 
-Vector3 DOT_SCALE(1 / 3.0f, 1 / 3.0f, 1 / 3.0f);
+URHO3D_API const Vector3 DOT_SCALE(1 / 3.0f, 1 / 3.0f, 1 / 3.0f);
 
 }

Source/Urho3D/Graphics/GraphicsDefs.h

@@ -260,68 +260,68 @@ enum FaceCameraMode
 };
 
 // Inbuilt shader parameters.
-extern StringHash VSP_AMBIENTSTARTCOLOR;
-extern StringHash VSP_AMBIENTENDCOLOR;
-extern StringHash VSP_BILLBOARDROT;
-extern StringHash VSP_CAMERAPOS;
-extern StringHash VSP_CAMERAROT;
-extern StringHash VSP_NEARCLIP;
-extern StringHash VSP_FARCLIP;
-extern StringHash VSP_DEPTHMODE;
-extern StringHash VSP_DELTATIME;
-extern StringHash VSP_ELAPSEDTIME;
-extern StringHash VSP_FRUSTUMSIZE;
-extern StringHash VSP_GBUFFEROFFSETS;
-extern StringHash VSP_LIGHTDIR;
-extern StringHash VSP_LIGHTPOS;
-extern StringHash VSP_MODEL;
-extern StringHash VSP_VIEWPROJ;
-extern StringHash VSP_UOFFSET;
-extern StringHash VSP_VOFFSET;
-extern StringHash VSP_ZONE;
-extern StringHash VSP_LIGHTMATRICES;
-extern StringHash VSP_SKINMATRICES;
-extern StringHash VSP_VERTEXLIGHTS;
-extern StringHash PSP_AMBIENTCOLOR;
-extern StringHash PSP_CAMERAPOS;
-extern StringHash PSP_DELTATIME;
-extern StringHash PSP_DEPTHRECONSTRUCT;
-extern StringHash PSP_ELAPSEDTIME;
-extern StringHash PSP_FOGCOLOR;
-extern StringHash PSP_FOGPARAMS;
-extern StringHash PSP_GBUFFERINVSIZE;
-extern StringHash PSP_LIGHTCOLOR;
-extern StringHash PSP_LIGHTDIR;
-extern StringHash PSP_LIGHTPOS;
-extern StringHash PSP_MATDIFFCOLOR;
-extern StringHash PSP_MATEMISSIVECOLOR;
-extern StringHash PSP_MATENVMAPCOLOR;
-extern StringHash PSP_MATSPECCOLOR;
-extern StringHash PSP_NEARCLIP;
-extern StringHash PSP_FARCLIP;
-extern StringHash PSP_SHADOWCUBEADJUST;
-extern StringHash PSP_SHADOWDEPTHFADE;
-extern StringHash PSP_SHADOWINTENSITY;
-extern StringHash PSP_SHADOWMAPINVSIZE;
-extern StringHash PSP_SHADOWSPLITS;
-extern StringHash PSP_LIGHTMATRICES;
+URHO3D_API extern const StringHash VSP_AMBIENTSTARTCOLOR;
+URHO3D_API extern const StringHash VSP_AMBIENTENDCOLOR;
+URHO3D_API extern const StringHash VSP_BILLBOARDROT;
+URHO3D_API extern const StringHash VSP_CAMERAPOS;
+URHO3D_API extern const StringHash VSP_CAMERAROT;
+URHO3D_API extern const StringHash VSP_NEARCLIP;
+URHO3D_API extern const StringHash VSP_FARCLIP;
+URHO3D_API extern const StringHash VSP_DEPTHMODE;
+URHO3D_API extern const StringHash VSP_DELTATIME;
+URHO3D_API extern const StringHash VSP_ELAPSEDTIME;
+URHO3D_API extern const StringHash VSP_FRUSTUMSIZE;
+URHO3D_API extern const StringHash VSP_GBUFFEROFFSETS;
+URHO3D_API extern const StringHash VSP_LIGHTDIR;
+URHO3D_API extern const StringHash VSP_LIGHTPOS;
+URHO3D_API extern const StringHash VSP_MODEL;
+URHO3D_API extern const StringHash VSP_VIEWPROJ;
+URHO3D_API extern const StringHash VSP_UOFFSET;
+URHO3D_API extern const StringHash VSP_VOFFSET;
+URHO3D_API extern const StringHash VSP_ZONE;
+URHO3D_API extern const StringHash VSP_LIGHTMATRICES;
+URHO3D_API extern const StringHash VSP_SKINMATRICES;
+URHO3D_API extern const StringHash VSP_VERTEXLIGHTS;
+URHO3D_API extern const StringHash PSP_AMBIENTCOLOR;
+URHO3D_API extern const StringHash PSP_CAMERAPOS;
+URHO3D_API extern const StringHash PSP_DELTATIME;
+URHO3D_API extern const StringHash PSP_DEPTHRECONSTRUCT;
+URHO3D_API extern const StringHash PSP_ELAPSEDTIME;
+URHO3D_API extern const StringHash PSP_FOGCOLOR;
+URHO3D_API extern const StringHash PSP_FOGPARAMS;
+URHO3D_API extern const StringHash PSP_GBUFFERINVSIZE;
+URHO3D_API extern const StringHash PSP_LIGHTCOLOR;
+URHO3D_API extern const StringHash PSP_LIGHTDIR;
+URHO3D_API extern const StringHash PSP_LIGHTPOS;
+URHO3D_API extern const StringHash PSP_MATDIFFCOLOR;
+URHO3D_API extern const StringHash PSP_MATEMISSIVECOLOR;
+URHO3D_API extern const StringHash PSP_MATENVMAPCOLOR;
+URHO3D_API extern const StringHash PSP_MATSPECCOLOR;
+URHO3D_API extern const StringHash PSP_NEARCLIP;
+URHO3D_API extern const StringHash PSP_FARCLIP;
+URHO3D_API extern const StringHash PSP_SHADOWCUBEADJUST;
+URHO3D_API extern const StringHash PSP_SHADOWDEPTHFADE;
+URHO3D_API extern const StringHash PSP_SHADOWINTENSITY;
+URHO3D_API extern const StringHash PSP_SHADOWMAPINVSIZE;
+URHO3D_API extern const StringHash PSP_SHADOWSPLITS;
+URHO3D_API extern const StringHash PSP_LIGHTMATRICES;
 
 // Inbuilt pass types
-extern StringHash PASS_BASE;
-extern StringHash PASS_LITBASE;
-extern StringHash PASS_LIGHT;
-extern StringHash PASS_ALPHA;
-extern StringHash PASS_LITALPHA;
-extern StringHash PASS_SHADOW;
-extern StringHash PASS_DEFERRED;
-extern StringHash PASS_PREPASS;
-extern StringHash PASS_MATERIAL;
-extern StringHash PASS_POSTOPAQUE;
-extern StringHash PASS_REFRACT;
-extern StringHash PASS_POSTALPHA;
+URHO3D_API extern const StringHash PASS_BASE;
+URHO3D_API extern const StringHash PASS_LITBASE;
+URHO3D_API extern const StringHash PASS_LIGHT;
+URHO3D_API extern const StringHash PASS_ALPHA;
+URHO3D_API extern const StringHash PASS_LITALPHA;
+URHO3D_API extern const StringHash PASS_SHADOW;
+URHO3D_API extern const StringHash PASS_DEFERRED;
+URHO3D_API extern const StringHash PASS_PREPASS;
+URHO3D_API extern const StringHash PASS_MATERIAL;
+URHO3D_API extern const StringHash PASS_POSTOPAQUE;
+URHO3D_API extern const StringHash PASS_REFRACT;
+URHO3D_API extern const StringHash PASS_POSTALPHA;
 
 // Scale calculation from bounding box diagonal.
-extern Vector3 DOT_SCALE;
+URHO3D_API extern const Vector3 DOT_SCALE;
 
 static const int QUALITY_LOW = 0;
 static const int QUALITY_MEDIUM = 1;