Skip to content

Commit

Permalink
Merge pull request #452 from ace13/patch-1
Browse files Browse the repository at this point in the history
Fix build when using new boost with Ogre.
  • Loading branch information
scrawl committed Jan 23, 2015
2 parents c65f9cb + 942cf26 commit 4db6c22
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 3 additions & 0 deletions apps/launcher/graphicspage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@

#include <SDL.h>

#include <OgreRoot.h>
#include <OgreRenderSystem.h>

#include <boost/math/common_factor.hpp>

#include <components/files/configurationmanager.hpp>
Expand Down
5 changes: 1 addition & 4 deletions apps/launcher/graphicspage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@

#include <QWidget>

#include <OgreRoot.h>
#include <OgreRenderSystem.h>

#include <components/ogreinit/ogreinit.hpp>


#include "ui_graphicspage.h"

namespace Ogre { class Root; class RenderSystem; }

namespace Files { struct ConfigurationManager; }

Expand Down

0 comments on commit 4db6c22

Please sign in to comment.