From: Jon Smirl <jonsmirl@gmail.com>
Date: Sun, 7 Aug 2005 02:13:14 +0000 (+0000)
Subject: Enable EGL support in 'linux-dri' config
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7e5da5d52629bfa68f83429254eab0304cf346bd;p=mesa.git

Enable EGL support in 'linux-dri' config
---

diff --git a/configs/linux-dri b/configs/linux-dri
index ae0325e4134..7902ce9339c 100644
--- 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 75df3902ec2..931e9d0cb86 100644
--- 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 60a048bae08..fc9a312bea7 100644
--- 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 #####