Changeset 1988Tweet

Timestamp:

Oct 8, 2012, 9:12:34 AM (7 years ago)

Author:

sam

Message:

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

Location:

trunk

Files:

• src/gpu/texture.cpp (modified) (1 diff)
• tutorial/11_fractal.cpp (modified) (2 diffs)

trunk/src/gpu/texture.cpp

@@ -67 +67 @@
 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;

trunk/tutorial/11_fractal.cpp

@@ -14 +14 @@
 
 #include <cstring>
+#include <cstdio>
 
 #include "core.h"
 #include "loldebug.h"
+
+#if defined _WIN32
+#   include <direct.h>
+#endif
 
 using namespace lol;
@@ -280 +285 @@
 #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