diff options
| -rw-r--r-- | configs/linux-dri | 24 | ||||
| -rw-r--r-- | configs/linux-dri-x86-64 | 34 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 2 |
3 files changed, 20 insertions, 40 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index 331ce5ba2d7..5d44ccd2fcd 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -14,9 +14,9 @@ MKDEP = /usr/X11R6/bin/makedepend #MKDEP_OPTIONS = -MF depend WARN_FLAGS = -Wall -OPT_FLAGS = -O -g -PIC_FLAGS = -fPIC - +OPT_FLAGS = -O -g +PIC_FLAGS = -fPIC +ARCH_FLAGS ?= DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ -D_BSD_SOURCE -D_GNU_SOURCE \ @@ -24,25 +24,25 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions -CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(ASM_FLAGS) -std=c99 $(PIC_FLAGS) -ffast-math \ - $(DEFINES) +CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ + $(ASM_FLAGS) -std=c99 -ffast-math -CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \ - $(DEFINES) +CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) ASM_SOURCES = # Library/program dependencies -DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread -ldl +EXTRA_LIB_PATH=-L/usr/X11R6/lib -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 +DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl +GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm +GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 # Directories -SRC_DIRS = mesa glu glut/glx glw glx/x11 +SRC_DIRS = glx/x11 mesa glu glut/glx glw DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 index bc115246305..7793bf46aa6 100644 --- a/configs/linux-dri-x86-64 +++ b/configs/linux-dri-x86-64 @@ -1,40 +1,20 @@ # -*-makefile-*- # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others -include $(TOP)/configs/default +include $(TOP)/configs/linux-dri CONFIG_NAME = linux-dri-x86-64 -# Compiler and flags -CC = gcc -CXX = g++ - -DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE - -CFLAGS = -m64 -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math $(DEFINES) -CXXFLAGS = -m64 -Wall -g -ansi -pedantic -fPIC $(DEFINES) - -X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions - -#ASM_SOURCES = $(X86_SOURCES) +ARCH_FLAGS = -m64 LIB_DIR = $(TOP)/lib64 # Library/program dependencies -DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lXxf86vm -lm -lpthread -ldl -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11 - -# Directories -SRC_DIRS = mesa glu glut/glx glw glx/x11 -DRIVER_DIRS = dri -PROGRAM_DIRS = -WINDOW_SYSTEM=dri +EXTRA_LIB_PATH=-L/usr/X11R6/lib64 -# ffb, gamma, and sis are missing because they have -# not be converted to use the new interface. Do i810 & i830 really -# need to be included here? +# ffb, gamma, and sis are missing because they have not be converted to use +# the new interface. i810 and i830 are missing because there is no x86-64 +# system where they could *ever* be used. # -DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome savage +DRI_DIRS = dri_client i915 mach64 mga r128 r200 radeon tdfx unichrome savage diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index df7acff0833..d7ecc8fcd9a 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -69,7 +69,7 @@ default: depend symlinks $(LIBNAME) $(LIB_DIR)/$(LIBNAME) $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template rm -f $@ - gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) + gcc $(ARCH_FLAGS) -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) $(LIB_DIR)/$(LIBNAME): $(LIBNAME) |