Changeset 1988


Ignore:
Timestamp:
Oct 8, 2012, 9:12:34 AM (5 years ago)
Author:
sam
Message:

misc: compilation fixes for Windows, X360 and PS3 introduced by the
texture class refactor.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gpu/texture.cpp

    r1987 r1988  
    6767static GLenum const TEXTURE_FORMAT = GL_RGBA;
    6868static GLenum const TEXTURE_TYPE = GL_UNSIGNED_BYTE;
    69 #else
     69#elif !defined USE_D3D9 && !defined _XBOX
    7070/* Seems efficient for little endian textures */
    7171static GLint const INTERNAL_FORMAT = GL_RGBA;
  • trunk/tutorial/11_fractal.cpp

    r1987 r1988  
    1414
    1515#include <cstring>
     16#include <cstdio>
    1617
    1718#include "core.h"
    1819#include "loldebug.h"
     20
     21#if defined _WIN32
     22#   include <direct.h>
     23#endif
    1924
    2025using namespace lol;
     
    280285#if !defined __native_client__
    281286        char buf[256];
    282         sprintf(buf, "center: ");
     287        std::sprintf(buf, "center: ");
    283288        m_center.x.sprintf(buf + strlen(buf), 30);
    284         sprintf(buf + strlen(buf), " ");
     289        std::sprintf(buf + strlen(buf), " ");
    285290        m_center.y.sprintf(buf + strlen(buf), 30);
    286291        m_centertext->SetText(buf);
    287         sprintf(buf, " mouse: ");
     292        std::sprintf(buf, " mouse: ");
    288293        worldmouse.x.sprintf(buf + strlen(buf), 30);
    289         sprintf(buf + strlen(buf), " ");
     294        std::sprintf(buf + strlen(buf), " ");
    290295        worldmouse.y.sprintf(buf + strlen(buf), 30);
    291296        m_mousetext->SetText(buf);
    292         sprintf(buf, "  zoom: %g", 1.0 / m_radius);
     297        std::sprintf(buf, "  zoom: %g", 1.0 / m_radius);
    293298        m_zoomtext->SetText(buf);
    294299#endif
Note: See TracChangeset for help on using the changeset viewer.