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

gallium: general clean-up of xlib winsys Makefile

Browse Source
This commit is contained in:
Brian
2008-02-19 16:51:19 -07:00
parent 75a4524f2c
commit 49c3f3b537
1 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gallium/winsys/xlib/Makefile
View File

@@ -4,6 +4,11 @@ TOP = ../../../..
include $(TOP)/configs/current include $(TOP)/configs/current
GL_MAJOR = 1
GL_MINOR = 5
GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
INCLUDE_DIRS = \ INCLUDE_DIRS = \
-I$(TOP)/include \ -I$(TOP)/include \
-I$(TOP)/src/mesa \ -I$(TOP)/src/mesa \
@@ -12,7 +17,7 @@ INCLUDE_DIRS = \
-I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/gallium/auxiliary -I$(TOP)/src/gallium/auxiliary
X11_DRIVER_SOURCES = \ XLIB_WINSYS_SOURCES = \
glxapi.c \ glxapi.c \
fakeglx.c \ fakeglx.c \
xfonts.c \ xfonts.c \
@@ -21,10 +26,7 @@ X11_DRIVER_SOURCES = \
xm_winsys_aub.c \ xm_winsys_aub.c \
brw_aub.c brw_aub.c
XLIB_WINSYS_OBJECTS = $(XLIB_WINSYS_SOURCES:.c=.o)
GL_MAJOR = 1
GL_MINOR = 5
GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
ifeq ($(CONFIG_NAME), linux-cell) ifeq ($(CONFIG_NAME), linux-cell)
@@ -32,7 +34,7 @@ ifeq ($(CONFIG_NAME), linux-cell)
CELL_SPU_LIB = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a CELL_SPU_LIB = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
endif endif
PIPE_LIB = \ LIBS = \
$(GALLIUM_DRIVERS) \ $(GALLIUM_DRIVERS) \
$(TOP)/src/mesa/libglapi.a \ $(TOP)/src/mesa/libglapi.a \
$(TOP)/src/mesa/libmesa.a \ $(TOP)/src/mesa/libmesa.a \
@@ -48,36 +50,21 @@ PIPE_LIB = \
.cpp.o: .cpp.o:
$(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@ $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
.S.o:
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
###################################################################### # Make the libGL.so library
# Stand-alone Mesa libGL and libOSMesa $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(XLIB_WINSYS_OBJECTS) $(LIBS)
STAND_ALONE_DRIVER_SOURCES = \
$(X11_DRIVER_SOURCES)
STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
STAND_ALONE_OBJECTS = \
$(STAND_ALONE_DRIVER_OBJECTS)
# Make the GL library
$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(PIPE_LIB)
$(TOP)/bin/mklib -o $(GL_LIB) \ $(TOP)/bin/mklib -o $(GL_LIB) \
-linker "$(CC)" \ -linker "$(CC)" \
-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
-install $(TOP)/$(LIB_DIR) \ -install $(TOP)/$(LIB_DIR) \
$(MKLIB_OPTIONS) $(STAND_ALONE_OBJECTS) \ $(MKLIB_OPTIONS) $(XLIB_WINSYS_OBJECTS) \
--start-group $(PIPE_LIB) --end-group $(GL_LIB_DEPS) --start-group $(LIBS) --end-group $(GL_LIB_DEPS)
######################################################################
# Generic stuff
depend: $(ALL_SOURCES) depend: $(ALL_SOURCES)
@ echo "running $(MKDEP)" @ echo "running $(MKDEP)"
@ rm -f depend # workaround oops on gutsy?!? @ rm -f depend # workaround oops on gutsy?!?
@@ -94,10 +81,6 @@ install: default
$(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \ $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
fi fi
## NOT INSTALLED YET:
## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES
# Emacs tags # Emacs tags
tags: tags: