From e1a750672f1219a4fe06fcdd65a3e7a58ed17f48 Mon Sep 17 00:00:00 2001 From: hiker Date: Sun, 15 Jun 2014 22:01:52 +1000 Subject: [PATCH 1/3] Fix #1364. --- src/guiengine/scalable_font.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/guiengine/scalable_font.hpp b/src/guiengine/scalable_font.hpp index 7cf893c46..98962e6d3 100644 --- a/src/guiengine/scalable_font.hpp +++ b/src/guiengine/scalable_font.hpp @@ -5,17 +5,19 @@ #ifndef __C_GUI_FONT_H_INCLUDED__ #define __C_GUI_FONT_H_INCLUDED__ -#include "IrrCompileConfig.h" +#include "utils/leak_check.hpp" +#include "IrrCompileConfig.h" #include "IGUIFontBitmap.h" #include "irrString.h" #include "irrMap.h" #include "IXMLReader.h" #include "IReadFile.h" #include "irrArray.h" -#include -#include "utils/leak_check.hpp" + +#include +#include namespace irr { From f1c8fcc6d427b2ca81494de612958b7579269f63 Mon Sep 17 00:00:00 2001 From: hiker Date: Sun, 15 Jun 2014 22:14:50 +1000 Subject: [PATCH 2/3] Fix 1366. --- data/shaders/sunlightshadow.frag | 1 + 1 file changed, 1 insertion(+) diff --git a/data/shaders/sunlightshadow.frag b/data/shaders/sunlightshadow.frag index 311889ab0..194a68333 100644 --- a/data/shaders/sunlightshadow.frag +++ b/data/shaders/sunlightshadow.frag @@ -16,6 +16,7 @@ uniform mat4 ProjectionMatrix; uniform mat4 InverseViewMatrix; uniform mat4 InverseProjectionMatrix; uniform mat4 ShadowViewProjMatrixes[4]; +uniform vec2 screen; #else layout (std140) uniform MatrixesData { From 9cc34fd76b984df77ae57ddda1b9bce511448547 Mon Sep 17 00:00:00 2001 From: hiker Date: Mon, 16 Jun 2014 09:39:37 +1000 Subject: [PATCH 3/3] Changed order of libraries to hopefully make font_tool compile for Arthur. --- tools/font_tool/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/font_tool/CMakeLists.txt b/tools/font_tool/CMakeLists.txt index a0e58f792..1073b9185 100644 --- a/tools/font_tool/CMakeLists.txt +++ b/tools/font_tool/CMakeLists.txt @@ -14,10 +14,10 @@ if(FONT_TOOL) if(FREETYPE_FOUND) include_directories(${FREETYPE_INCLUDE_DIRS}) add_executable(font_tool CFontTool.cpp main.cpp) + target_link_libraries(font_tool stkirrlicht) target_link_libraries(font_tool ${FREETYPE_LIBRARIES}) target_link_libraries(font_tool ${X11_Xft_LIB} Xxf86vm) target_link_libraries(font_tool ${OPENGL_LIBRARIES}) - target_link_libraries(font_tool stkirrlicht) target_link_libraries(font_tool ${FONTCONFIG_LIBRARY}) else() message(STATUS "Freetype was not found, the font tool won't be built (only useful for developers)")