ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
samuncle 2014-06-16 02:46:32 +02:00
commit 6175d9f5bb
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/shaders/sunlightshadow.frag
View File

@ -16,6 +16,7 @@ uniform mat4 ProjectionMatrix;
uniform mat4 InverseViewMatrix; uniform mat4 InverseViewMatrix;
uniform mat4 InverseProjectionMatrix; uniform mat4 InverseProjectionMatrix;
uniform mat4 ShadowViewProjMatrixes[4]; uniform mat4 ShadowViewProjMatrixes[4];
uniform vec2 screen;
#else #else
layout (std140) uniform MatrixesData layout (std140) uniform MatrixesData
{ {

8
src/guiengine/scalable_font.hpp
View File

@ -5,17 +5,19 @@
#ifndef __C_GUI_FONT_H_INCLUDED__ #ifndef __C_GUI_FONT_H_INCLUDED__
#define __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 "IGUIFontBitmap.h"
#include "irrString.h" #include "irrString.h"
#include "irrMap.h" #include "irrMap.h"
#include "IXMLReader.h" #include "IXMLReader.h"
#include "IReadFile.h" #include "IReadFile.h"
#include "irrArray.h" #include "irrArray.h"
#include <map>
#include "utils/leak_check.hpp"
#include <map>
#include <string>
namespace irr namespace irr
{ {

2
tools/font_tool/CMakeLists.txt
View File

@ -14,10 +14,10 @@ if(FONT_TOOL)
if(FREETYPE_FOUND) if(FREETYPE_FOUND)
include_directories(${FREETYPE_INCLUDE_DIRS}) include_directories(${FREETYPE_INCLUDE_DIRS})
add_executable(font_tool CFontTool.cpp main.cpp) 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 ${FREETYPE_LIBRARIES})
target_link_libraries(font_tool ${X11_Xft_LIB} Xxf86vm) target_link_libraries(font_tool ${X11_Xft_LIB} Xxf86vm)
target_link_libraries(font_tool ${OPENGL_LIBRARIES}) target_link_libraries(font_tool ${OPENGL_LIBRARIES})
target_link_libraries(font_tool stkirrlicht)
target_link_libraries(font_tool ${FONTCONFIG_LIBRARY}) target_link_libraries(font_tool ${FONTCONFIG_LIBRARY})
else() else()
message(STATUS "Freetype was not found, the font tool won't be built (only useful for developers)") message(STATUS "Freetype was not found, the font tool won't be built (only useful for developers)")