Changeset 723Tweet

Timestamp:

Mar 6, 2011, 4:04:48 PM (10 years ago)

Author:

sam

Message:

core: fix a few compilation errors and warnings on OS X.

Location:

trunk/src

Files:

• image.cpp (modified) (1 diff)
• input.cpp (modified) (2 diffs)
• lolgl.h (modified) (1 diff)
• sample.cpp (modified) (1 diff)
• timer.cpp (modified) (4 diffs)

trunk/src/image.cpp

@@ -25 +25 @@
 
 #include "core.h"
-#include "lolgl.h"
 
 namespace lol

trunk/src/input.cpp

@@ -61 +61 @@
 vec2 Input::GetAxis(int axis)
 {
-    float invsqrt2 = sqrtf(0.5f);
     vec2 ret;
 
@@ -72 +71 @@
     ret.y += up;
     if (left && up)
-        ret = ret * invsqrt2;
+        ret = ret * sqrtf(0.5f);
 #else
     ret = 0;

trunk/src/lolgl.h

@@ -42 +42 @@
 #   endif
 #elif defined HAVE_GLES_1X
-#   include <GLES/gl.h>
-#   include <GLES/glext.h>
+#   if defined __APPLE__ && defined __MACH__
+#       include <OpenGLES/ES1/gl.h>
+#       include <OpenGLES/ES1/glext.h>
+#   else
+#       include <GLES/gl.h>
+#       include <GLES/glext.h>
+#   endif
 #elif defined HAVE_GLES_2X
-#   include <GLES2/gl2.h>
-#   include <GLES2/gl2ext.h>
+#   if defined __APPLE__ && defined __MACH__
+#       include <OpenGLES/ES2/gl.h>
+#       include <OpenGLES/ES2/glext.h>
+#   else
+#       include <GLES2/gl2.h>
+#       include <GLES2/gl2ext.h>
+#   endif
 #endif
 

trunk/src/sample.cpp

@@ -16 +16 @@
 #include <cstdio>
 #include <cmath>
+#include <cstring>
 
 #if defined USE_SDL

trunk/src/timer.cpp

@@ -17 +17 @@
 #include <stdint.h>
 
-#if defined __linux__
+#if defined __linux__ || defined __APPLE__
 #   include <sys/time.h>
 #   include <unistd.h>
@@ -43 +43 @@
     TimerData()
     {
-#if defined __linux__
+#if defined __linux__ || defined __APPLE__
         gettimeofday(&tv0, NULL);
 #elif defined _WIN32
@@ -59 +59 @@
     {
         float ret, towait;
-#if defined __linux__
+#if defined __linux__ || defined __APPLE__
         struct timeval tv;
         gettimeofday(&tv, NULL);
@@ -91 +91 @@
     }
 
-#if defined __linux__
+#if defined __linux__ || defined __APPLE__
     struct timeval tv0;
 #elif defined _WIN32