diff options
| author | Ian Romanick <idr@us.ibm.com> | 2005-04-06 21:34:34 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2005-04-06 21:34:34 +0000 |
| commit | bfc8a8dc6324f5e984566208bd0a1fa472102917 (patch) | |
| tree | 0b5bdede0fe5a243cb8a356d6684527bd6d6adc0 /configs/linux-dri | |
| parent | 29c909f81ceae4a0356718d6be0a14562c98c019 (diff) | |
Make linux-dri-x86-64 more like linux-dri-x86. Add ARCH_FLAGS. This is
where things like "-m64" or "-m32" should be specified. Using this, a
32-bit DRI build can be done on an x86-64 system by doing 'ARCH_CFLAGS=-m32
make linux-dri-x86'. Minor tweaks to linux-dri to support these changes.
Diffstat (limited to 'configs/linux-dri')
| -rw-r--r-- | configs/linux-dri | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index 331ce5ba2d..5d44ccd2fc 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 |