From 3eeafb7179b861ee6359c8747f4e009513d7ce7a Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Sun, 17 Aug 2008 19:12:54 +0100 Subject: choose sane default for dri driver location --- configs/default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/default b/configs/default index 1b203b0..2d14b8a 100644 --- a/configs/default +++ b/configs/default @@ -91,7 +91,7 @@ APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LI # Installation directories (for make install) INSTALL_DIR = /usr/local -DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri +DRI_DRIVER_INSTALL_DIR = /usr/lib/dri # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) -- cgit v1.1 From ccf1910dd4b2a8ccd04ddbdf725b6dd3f8026eee Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Sun, 17 Aug 2008 20:17:18 +0100 Subject: consolidate intel directories. we now have src/gallium/winsys/drm/intel/{common,dri,egl} --- configs/default | 1 - configs/linux-dri | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'configs') diff --git a/configs/default b/configs/default index 2d14b8a..cd2c39c 100644 --- a/configs/default +++ b/configs/default @@ -73,7 +73,6 @@ EGL_DRIVERS_DIRS = demo GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct 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 = 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 7613d41..d441194 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -55,8 +55,7 @@ EGL_DRIVERS_DIRS = demo dri xdri DRIVER_DIRS = WINDOW_SYSTEM = dri -GALLIUM_WINSYS_DIRS = dri egl_xlib -GALLIUM_WINSYS_COMMON_DIRS = intel_drm +GALLIUM_WINSYS_DIRS = drm egl_xlib # gamma are missing because they have not been converted to use the new # interface. -- cgit v1.1 From b5ab3b7dfc42a568a156dec2fa043292014f98a7 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 26 Aug 2008 14:09:28 -0600 Subject: cell: use SDK 3.0 by default --- configs/linux-cell | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/linux-cell b/configs/linux-cell index a701fa7..1f02e80 100644 --- a/configs/linux-cell +++ b/configs/linux-cell @@ -16,7 +16,10 @@ HOST_CC = gcc OPT_FLAGS = -g # Cell SDK location -SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr +## For SDK 2.1: (plus, remove -DSPU_MAIN_PARAM_LONG_LONG below) +#SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr +## For SDK 3.0: +SDK = /opt/cell/sdk/usr/ CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec \ @@ -43,6 +46,7 @@ SPU_CC = spu-gcc SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main \ -I. -I$(SDK)/spu/include -I$(TOP)/src/mesa/ $(INCLUDE_DIRS) \ + -DSPU_MAIN_PARAM_LONG_LONG \ -include spu_intrinsics.h SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc -- cgit v1.1 From ab93aa774e2fc09b5f579eb13ce94cf22796902b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 3 Sep 2008 09:08:19 -0600 Subject: Cell: added linux-cell-debug config linux-cell is now the optimized configuration. Remove some Cell-specific stuff from winsys/xlib/Makefile. --- configs/linux-cell | 6 ++++-- configs/linux-cell-debug | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 configs/linux-cell-debug (limited to 'configs') diff --git a/configs/linux-cell b/configs/linux-cell index 1f02e80..cdaa17c 100644 --- a/configs/linux-cell +++ b/configs/linux-cell @@ -1,4 +1,4 @@ -# linux-cell +# linux-cell (non-debug build) include $(TOP)/configs/default @@ -13,7 +13,7 @@ CC = ppu32-gcc CXX = ppu32-g++ HOST_CC = gcc -OPT_FLAGS = -g +OPT_FLAGS = -O3 # Cell SDK location ## For SDK 2.1: (plus, remove -DSPU_MAIN_PARAM_LONG_LONG below) @@ -39,6 +39,8 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \ -L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe2 +CELL_SPU_LIB = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a + ### SPU stuff diff --git a/configs/linux-cell-debug b/configs/linux-cell-debug new file mode 100644 index 0000000..ba333bb --- /dev/null +++ b/configs/linux-cell-debug @@ -0,0 +1,10 @@ +# linux-cell-debug + +include $(TOP)/configs/linux-cell + +# just override name and OPT_FLAGS here: + +CONFIG_NAME = linux-cell-debug + +OPT_FLAGS = -g + -- cgit v1.1 From fafc36920eb79ddbe7049f6bbce18bcc279982d0 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 3 Sep 2008 09:31:36 -0600 Subject: cell: add -DDEBUG flag, fixes to Cell Makefiles --- configs/linux-cell-debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/linux-cell-debug b/configs/linux-cell-debug index ba333bb..42f3245 100644 --- a/configs/linux-cell-debug +++ b/configs/linux-cell-debug @@ -6,5 +6,5 @@ include $(TOP)/configs/linux-cell CONFIG_NAME = linux-cell-debug -OPT_FLAGS = -g +OPT_FLAGS = -g -DDEBUG -- cgit v1.1