summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2014-12-23 01:02:33 -0500
committerkwolekr <kwolekr@minetest.net>2014-12-23 01:09:50 -0500
commit565959db860ddfbfdb996a6d4e796abd5cf08d22 (patch)
tree81ba13323b8237725910a4bbfbcc7b97ebb4e4fa
parent7b93408884336345dbe8779aaabcf46a51a3d257 (diff)
downloadminetest-565959db860ddfbfdb996a6d4e796abd5cf08d22.tar.gz
minetest-565959db860ddfbfdb996a6d4e796abd5cf08d22.tar.bz2
minetest-565959db860ddfbfdb996a6d4e796abd5cf08d22.zip
Silence misc. warnings
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/wieldmesh.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2fc30b842..47fa5e216 100644
--- 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 1c0d0da9c..bde0b72af 100644
--- 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);