Browse Source

Code reorganization: s/aux/auxiliary/ -- update build.

tags/mesa_20090313
José Fonseca 17 years ago
parent
commit
66f22aa3bf

+ 1
- 1
src/gallium/Makefile View File

include $(TOP)/configs/current include $(TOP)/configs/current




SUBDIRS = aux drivers
SUBDIRS = auxiliary drivers




default: subdirs default: subdirs

+ 1
- 1
src/gallium/Makefile.template View File

-I. \ -I. \
-I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/include/pipe \ -I$(TOP)/src/gallium/include/pipe \
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/mesa \ -I$(TOP)/src/mesa \
-I$(TOP)/include \ -I$(TOP)/include \

+ 1
- 1
src/gallium/auxiliary/llvm/Makefile View File

INCLUDES = \ INCLUDES = \
-I. \ -I. \
-I$(TOP)/src/gallium/drivers -I$(TOP)/src/gallium/drivers
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/include \
-I$(TOP)/src/mesa \ -I$(TOP)/src/mesa \
-I$(TOP)/include -I$(TOP)/include

+ 1
- 1
src/gallium/drivers/cell/ppu/Makefile View File

INCLUDE_DIRS = \ INCLUDE_DIRS = \
-I$(TOP)/src/mesa \ -I$(TOP)/src/mesa \
-I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/drivers -I$(TOP)/src/gallium/drivers


.c.o: .c.o:

+ 1
- 1
src/gallium/drivers/cell/spu/Makefile View File

INCLUDE_DIRS = \ INCLUDE_DIRS = \
-I$(TOP)/src/mesa \ -I$(TOP)/src/mesa \
-I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/drivers -I$(TOP)/src/gallium/drivers





+ 1
- 1
src/gallium/winsys/dri/Makefile.template View File

-I$(TOP)/include \ -I$(TOP)/include \
-I$(TOP)/include/GL/internal \ -I$(TOP)/include/GL/internal \
-I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/aux \
-I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/mesa \ -I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \ -I$(TOP)/src/mesa/main \

+ 1
- 1
src/mesa/Makefile View File

endif endif


ifeq ($(CONFIG_NAME), linux-llvm) ifeq ($(CONFIG_NAME), linux-llvm)
LLVM_LIB = $(TOP)/src/gallium/aux/llvm/libgallivm.a
LLVM_LIB = $(TOP)/src/gallium/auxiliary/llvm/libgallivm.a
endif endif


.SUFFIXES : .cpp .SUFFIXES : .cpp

+ 33
- 33
src/mesa/sources View File





DRAW_SOURCES = \ DRAW_SOURCES = \
$(TOP)/src/gallium/aux/draw/draw_clip.c \
$(TOP)/src/gallium/aux/draw/draw_context.c\
$(TOP)/src/gallium/aux/draw/draw_cull.c \
$(TOP)/src/gallium/aux/draw/draw_debug.c \
$(TOP)/src/gallium/aux/draw/draw_flatshade.c \
$(TOP)/src/gallium/aux/draw/draw_offset.c \
$(TOP)/src/gallium/aux/draw/draw_prim.c \
$(TOP)/src/gallium/aux/draw/draw_stipple.c \
$(TOP)/src/gallium/aux/draw/draw_twoside.c \
$(TOP)/src/gallium/aux/draw/draw_unfilled.c \
$(TOP)/src/gallium/aux/draw/draw_validate.c \
$(TOP)/src/gallium/aux/draw/draw_vbuf.c \
$(TOP)/src/gallium/aux/draw/draw_vertex.c \
$(TOP)/src/gallium/aux/draw/draw_vertex_cache.c \
$(TOP)/src/gallium/aux/draw/draw_vertex_fetch.c \
$(TOP)/src/gallium/aux/draw/draw_vertex_shader.c \
$(TOP)/src/gallium/aux/draw/draw_vf.c \
$(TOP)/src/gallium/aux/draw/draw_vf_generic.c \
$(TOP)/src/gallium/aux/draw/draw_vf_sse.c \
$(TOP)/src/gallium/aux/draw/draw_wide_prims.c
$(TOP)/src/gallium/auxiliary/draw/draw_clip.c \
$(TOP)/src/gallium/auxiliary/draw/draw_context.c\
$(TOP)/src/gallium/auxiliary/draw/draw_cull.c \
$(TOP)/src/gallium/auxiliary/draw/draw_debug.c \
$(TOP)/src/gallium/auxiliary/draw/draw_flatshade.c \
$(TOP)/src/gallium/auxiliary/draw/draw_offset.c \
$(TOP)/src/gallium/auxiliary/draw/draw_prim.c \
$(TOP)/src/gallium/auxiliary/draw/draw_stipple.c \
$(TOP)/src/gallium/auxiliary/draw/draw_twoside.c \
$(TOP)/src/gallium/auxiliary/draw/draw_unfilled.c \
$(TOP)/src/gallium/auxiliary/draw/draw_validate.c \
$(TOP)/src/gallium/auxiliary/draw/draw_vbuf.c \
$(TOP)/src/gallium/auxiliary/draw/draw_vertex.c \
$(TOP)/src/gallium/auxiliary/draw/draw_vertex_cache.c \
$(TOP)/src/gallium/auxiliary/draw/draw_vertex_fetch.c \
$(TOP)/src/gallium/auxiliary/draw/draw_vertex_shader.c \
$(TOP)/src/gallium/auxiliary/draw/draw_vf.c \
$(TOP)/src/gallium/auxiliary/draw/draw_vf_generic.c \
$(TOP)/src/gallium/auxiliary/draw/draw_vf_sse.c \
$(TOP)/src/gallium/auxiliary/draw/draw_wide_prims.c


