Changeset 1684 for trunk/configure.acTweet

Timestamp:

Jul 30, 2012, 2:25:20 AM (7 years ago)

Author:

sam

Message:

build: switch the Android native build rules to autoconf; still a bit rough
but we can now create shared objects for each project; only the testsuite
is not building properly because of issues with STLport, and EglApp is
deactivated because AndroidApp should have precedence.

File:

• trunk/configure.ac (modified) (3 diffs)

trunk/configure.ac

@@ -197 +197 @@
 if test "x${ac_cv_my_stop_looking_for_gl}" = "xno"; then
   AC_CHECK_HEADER(GLES2/gl2.h,
-   [AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available)
-    ac_cv_my_have_gl="yes"])
+   [ac_cv_my_have_gl="yes"
+    AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available)
+    AC_CHECK_LIB(GLESv2, glEnable,
+     [GL_LIBS="${GL_LIBS} -lGLESv2"])])
 fi
 
@@ -209 +211 @@
 
 if test "x${ac_cv_my_stop_looking_for_gl}" = "xno"; then
-  AC_CHECK_LIB(GL, glLoadIdentity,
+  AC_CHECK_LIB(GL, glEnable,
    [ac_cv_my_have_gl="yes"
     AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available) # FIXME: hackish
@@ -351 +353 @@
 
 
+dnl  Use Android? FIXME: super hacks!
+ac_cv_my_have_android="no"
+AC_CHECK_LIB(log, __android_log_vprint,
+ [ac_cv_my_have_android="yes"
+  LOL_LIBS="${LOL_LIBS} -llog -module"])
+AM_CONDITIONAL(USE_ANDROID, test "${ac_cv_my_have_android}" != "no")
+
+
 dnl  Use EGL?
 ac_cv_my_have_egl="no"