From c218b8c6c6593f434a749bf67ad976007e6eef61 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Wed, 4 Jun 2008 09:56:00 +0100 Subject: Build with -O2 --- configs/linux-dri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/linux-dri b/configs/linux-dri index cd82c57..2b30a00 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. -- cgit v1.1 From e7725e136f0fa64c75813a3b138dc81a8b19400d Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 5 Jun 2008 14:12:27 -0600 Subject: egl: build libEGL and softpipe_egl.so by default --- configs/default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/default b/configs/default index 04604f8..2019a53 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: @@ -72,7 +72,7 @@ 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 failover 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 -- cgit v1.1 From b11aad2abe167716b7ff1262f5872d4d9dbb5b9c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 5 Jun 2008 14:41:28 -0600 Subject: build egl_xlib/ too (softpipe_egl.so library) --- configs/linux-dri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/linux-dri b/configs/linux-dri index 2b30a00..3df1505 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -63,7 +63,7 @@ endif DRIVER_DIRS = dri WINDOW_SYSTEM = dri -GALLIUM_WINSYS_DIRS = dri +GALLIUM_WINSYS_DIRS = dri egl_xlib # gamma are missing because they have not been converted to use the new # interface. -- cgit v1.1 From adbdabb85ae322d5c80cadcee931e36d5c688d98 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Fri, 6 Jun 2008 14:49:02 +0200 Subject: i915: Moved pipe_buffer and i915_winsys functions to a common folder --- configs/default | 1 + 1 file changed, 1 insertion(+) (limited to 'configs') diff --git a/configs/default b/configs/default index 2019a53..b7d0d22 100644 --- a/configs/default +++ b/configs/default @@ -71,6 +71,7 @@ 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 failover +GALLIUM_WINSYS_COMMON_DIRS = intel_drm GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) GALLIUM_WINSYS_DIRS = xlib egl_xlib -- cgit v1.1 From 3d514a907045bc01ec5e2ceeb14c5620df10885d Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Fri, 6 Jun 2008 16:50:52 +0200 Subject: gallium: Only build intel_drm for linux-dri targets --- configs/default | 2 +- configs/linux-dri | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/default b/configs/default index b7d0d22..2776a11 100644 --- a/configs/default +++ b/configs/default @@ -71,7 +71,7 @@ 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 failover -GALLIUM_WINSYS_COMMON_DIRS = intel_drm +GALLIUM_WINSYS_COMMON_DIRS = GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) GALLIUM_WINSYS_DIRS = xlib egl_xlib diff --git a/configs/linux-dri b/configs/linux-dri index 3df1505..bd5e90d 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -64,6 +64,7 @@ endif DRIVER_DIRS = dri WINDOW_SYSTEM = 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. -- cgit v1.1 From 80ab4c3f8c3cf9518cd40ce1dff10ab99ab20301 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Sun, 8 Jun 2008 17:29:56 +0200 Subject: mesa: Do not compile the dri drivers in mesa --- configs/linux-dri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/linux-dri b/configs/linux-dri index bd5e90d..9fd3721 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -61,7 +61,7 @@ endif -DRIVER_DIRS = dri +DRIVER_DIRS = WINDOW_SYSTEM = dri GALLIUM_WINSYS_DIRS = dri egl_xlib GALLIUM_WINSYS_COMMON_DIRS = intel_drm -- cgit v1.1