OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "mesa: added new linux-gallium and linux-gallium-debug configs"

Browse Source 
This reverts commit abbe96cb6e.

It only reverts parts of the commit the other parts where related to
libmesagallium changes.
This commit is contained in:
Jakob Bornecrantz
2009-02-10 13:59:35 +01:00
parent eaf15db895
commit b96d50da8b
4 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -115,8 +115,6 @@ linux-dri-x86-64 \
linux-dri-ppc \ linux-dri-ppc \
linux-dri-xcb \ linux-dri-xcb \
linux-egl \ linux-egl \
linux-gallium \
linux-gallium-debug \
linux-indirect \ linux-indirect \
linux-fbdev \ linux-fbdev \
linux-glide \ linux-glide \

12
configs/default
View File

@@ -79,16 +79,24 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
# Directories to build # Directories to build
LIB_DIR = lib LIB_DIR = lib
SRC_DIRS = mesa egl glu glut/glx glew glw SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
GLU_DIRS = sgi GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa DRIVER_DIRS =
# Which subdirs under $(TOP)/progs/ to enter: # Which subdirs under $(TOP)/progs/ to enter:
PROGRAM_DIRS = demos redbook samples glsl xdemos PROGRAM_DIRS = demos redbook samples glsl xdemos
# EGL directories # EGL directories
EGL_DRIVERS_DIRS = demo EGL_DRIVERS_DIRS = demo
# Gallium directories and
GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices
GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
GALLIUM_WINSYS_DIRS = xlib egl_xlib
# Library dependencies
#EXTRA_LIB_PATH ?= #EXTRA_LIB_PATH ?=
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)

22
configs/linux-gallium
View File

@@ -1,22 +0,0 @@
# Configuration for Linux / Gallium
include $(TOP)/configs/linux
CONFIG_NAME = linux-gallium
# Directories to build (adds gallium to SRC_DIRS)
SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
# don't build old/conventional Mesa drivers
DRIVER_DIRS =
# Gallium directories and
GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices
GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
GALLIUM_WINSYS_DIRS = xlib egl_xlib

8
configs/linux-gallium-debug
View File

@@ -1,8 +0,0 @@
# Configuration for Linux / Gallium for debug
include $(TOP)/configs/linux-gallium
CONFIG_NAME = linux-gallium-debug
OPT_FLAGS = -g -ansi -pedantic
DEFINES += -DDEBUG -DDEBUG_MATH