TGSIEXEC_SOURCES = \ TGSIEXEC_SOURCES = \
$(TOP)/src/gallium/aux/tgsi/exec/tgsi_exec.c \
$(TOP)/src/gallium/aux/tgsi/exec/tgsi_sse2.c
$(TOP)/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c \
$(TOP)/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c


TGSIUTIL_SOURCES = \ TGSIUTIL_SOURCES = \
$(TOP)/src/gallium/aux/tgsi/util/tgsi_build.c \
$(TOP)/src/gallium/aux/tgsi/util/tgsi_dump.c \
$(TOP)/src/gallium/aux/tgsi/util/tgsi_parse.c \
$(TOP)/src/gallium/aux/tgsi/util/tgsi_util.c
$(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_build.c \
$(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_dump.c \
$(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_parse.c \
$(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_util.c


STATECACHE_SOURCES = \ STATECACHE_SOURCES = \
$(TOP)/src/gallium/aux/cso_cache/cso_hash.c \
$(TOP)/src/gallium/aux/cso_cache/cso_cache.c
$(TOP)/src/gallium/auxiliary/cso_cache/cso_hash.c \
$(TOP)/src/gallium/auxiliary/cso_cache/cso_cache.c


PIPEUTIL_SOURCES = \ PIPEUTIL_SOURCES = \
$(TOP)/src/gallium/aux/util/p_debug.c \
$(TOP)/src/gallium/aux/util/p_tile.c \
$(TOP)/src/gallium/aux/util/p_util.c
$(TOP)/src/gallium/auxiliary/util/p_debug.c \
$(TOP)/src/gallium/auxiliary/util/p_tile.c \
$(TOP)/src/gallium/auxiliary/util/p_util.c


STATETRACKER_SOURCES = \ STATETRACKER_SOURCES = \
state_tracker/st_atom.c \ state_tracker/st_atom.c \
-I$(TOP)/src/mesa/main \ -I$(TOP)/src/mesa/main \
-I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/gallium/aux
-I$(TOP)/src/gallium/auxiliary


OLD_INCLUDE_DIRS = \ OLD_INCLUDE_DIRS = \
-I$(TOP)/src/mesa/tnl \ -I$(TOP)/src/mesa/tnl \
-I$(TOP)/src/mesa/shader \ -I$(TOP)/src/mesa/shader \
-I$(TOP)/src/mesa/shader/grammar \ -I$(TOP)/src/mesa/shader/grammar \
-I$(TOP)/src/mesa/shader/slang \ -I$(TOP)/src/mesa/shader/slang \
-I$(TOP)/s$(TOP)/src/gallium/aux/tgsi
-I$(TOP)/s$(TOP)/src/gallium/auxiliary/tgsi

Loading…
Cancel
Save