Skip to content
Browse files

Merge branch 'master' of https://github.com/supertuxkart/stk-code

  • Loading branch information...
2 parents f8f0a46 + 9cc34fd commit 6175d9f5bbe38d208683ecb75017708dbcd4893e @samuncle samuncle committed Jun 16, 2014
Showing with 7 additions and 4 deletions.
  1. +1 −0 data/shaders/sunlightshadow.frag
  2. +5 −3 src/guiengine/scalable_font.hpp
  3. +1 −1 tools/font_tool/CMakeLists.txt
View
1 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
{
View
8 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 <map>
-#include "utils/leak_check.hpp"
+
+#include <map>
+#include <string>
namespace irr
{
View
2 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)")

0 comments on commit 6175d9f

Please sign in to comment.
Something went wrong with that request. Please try again.