Silence misc. warnings

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2fc30b842c0c62f92e048053c4836ff5a7c37673..47fa5e2166509fe4a09e1e6e462d8a59710eaf09 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -643,6 +643,11 @@ else()
                if(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
                        set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
                endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
+
+               CHECK_CXX_COMPILER_FLAG("-Wno-type-limits" HAS_TYPE_LIMITS_WARNING)
+               if(HAS_TYPE_LIMITS_WARNING)
+                       set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-type-limits")
+               endif(HAS_TYPE_LIMITS_WARNING)
        endif()
 
        if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp
index 1c0d0da9cc0d8ed46d0a6a177b783f05739ebe82..bde0b72afe9f0e69ac92850e59f31dbc79dd2633 100644 (file)
--- a/src/wieldmesh.cpp
+++ b/src/wieldmesh.cpp
@@ -304,7 +304,7 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, IGameDef *gamedef)
 {
        ITextureSource *tsrc = gamedef->getTextureSource();
        IItemDefManager *idef = gamedef->getItemDefManager();
-       IShaderSource *shdrsrc = gamedef->getShaderSource();
+       //IShaderSource *shdrsrc = gamedef->getShaderSource();
        INodeDefManager *ndef = gamedef->getNodeDefManager();
        const ItemDefinition &def = item.getDefinition(idef);
        const ContentFeatures &f = ndef->get(def.name);