diff --git a/src/gpu/texture.cpp b/src/gpu/texture.cpp index 81d0d91a..654de2e3 100644 --- a/src/gpu/texture.cpp +++ b/src/gpu/texture.cpp @@ -66,7 +66,7 @@ static GLenum const TEXTURE_TYPE = GL_UNSIGNED_INT_8_8_8_8_REV; static GLint const INTERNAL_FORMAT = GL_RGBA; static GLenum const TEXTURE_FORMAT = GL_RGBA; static GLenum const TEXTURE_TYPE = GL_UNSIGNED_BYTE; -#else +#elif !defined USE_D3D9 && !defined _XBOX /* Seems efficient for little endian textures */ static GLint const INTERNAL_FORMAT = GL_RGBA; static GLenum const TEXTURE_FORMAT = GL_BGRA; diff --git a/tutorial/11_fractal.cpp b/tutorial/11_fractal.cpp index 1316fc8f..eb8394c4 100644 --- a/tutorial/11_fractal.cpp +++ b/tutorial/11_fractal.cpp @@ -13,10 +13,15 @@ #endif #include +#include #include "core.h" #include "loldebug.h" +#if defined _WIN32 +# include +#endif + using namespace lol; extern char const *lolfx_11_fractal; @@ -279,17 +284,17 @@ public: #if !defined __native_client__ char buf[256]; - sprintf(buf, "center: "); + std::sprintf(buf, "center: "); m_center.x.sprintf(buf + strlen(buf), 30); - sprintf(buf + strlen(buf), " "); + std::sprintf(buf + strlen(buf), " "); m_center.y.sprintf(buf + strlen(buf), 30); m_centertext->SetText(buf); - sprintf(buf, " mouse: "); + std::sprintf(buf, " mouse: "); worldmouse.x.sprintf(buf + strlen(buf), 30); - sprintf(buf + strlen(buf), " "); + std::sprintf(buf + strlen(buf), " "); worldmouse.y.sprintf(buf + strlen(buf), 30); m_mousetext->SetText(buf); - sprintf(buf, " zoom: %g", 1.0 / m_radius); + std::sprintf(buf, " zoom: %g", 1.0 / m_radius); m_zoomtext->SetText(buf); #endif