From: Adam Jackson Date: Mon, 25 Oct 2004 21:23:08 +0000 (+0000) Subject: Add glx/x11 to the DRI configs, and change the Solo configs to build glx/mini. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=61702d4afe7ed141dc7a3f39f1933c810cde922e;p=mesa.git Add glx/x11 to the DRI configs, and change the Solo configs to build glx/mini. --- diff --git a/configs/linux-dri b/configs/linux-dri index a1c1c8ef4df..1f6341f1e53 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -34,7 +34,7 @@ GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 # Directories -SRC_DIRS = mesa glu glut/glx glw +SRC_DIRS = mesa glu glut/glx glw glx/x11 DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 index 71a1ebbf974..5656e1fcafc 100644 --- a/configs/linux-dri-x86-64 +++ b/configs/linux-dri-x86-64 @@ -24,7 +24,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 - GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11 # Directories -SRC_DIRS = mesa glu glut/glx glw +SRC_DIRS = mesa glu glut/glx glw glx/x11 DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri diff --git a/configs/linux-solo b/configs/linux-solo index bb8cb6a27b4..0ee8b832dc5 100644 --- a/configs/linux-solo +++ b/configs/linux-solo @@ -25,7 +25,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread # Directories -SRC_DIRS = mesa glx glu glut/mini +SRC_DIRS = mesa glx/mini glu glut/mini DRIVER_DIRS = dri PROGRAM_DIRS = miniglx diff --git a/configs/linux-solo-ia64 b/configs/linux-solo-ia64 index 25e23d19afc..d8059057013 100644 --- a/configs/linux-solo-ia64 +++ b/configs/linux-solo-ia64 @@ -22,7 +22,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread # Directories -SRC_DIRS = mesa glx glu glut/mini +SRC_DIRS = mesa glx/mini glu glut/mini DRIVER_DIRS = dri PROGRAM_DIRS = miniglx diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86 index daa65480bd4..bb00d1c9b97 100644 --- a/configs/linux-solo-x86 +++ b/configs/linux-solo-x86 @@ -24,7 +24,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread # Directories -SRC_DIRS = mesa glx glu glut/mini +SRC_DIRS = mesa glx/mini glu glut/mini DRIVER_DIRS = dri PROGRAM_DIRS = miniglx