More compilation fixup

codereader · Feb 4, 2017 · de00ea5 · de00ea5
1 parent 8176ff8
commit de00ea5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -176,6 +176,11 @@ AC_CHECK_LIB([dl], [main],
              [AC_MSG_ERROR([DL library not found])])
 AC_SUBST([DL_LIBS])
 
+AC_CHECK_LIB([intl], [main],
+             [INTL_LIBS='-lintl'],
+             [AC_MSG_ERROR([intl library not found])])
+AC_SUBST([INTL_LIBS])
+
 # Dependent Boost headers
 AC_CHECK_HEADER([boost/serialization/access.hpp], [],
                 [AC_MSG_ERROR([Boost.Serialization headers not found])])

diff --git a/plugins/scenegraph/SceneGraphFactory.cpp b/plugins/scenegraph/SceneGraphFactory.cpp
@@ -8,7 +8,7 @@ namespace scene
 
 GraphPtr SceneGraphFactory::createSceneGraph()
 {
-	return GraphPtr(new SceneGraph);
+	return std::make_shared<SceneGraph>();
 }
 
 const std::string& SceneGraphFactory::getName() const

diff --git a/plugins/uimanager/animationpreview/AnimationPreview.cpp b/plugins/uimanager/animationpreview/AnimationPreview.cpp
@@ -148,7 +148,7 @@ void AnimationPreview::setupSceneGraph()
 {
 	RenderPreview::setupSceneGraph();
 
-    _root.reset(new scene::BasicRootNode);
+    _root = std::make_shared<scene::BasicRootNode>();
 
 	_entity = GlobalEntityCreator().createEntity(
 		GlobalEntityClassManager().findClass(FUNC_STATIC_CLASS)

diff --git a/plugins/uimanager/colourscheme/ColourScheme.h b/plugins/uimanager/colourscheme/ColourScheme.h
@@ -31,7 +31,7 @@ class ColourItem :
     {}
 };
 
-typedef std::map<const std::string, ColourItem> ColourItemMap;
+typedef std::map<std::string, ColourItem> ColourItemMap;
 
 /*  A colourscheme is basically a collection of ColourItems
  */

diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -20,6 +20,7 @@ darkradiant_LDFLAGS = $(XML_LIBS) \
                       $(BOOST_SYSTEM_LIBS) \
                       $(BOOST_REGEX_LIBS) \
                       $(DL_LIBS) \
+                      $(INTL_LIBS) \
                       $(WX_LIBS)
 darkradiant_LDADD = $(top_builddir)/libs/scene/libscenegraph.la \
                     $(top_builddir)/libs/wxutil/libwxutil.la \