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

Make linux-dri-x86-64 more like linux-dri-x86. Add ARCH_FLAGS. This is

Browse Source 
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.
This commit is contained in:
Ian Romanick
2005-04-06 21:34:34 +00:00
parent 29c909f81c
commit bfc8a8dc63
3 changed files with 20 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configs/linux-dri
View File

@@ -14,9 +14,9 @@ MKDEP = /usr/X11R6/bin/makedepend
#MKDEP_OPTIONS = -MF depend #MKDEP_OPTIONS = -MF depend
WARN_FLAGS = -Wall WARN_FLAGS = -Wall
OPT_FLAGS = -O -g OPT_FLAGS = -O -g
PIC_FLAGS = -fPIC PIC_FLAGS = -fPIC
ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_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 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 \ CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math
CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \ CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
$(DEFINES)
ASM_SOURCES = ASM_SOURCES =
# Library/program dependencies # Library/program dependencies
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl EXTRA_LIB_PATH=-L/usr/X11R6/lib
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 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 # Directories
SRC_DIRS = mesa glu glut/glx glw glx/x11 SRC_DIRS = glx/x11 mesa glu glut/glx glw
DRIVER_DIRS = dri DRIVER_DIRS = dri
PROGRAM_DIRS = PROGRAM_DIRS =
WINDOW_SYSTEM=dri WINDOW_SYSTEM=dri

34
configs/linux-dri-x86-64
View File

@@ -1,40 +1,20 @@
# -*-makefile-*- # -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others # 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 CONFIG_NAME = linux-dri-x86-64
# Compiler and flags ARCH_FLAGS = -m64
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)
LIB_DIR = $(TOP)/lib64 LIB_DIR = $(TOP)/lib64
# Library/program dependencies # Library/program dependencies
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl EXTRA_LIB_PATH=-L/usr/X11R6/lib64
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 # ffb, gamma, and sis are missing because they have not be converted to use
SRC_DIRS = mesa glu glut/glx glw glx/x11 # the new interface. i810 and i830 are missing because there is no x86-64
DRIVER_DIRS = dri # system where they could *ever* be used.
PROGRAM_DIRS =
WINDOW_SYSTEM=dri
# 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?
# #
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

2
src/mesa/drivers/dri/Makefile.template
View File

@@ -69,7 +69,7 @@ default: depend symlinks $(LIBNAME) $(LIB_DIR)/$(LIBNAME)
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
rm -f $@ 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) $(LIB_DIR)/$(LIBNAME): $(LIBNAME)