Enable EGL support in 'linux-dri' config

diff --git a/configs/linux-dri b/configs/linux-dri
index ae0325e41340bd3f6fa77a701d0a05b4ecc6d234..7902ce9339c25a5c0964974107237272d1810704 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -38,14 +38,14 @@ ASM_SOURCES =
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
+DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -L$(LIB_DIR) -lEGL -lEGLdri
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 
 
 # Directories
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
+SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
 DRIVER_DIRS = dri
-PROGRAM_DIRS = 
+PROGRAM_DIRS = egl
 WINDOW_SYSTEM=dri
 
 # gamma are missing because they have not been converted to use the new

diff --git a/src/egl/Makefile b/src/egl/Makefile
index 75df3902ec215804c9eaf2bb0cb8de035203f85c..931e9d0cb8621f2ab29eb420ddd2bea18c1232eb 100644 (file)
--- a/src/egl/Makefile
+++ b/src/egl/Makefile
@@ -2,7 +2,7 @@
 
 TOP = ../..
 
-SUBDIRS = main drivers/demo
+SUBDIRS = main drivers/demo drivers/dri
 
 
 default: subdirs

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index 60a048bae081d23956e3ee98c0d473dbfff5b7fb..fc9a312bea75d2be7a58a71956e9da3fa3a190c4 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -26,18 +26,20 @@ DRIVER_SOURCES = r200_context.c \
                 r200_vtxfmt.c \
                 r200_vtxfmt_c.c \
                 r200_vtxfmt_sse.c \
-                r200_vtxfmt_x86.c 
+                r200_vtxfmt_x86.c \
+                server/radeon_egl.c
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
 X86_SOURCES = r200_vtxtmp_x86.S
 
 SYMLINKS = \
+       server/radeon_egl.c  \
        server/radeon_dri.c  \
-                 server/radeon_dri.h \
-                 server/radeon.h \
-                 server/radeon_macros.h \
-                 server/radeon_reg.h
+       server/radeon_dri.h \
+       server/radeon.h \
+       server/radeon_macros.h \
+       server/radeon_reg.h
 
 ##### TARGETS #####