Skip to content

Commit 94be0df

Browse files
committed
Build fixes for new CEGUI
1 parent abc2a2e commit 94be0df

5 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/cegui/CEGUIManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "src/util/Utils.h"
1414
#include "src/Application.h"
1515
#include <CEGUI/CEGUI.h>
16-
#include <CEGUI/FreeTypeFont.h>
16+
#include <CEGUI/text/FreeTypeFont.h>
1717
#include <CEGUI/RendererModules/OpenGL/GLRenderer.h>
1818
#include <CEGUI/RendererModules/OpenGL/GL3Renderer.h>
1919
#include <CEGUI/RendererModules/OpenGL/ViewportTarget.h>
@@ -1124,7 +1124,7 @@ const QtnEnumInfo& CEGUIManager::enumHorizontalTextFormatting()
11241124
values.push_back({static_cast<QtnEnumValueType>(CEGUI::HorizontalTextFormatting::LeftAligned), "LeftAligned", "Left"});
11251125
values.push_back({static_cast<QtnEnumValueType>(CEGUI::HorizontalTextFormatting::RightAligned), "RightAligned", "Right"});
11261126
values.push_back({static_cast<QtnEnumValueType>(CEGUI::HorizontalTextFormatting::CentreAligned), "CentreAligned", "Center"});
1127-
values.push_back({static_cast<QtnEnumValueType>(CEGUI::HorizontalTextFormatting::WordWraperJustified), "WordWraperJustified", "Justified"});
1127+
values.push_back({static_cast<QtnEnumValueType>(CEGUI::HorizontalTextFormatting::WordWrapJustified), "WordWraperJustified", "Justified"});
11281128
values.push_back({static_cast<QtnEnumValueType>(CEGUI::HorizontalTextFormatting::WordWrapLeftAligned), "WordWrapLeftAligned", "Left word-wrapped"});
11291129
values.push_back({static_cast<QtnEnumValueType>(CEGUI::HorizontalTextFormatting::WordWrapRightAligned), "WordWrapRightAligned", "Right word-wrapped"});
11301130
values.push_back({static_cast<QtnEnumValueType>(CEGUI::HorizontalTextFormatting::WordWrapCentreAligned), "WordWrapCentreAligned", "Center word-wrapped"});

src/cegui/CEGUIManipulator.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <CEGUI/widgets/ScrolledContainer.h>
2323
#include <CEGUI/widgets/GridLayoutContainer.h>
2424
#include <CEGUI/WindowManager.h>
25+
#include <CEGUI/GUIContext.h>
2526
#include <CEGUI/CoordConverter.h>
2627
#include "QtnProperty/PropertySet.h"
2728
#include "QtnProperty/Core/PropertyQString.h"

src/cegui/CEGUIUtils.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "src/cegui/CEGUIManager.h" //!!!for OpenGL context! TODO: encapsulate?
33
#include <CEGUI/widgets/GridLayoutContainer.h>
44
#include <CEGUI/CoordConverter.h>
5+
#include <CEGUI/ColourRect.h>
56
#include <CEGUI/WindowManager.h>
67
#include <CEGUI/widgets/TabControl.h>
78
#include <CEGUI/widgets/ButtonBase.h>

src/cegui/QtnPropertyRectf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "QtnProperty/Auxiliary/PropertyTemplates.h"
66
#include <src/cegui/CEGUIUtils.h> // for stream operators and string conversion
77
#include <CEGUI/PropertyHelper.h>
8+
#include <CEGUI/Rectf.h>
89

910
class QtnPropertyRectfBase : public QtnSinglePropertyBaseAs<QtnPropertyQRectFBase, CEGUI::Rectf>
1011
{

src/editors/layout/LayoutPreviewerMode.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "qboxlayout.h"
88
#include <CEGUI/Window.h>
99
#include <CEGUI/WindowManager.h>
10+
#include <CEGUI/GUIContext.h>
1011

1112
LayoutPreviewerMode::LayoutPreviewerMode(LayoutEditor& editor, QWidget* parent)
1213
: QWidget(parent)

0 commit comments

Comments
 (0)