diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-07-29 14:55:39 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-07-29 14:55:39 (GMT) |
| commit | d55222f3131ddb459b238e8ca8f7f93f5ab938dc (patch) | |
| tree | 8dbac124aace8a0dd991fc769d2057304e083eb7 /src | |
| parent | dafb826dbbe5962dda98deddb3e31a160dd60aa7 (diff) | |
| download | mxe-d55222f3131ddb459b238e8ca8f7f93f5ab938dc.zip mxe-d55222f3131ddb459b238e8ca8f7f93f5ab938dc.tar.gz mxe-d55222f3131ddb459b238e8ca8f7f93f5ab938dc.tar.bz2 | |
cegui: fix test and miminise invocation
Diffstat (limited to 'src')
| -rw-r--r-- | src/cegui-test.cpp | 6 | ||||
| -rw-r--r-- | src/cegui.mk | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/cegui-test.cpp b/src/cegui-test.cpp index 36b5bf3..1249f81 100644 --- a/src/cegui-test.cpp +++ b/src/cegui-test.cpp @@ -8,9 +8,9 @@ * and makes CEGUI draw an "in-game" window into it. ************************************************/ -#include <GL/freeglut.h> #include <CEGUI/CEGUI.h> #include <CEGUI/RendererModules/OpenGL/GLRenderer.h> +#include <GL/freeglut.h> // We’re lazy using namespace CEGUI; @@ -65,11 +65,11 @@ int main(int argc, char* argv[]) // Create the hypothetical CEGUI root window Window* p_root_window = WindowManager::getSingleton().createWindow("DefaultWindow", "root"); - gui_context.setRootWindow(p_rootwindow); + gui_context.setRootWindow(p_root_window); // Create an actual framed window we can look onto FrameWindow* p_frame_window = static_cast<FrameWindow*>(WindowManager::getSingleton().createWindow("TaharezLook/FrameWindow", "testWindow")); - p_root_window->addChildWindow(p_frame_window); + p_root_window->addChild(p_frame_window); p_frame_window->setPosition(UVector2(UDim(0.25f, 0), UDim(0.25f, 0))); p_frame_window->setSize(USize(UDim(0.5f, 0), UDim(0.5f, 0))); p_frame_window->setText("Hello World!"); diff --git a/src/cegui.mk b/src/cegui.mk index eb4781a..9bc23da 100644 --- a/src/cegui.mk +++ b/src/cegui.mk @@ -68,9 +68,7 @@ define $(PKG)_BUILD '$(TARGET)-g++' \ -W -Wall -ansi -pedantic \ '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-cegui.exe' \ - `$(TARGET)-pkg-config --cflags --libs CEGUI-0-OPENGL glut freetype2 libpcre` \ - -lCEGUIFreeImageImageCodec -lCEGUIXercesParser -lCEGUICoreWindowRendererSet \ - `$(TARGET)-pkg-config --libs --cflags freeimage xerces-c` + `$(TARGET)-pkg-config --cflags --libs CEGUI-0-OPENGL glut gl` endef $(PKG)_BUILD_x86_64-w64-mingw32 = |