Changeset 1677Tweet

Timestamp:

Jul 28, 2012, 1:51:03 AM (11 years ago)

Author:

sam

Message:

build: fix the Raspberry Pi build and add a build script for it.

Location:

trunk

Files:

• build/build-raspi (added)
• build/lol-build (modified) (3 diffs)
• configure.ac (modified) (3 diffs)
• tutorial/11_fractal.cpp (modified) (1 diff)

trunk/build/lol-build

@@ -24 +24 @@
 #  - win*-i386
 #  - win*-amd64
+#  - raspi-arm
 #
 
@@ -131 +132 @@
             cd monsterz/android
             android update project --path .
+            ;;
+        raspi-arm)
+            ./configure --host=arm-bcm2708hardfp-linux-gnueabi CPPFLAGS="-I$RASPI_SDK_ROOT/firmware/opt/vc/include -I$RASPI_SDK_ROOT/firmware/opt/vc/include/interface/vcos/pthreads" LDFLAGS="-L$RASPI_SDK_ROOT/firmware/opt/vc/lib"
             ;;
         nacl-i386)
@@ -198 +202 @@
         android-arm)
             ;;
+        raspi-arm)
+            ;;
         ps3-ppu)
             ;;

trunk/configure.ac

@@ -170 +170 @@
 dnl  Use the Raspberry Pi libraries?
 if test "x${ac_cv_my_stop_looking_for_gl}" = "xno"; then
-AC_CHECK_HEADER(bcm_host.h,
- [AC_MSG_RESULT(yes)
-  AC_CHECK_LIB(bcm_host, main,
-   [ac_cv_my_have_gl="yes"
-    ac_cv_my_stop_looking_for_gl="yes"
-    AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available)
-    GL_LIBS="-lGLESv2_static -lkhrn_static -lvcos -lvchiq_arm -lbcm_host"])],
- [AC_MSG_RESULT(no)])
+  AC_CHECK_HEADERS(bcm_host.h,
+   [AC_CHECK_LIB(vcos, main,
+     [ac_cv_my_have_gl="yes"
+      ac_cv_my_stop_looking_for_gl="yes"
+      AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available)
+      dnl  FIXME: -lEGL does not belong here but the configure test fails
+      dnl  when cross-compiling, so we add it manually here.
+      GL_LIBS="-lGLESv2 -lEGL -lvcos -lvchiq_arm -lbcm_host"])])
 fi
 
 dnl  Use the PS3 PSGL?
 if test "x${ac_cv_my_stop_looking_for_gl}" = "xno"; then
-  AC_CHECK_HEADER(PSGL/psgl.h,
+  AC_CHECK_HEADERS(PSGL/psgl.h,
    [ac_cv_my_have_gl="yes"
     ac_cv_my_stop_looking_for_gl="yes"])
@@ -352 +352 @@
 
 
-dnl Use EGL?
+dnl  Use EGL?
 ac_cv_my_have_egl="no"
 PKG_CHECK_MODULES(EGL, egl, [ac_cv_my_have_egl="yes"], [:])
@@ -359 +359 @@
   EGL_LIBS="${EGL_LIBS} -lX11"
 fi
-dnl Use the Raspberry Pi libraries?
-AC_CHECK_LIB(EGL_static, main,
+AC_CHECK_LIB(EGL, main,
  [ac_cv_my_have_egl="yes"
   AC_DEFINE(USE_EGL, 1, Define to 1 to use libegl)
-  EGL_LIBS="-lEGL_static"])
+  EGL_LIBS="-lEGL"])
+dnl  Raspberry Pi is different, check for it with extra libs; also we
+dnl  look for a different function to bypass autoconf caching
+AC_CHECK_LIB(EGL, eglGetDisplay,
+ [ac_cv_my_have_egl="yes"
+  AC_DEFINE(USE_EGL, 1, Define to 1 to use libegl)
+  EGL_LIBS="-lEGL -lvcos -lvchiq_arm -lbcm_host -lGLESv2"],
+ [:],
+ [-lvcos -lvchiq_arm -lbcm_host -lGLESv2])
 AM_CONDITIONAL(USE_EGL, test "${ac_cv_my_have_egl}" != "no")
 

trunk/tutorial/11_fractal.cpp

@@ -40 +40 @@
 static GLenum const TEXTURE_FORMAT = GL_BGRA;
 static GLenum const TEXTURE_TYPE = GL_UNSIGNED_INT_8_8_8_8_REV;
-#elif defined __native_client__
+#elif defined __native_client__ || defined HAVE_GLES_2X
 static GLint const INTERNAL_FORMAT = GL_RGBA;
 static GLenum const TEXTURE_FORMAT = GL_RGBA;