Skip to content

Commit

Permalink
Adjust VC++ solution now that most modules reside within the main bin…
Browse files Browse the repository at this point in the history
…ary, remove all unused vcxproj files.

Fix compilation in UIManager, since it was still using boost headers.
Retarget the solution to Win10 SDK, not sure if this will cause problems with older OS versions.
  • Loading branch information
codereader committed Mar 9, 2019
1 parent 609ed5c commit 8a5ed86
Show file tree
Hide file tree
Showing 63 changed files with 2,024 additions and 6,971 deletions.
8 changes: 4 additions & 4 deletions radiant/uimanager/UIManager.cpp
Expand Up @@ -19,7 +19,7 @@

#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <boost/make_shared.hpp>
#include <memory>

namespace ui
{
Expand Down Expand Up @@ -99,9 +99,9 @@ void UIManager::initialiseModule(const ApplicationContext& ctx)

_dialogManager = DialogManagerPtr(new DialogManager);

_menuManager = boost::make_shared<MenuManager>();
_menuManager = std::make_shared<MenuManager>();
_menuManager->loadFromRegistry();
_toolbarManager = boost::make_shared<ToolbarManager>();
_toolbarManager = std::make_shared<ToolbarManager>();
_toolbarManager->initialise();
ColourSchemeManager::Instance().loadColourSchemes();

Expand All @@ -116,7 +116,7 @@ void UIManager::initialiseModule(const ApplicationContext& ctx)
);

// Add the statusbar command text item
_statusBarManager = boost::make_shared<StatusBarManager>();
_statusBarManager = std::make_shared<StatusBarManager>();
_statusBarManager->addTextElement(
STATUSBAR_COMMAND,
"", // no icon
Expand Down
8 changes: 4 additions & 4 deletions radiant/uimanager/UIManager.h
Expand Up @@ -11,7 +11,7 @@
#include "DialogManager.h"
#include "colourscheme/ColourSchemeManager.h"

#include <boost/shared_ptr.hpp>
#include <memory>

namespace ui
{
Expand All @@ -24,9 +24,9 @@ class UIManager :
{
// Sub-manager classes, constructed in initialiseModule to avoid being
// called before the main window is ready.
boost::shared_ptr<MenuManager> _menuManager;
boost::shared_ptr<ToolbarManager> _toolbarManager;
boost::shared_ptr<StatusBarManager> _statusBarManager;
std::shared_ptr<MenuManager> _menuManager;
std::shared_ptr<ToolbarManager> _toolbarManager;
std::shared_ptr<StatusBarManager> _statusBarManager;
DialogManagerPtr _dialogManager;

LocalBitmapArtProvider* _bitmapArtProvider;
Expand Down
4 changes: 2 additions & 2 deletions radiant/vfs/Doom3FileSystemModule.cpp
@@ -1,5 +1,5 @@
#include "radiant/vfs/Doom3FileSystem.h"
#include "radiant/modulesystem/StaticModule.h"
#include "vfs/Doom3FileSystem.h"
#include "modulesystem/StaticModule.h"

namespace vfs
{
Expand Down
285 changes: 0 additions & 285 deletions tools/msvc/DarkRadiant.sln

Large diffs are not rendered by default.

778 changes: 770 additions & 8 deletions tools/msvc/DarkRadiant.vcxproj

Large diffs are not rendered by default.

0 comments on commit 8a5ed86

Please sign in to comment.