Keith Whitwell
0397b2bb41
A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
115 lines
3.2 KiB
Plaintext
115 lines
3.2 KiB
Plaintext
# Default/template configuration
|
|
|
|
# This is included by other config files which may override some
|
|
# of these variables.
|
|
# Think of this as a base class from which configs are derived.
|
|
|
|
|
|
CONFIG_NAME = default
|
|
|
|
# Version info
|
|
MESA_MAJOR=7
|
|
MESA_MINOR=1
|
|
MESA_TINY=0
|
|
MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
|
|
|
|
# external projects. This should be useless now that we use libdrm.
|
|
DRM_SOURCE_PATH=$(TOP)/../drm
|
|
|
|
# Compiler and flags
|
|
CC = cc
|
|
CXX = CC
|
|
HOST_CC = $(CC)
|
|
CFLAGS = -O
|
|
CXXFLAGS = -O
|
|
LDFLAGS =
|
|
GLU_CFLAGS =
|
|
|
|
# Misc tools and flags
|
|
SHELL = /bin/sh
|
|
MKLIB = $(SHELL) $(TOP)/bin/mklib
|
|
MKLIB_OPTIONS =
|
|
MKDEP = makedepend
|
|
MKDEP_OPTIONS = -fdepend
|
|
MAKE = make
|
|
INSTALL = $(SHELL) $(TOP)/bin/minstall
|
|
|
|
# Tools for regenerating glapi (generally only needed by the developers)
|
|
PYTHON2 = python
|
|
PYTHON_FLAGS = -t -O -O
|
|
INDENT = indent
|
|
INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
|
|
|
|
# Library names (base name)
|
|
GL_LIB = GL
|
|
GLU_LIB = GLU
|
|
GLUT_LIB = glut
|
|
GLW_LIB = GLw
|
|
OSMESA_LIB = OSMesa
|
|
|
|
|
|
# Library names (actual file names)
|
|
GL_LIB_NAME = lib$(GL_LIB).so
|
|
GLU_LIB_NAME = lib$(GLU_LIB).so
|
|
GLUT_LIB_NAME = lib$(GLUT_LIB).so
|
|
GLW_LIB_NAME = lib$(GLW_LIB).so
|
|
OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
|
|
|
|
# globs used to install the lib and all symlinks
|
|
GL_LIB_GLOB = $(GL_LIB_NAME)*
|
|
GLU_LIB_GLOB = $(GLU_LIB_NAME)*
|
|
GLUT_LIB_GLOB = $(GLUT_LIB_NAME)*
|
|
GLW_LIB_GLOB = $(GLW_LIB_NAME)*
|
|
OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*
|
|
|
|
# Optional assembly language optimization files for libGL
|
|
MESA_ASM_SOURCES =
|
|
|
|
# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
|
|
# order to build the Motif widget too)
|
|
GLW_SOURCES = GLwDrawA.c
|
|
MOTIF_CFLAGS = -I/usr/include/Motif1.2
|
|
|
|
|
|
# Directories to build
|
|
LIB_DIR = lib
|
|
SRC_DIRS = gallium mesa egl gallium/winsys glu glut/glx glw
|
|
GLU_DIRS = sgi
|
|
DRIVER_DIRS =
|
|
# Which subdirs under $(TOP)/progs/ to enter:
|
|
PROGRAM_DIRS = demos redbook samples glsl xdemos
|
|
|
|
# EGL directories
|
|
EGL_DRIVERS_DIRS = demo
|
|
|
|
# Gallium directories and
|
|
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_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 ?=
|
|
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
|
|
OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
|
|
GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
|
|
GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm
|
|
GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
|
|
APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
|
|
|
|
# Program dependencies - specific GL/glut libraries added in Makefiles
|
|
APP_LIB_DEPS = -lm
|
|
|
|
|
|
# Installation directories (for make install)
|
|
INSTALL_DIR = /usr/local
|
|
INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
|
|
INSTALL_INC_DIR = $(INSTALL_DIR)/include
|
|
DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
|
|
|
|
# Where libGL will look for DRI hardware drivers
|
|
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
|
|
|