瀏覽代碼

libevas: fix SDL GL backend build

libeet is needed by all backends building the generic OpenGL support,
and the configure script forgets to check / expand libeet CFLAGS/libs
when the SDL GL backend is used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 13 年之前
父節點
當前提交
3a9b75fe04
共有 2 個文件被更改,包括 8 次插入4 次删除
  1. 3 3
      package/efl/libevas/Config.in
  2. 5 1
      package/efl/libevas/libevas.mk

+ 3 - 3
package/efl/libevas/Config.in

@@ -99,7 +99,6 @@ config BR2_PACKAGE_LIBEVAS_X11_GLX
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XPROTO_GLPROTO
 	select BR2_PACKAGE_XPROTO_GLPROTO
-	select BR2_PACKAGE_LIBEET
 	help
 	help
 	  This enables the OpenGL X11 rendering engine that renders
 	  This enables the OpenGL X11 rendering engine that renders
 	  using GLX which may be hardware accelerated.
 	  using GLX which may be hardware accelerated.
@@ -132,8 +131,9 @@ choice
 	default BR2_PACKAGE_LIBEVAS_GL
 	default BR2_PACKAGE_LIBEVAS_GL
 
 
 config BR2_PACKAGE_LIBEVAS_GL
 config BR2_PACKAGE_LIBEVAS_GL
-       select BR2_PACKAGE_MESA3D
-       bool "generic OpenGL"
+	bool "generic OpenGL"
+	select BR2_PACKAGE_MESA3D
+	select BR2_PACKAGE_LIBEET
 
 
 config BR2_PACKAGE_LIBEVAS_GLES_SGX
 config BR2_PACKAGE_LIBEVAS_GLES_SGX
        bool "OpenGL-ES SGX"
        bool "OpenGL-ES SGX"

+ 5 - 1
package/efl/libevas/libevas.mk

@@ -96,10 +96,14 @@ endif
 ifeq ($(BR2_PACKAGE_LIBEVAS_SDL_GL),y)
 ifeq ($(BR2_PACKAGE_LIBEVAS_SDL_GL),y)
 LIBEVAS_CONF_OPT += --enable-gl-sdl
 LIBEVAS_CONF_OPT += --enable-gl-sdl
 LIBEVAS_DEPENDENCIES += sdl
 LIBEVAS_DEPENDENCIES += sdl
+# configure script forgets to check for eet / fill this out
+LIBEVAS_CONF_ENV += \
+	GL_EET_CFLAGS='-I$(STAGING_DIR)/usr/include/eet-1' \
+	GL_EET_LIBS='-leet'
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_GL),y)
 ifeq ($(BR2_PACKAGE_LIBEVAS_GL),y)
-LIBEVAS_DEPENDENCIES += mesa3d
+LIBEVAS_DEPENDENCIES += mesa3d libeet
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_SGX),y)
 ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_SGX),y)