#5127: Linux build fixes

codereader · Jan 3, 2021 · 3cb6975 · 3cb6975
1 parent 73b32d0
commit 3cb6975
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/libs/wxutil/CMakeLists.txt b/libs/wxutil/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_library(wxutil
             ConsoleView.cpp
+            dataview/KeyValueTable.cpp
             dataview/ResourceTreeView.cpp
             dataview/ThreadedResourceTreePopulator.cpp
             dataview/TreeModel.cpp
@@ -16,7 +17,6 @@ add_library(wxutil
             FileChooser.cpp
             FreezePointer.cpp
             GLWidget.cpp
-            KeyValueTable.cpp
             menu/PopupMenu.cpp
             ModalProgressDialog.cpp
             MouseToolHandler.cpp

diff --git a/radiant/ui/mediabrowser/MediaBrowserTreeView.cpp b/radiant/ui/mediabrowser/MediaBrowserTreeView.cpp
@@ -1,5 +1,6 @@
 #include "MediaBrowserTreeView.h"
 
+#include <map>
 #include "i18n.h"
 #include "ifavourites.h"
 #include "iuimanager.h"
@@ -63,7 +64,7 @@ struct ShaderNameFunctor
 
     // Maps of names to corresponding treemodel items, for both intermediate
     // paths and explicitly presented paths
-    typedef std::map<std::string, wxDataViewItem, ShaderNameCompareFunctor> NamedIterMap;
+    using NamedIterMap = std::map<std::string, wxDataViewItem, ShaderNameCompareFunctor>;
     NamedIterMap _iters;
 
     wxIcon _folderIcon;

diff --git a/radiantcore/decl/FavouriteSet.h b/radiantcore/decl/FavouriteSet.h
@@ -2,6 +2,7 @@
 
 #include <string>
 #include <set>
+#include "iregistry.h"
 
 namespace decl
 {

diff --git a/radiantcore/decl/FavouritesManager.h b/radiantcore/decl/FavouritesManager.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <map>
 #include "ifavourites.h"
 #include "FavouriteSet.h"