Changeset 2529Tweet

Timestamp:

Feb 28, 2013, 12:41:45 AM (10 years ago)

Author:

sam

Message:

build: a few iOS build fixes; nowhere near ready though.

Location:

trunk

Files:

• build/autotools/m4/lol-gl.m4 (modified) (1 diff)
• src/image/codec/ios-image.cpp (modified) (1 diff)

trunk/build/autotools/m4/lol-gl.m4

@@ -18 +18 @@
     LOL_TRY_CXXFLAGS(-ObjC++, [CXXFLAGS="${CXXFLAGS} -ObjC++"])
     AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available)],
+   [AC_MSG_RESULT(no)])
+  LIBS="$LIBS_save"
+fi
+
+if test "x${ac_cv_my_stop_looking_for_gl}" = "xno"; then
+  LIBS_save="$LIBS"
+  LIBS="$LIBS -Wl,-framework -Wl,OpenGLES"
+  AC_MSG_CHECKING(for -framework OpenGLES)
+  AC_TRY_LINK([], [],
+   [AC_MSG_RESULT(yes)
+    ac_cv_my_have_gl="yes"
+    GL_LIBS="${GL_LIBS} -framework OpenGLES"
+    LOL_TRY_CXXFLAGS(-ObjC++, [CXXFLAGS="${CXXFLAGS} -ObjC++"])
+    AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available)],
    [AC_MSG_RESULT(no)])
   LIBS="$LIBS_save"

trunk/src/image/codec/ios-image.cpp

@@ -66 +66 @@
     int h = CGImageGetHeight(image.CGImage);
     size = ivec2(w, h);
-    format = FORMAT_RGBA;
+    format = Image::FORMAT_RGBA;
 
     CGColorSpaceRef cspace = CGColorSpaceCreateDeviceRGB();