diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-04-30 00:25:13 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-04-30 00:27:13 +0200 |
| commit | 504573a2d336495a9e754d2ee96ba95de450fd6c (patch) | |
| tree | b298798c9bbdc301afd42d9cf048376573b9c8d9 | |
| parent | ac164afa0954e28b521dc6b19d2ccf0320cc8ed1 (diff) | |
| download | usdx-504573a2d336495a9e754d2ee96ba95de450fd6c.tar.gz usdx-504573a2d336495a9e754d2ee96ba95de450fd6c.tar.xz usdx-504573a2d336495a9e754d2ee96ba95de450fd6c.zip | |
fix problems with gcc >= 4.7
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rw-r--r-- | src/menu/static_rectangle.cpp | 6 | ||||
| -rw-r--r-- | src/menu/vertical_text_alignment.hpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.inc b/Makefile.inc index 661da8b8..6d4fb05a 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -20,7 +20,7 @@ FTGL_CFLAGS:=$(shell $(PKG_CONFIG) ftgl --cflags) # LDFLAGS SQLITE_LDFLAGS:=-lsqlite3 LOG4CPP_LDFLAGS:=$(shell $(LOG4CPP_CONFIG) --libs) -BOOST_LDFLAGS:=-lboost_program_options-mt -lboost_filesystem-mt -lboost_thread-mt +BOOST_LDFLAGS:=-lboost_program_options-mt -lboost_filesystem-mt -lboost_thread-mt -lboost_system-mt SDL_LDFLAGS:=-lSDL -lSDL_image -lSDL_gfx GL_LDFLAGS:=-lGL FTGL_LDFLAGS:=$(shell $(PKG_CONFIG) ftgl --libs) diff --git a/src/menu/static_rectangle.cpp b/src/menu/static_rectangle.cpp index 9df6dc5b..83cf6487 100644 --- a/src/menu/static_rectangle.cpp +++ b/src/menu/static_rectangle.cpp @@ -31,9 +31,9 @@ namespace usdx : Static(stroke) { GLfloat vertices[] = {0, 0, - size.get_width(), 0, - size.get_width(), size.get_height(), - 0, size.get_height()}; + (float)size.get_width(), 0, + (float)size.get_width(), (float)size.get_height(), + 0, (float)size.get_height()}; this->register_vertices(vertices, 4); } diff --git a/src/menu/vertical_text_alignment.hpp b/src/menu/vertical_text_alignment.hpp index ec81d5f9..a417df9f 100644 --- a/src/menu/vertical_text_alignment.hpp +++ b/src/menu/vertical_text_alignment.hpp @@ -33,6 +33,8 @@ namespace usdx class VerticalTextAlignment { public: + virtual ~VerticalTextAlignment() {}; + /** * This function should be used to align a text vertical in a box. * |