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

Minor fixes for windows compilation.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2007-11-21 01:31:49 +00:00
parent 41524d6d8a
commit 44f9f6a538
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget.cpp
View File

@ -24,9 +24,13 @@
//FIXME: this should be removed when the scrolling is cleaned
#include "user_config.hpp"
#include "constants.hpp"
#include <cmath>
#include <iostream>
const float Widget::MAX_TEXT_SCALE = 1.2f;
const float Widget::MIN_TEXT_SCALE = 1.0f;
const GLfloat WGT_WHITE [4] = { 1.0f, 1.0f, 1.0f, 1.0f };
const GLfloat WGT_GRAY [4] = { 0.5f, 0.5f, 0.5f, 1.0f };
const GLfloat WGT_BLACK [4] = { 0.0f, 0.0f, 0.0f, 1.0f };

8
src/widget.hpp
View File

@ -27,6 +27,10 @@
#ifdef __APPLE__
# include <OpenGL/gl.h>
#else
# ifdef WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# endif
# include <GL/gl.h>
#endif
@ -115,8 +119,8 @@ class Widget
/* Delta time dependant features, these deactivate after a certain time,
* and are dependant on the delta time. They have animations. */
static const float MAX_TEXT_SCALE = 1.2f;
static const float MIN_TEXT_SCALE = 1.0f;
static const float MAX_TEXT_SCALE;
static const float MIN_TEXT_SCALE;
float m_text_scale; //Used for the pulse effect
/*public:*/