summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
Diffstat (limited to 'configs')
-rw-r--r--configs/default5
-rw-r--r--configs/linux-dri7
2 files changed, 7 insertions, 5 deletions
diff --git a/configs/default b/configs/default
index 732ffeb1609..a8d1fe6bec2 100644
--- a/configs/default
+++ b/configs/default
@@ -60,7 +60,7 @@ GLW_SOURCES = GLwDrawA.c
# Directories to build
LIB_DIR = lib
-SRC_DIRS = gallium mesa gallium/winsys glu glut/glx glw
+SRC_DIRS = gallium mesa egl gallium/winsys glu glut/glx glw
GLU_DIRS = sgi
DRIVER_DIRS =
# Which subdirs under $(TOP)/progs/ to enter:
@@ -71,8 +71,9 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util
GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv10 nv30 nv40 nv50 failover
+GALLIUM_WINSYS_COMMON_DIRS =
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-GALLIUM_WINSYS_DIRS = xlib
+GALLIUM_WINSYS_DIRS = xlib egl_xlib
# Library/program dependencies
diff --git a/configs/linux-dri b/configs/linux-dri
index 4fdef196d96..74f81bf83b6 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -13,7 +13,7 @@ CXX = g++
#MKDEP = gcc -M
#MKDEP_OPTIONS = -MF depend
-OPT_FLAGS = -O -g
+OPT_FLAGS = -O2 -g
PIC_FLAGS = -fPIC
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
@@ -61,9 +61,10 @@ endif
-DRIVER_DIRS = dri
+DRIVER_DIRS =
WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = dri
+GALLIUM_WINSYS_DIRS = dri egl_xlib
+GALLIUM_WINSYS_COMMON_DIRS = intel_drm
# gamma are missing because they have not been converted to use the new
# interface.