projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Can't bail in sisDDLogicOpCode when logicop is off, because it's called with
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
Makefile.template
diff --git
a/src/mesa/drivers/dri/Makefile.template
b/src/mesa/drivers/dri/Makefile.template
index 250259785b31b5fec4cdbf801ab1f7eb6f4aa48b..75c62af0f788ab74af15d0c36dd33edd1dad812e 100644
(file)
--- a/
src/mesa/drivers/dri/Makefile.template
+++ b/
src/mesa/drivers/dri/Makefile.template
@@
-1,9
+1,5
@@
# -*-makefile-*-
# -*-makefile-*-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-
MESA_MODULES = $(TOP)/src/mesa/mesa.a
MESA_MODULES = $(TOP)/src/mesa/mesa.a
@@
-23,6
+19,7
@@
WINLIB=-L$(MESA)/src/glx/mini
MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
INCLUDES = $(MINIGLX_INCLUDES) \
-I$(DRM_SOURCE_PATH)/shared \
MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
INCLUDES = $(MINIGLX_INCLUDES) \
-I$(DRM_SOURCE_PATH)/shared \
+ -I$(DRM_SOURCE_PATH)/libdrm \
$(SHARED_INCLUDES)
OBJECTS = $(C_SOURCES:.c=.o) \
$(SHARED_INCLUDES)
OBJECTS = $(C_SOURCES:.c=.o) \
@@
-37,9
+34,10
@@
endif
### Include directories
SHARED_INCLUDES = \
-I. \
### Include directories
SHARED_INCLUDES = \
-I. \
- -I
..
/common \
+ -I
$(TOP)/src/mesa/drivers/dri
/common \
-Iserver \
-I$(DRM_SOURCE_PATH)/shared \
-Iserver \
-I$(DRM_SOURCE_PATH)/shared \
+ -I$(DRM_SOURCE_PATH)/linux \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa \
@@
-51,6
+49,10
@@
SHARED_INCLUDES = \
-I$(TOP)/src/mesa/swrast \
-I$(TOP)/src/mesa/swrast_setup
-I$(TOP)/src/mesa/swrast \
-I$(TOP)/src/mesa/swrast_setup
+# Of course we're direct rendering. Redundant #ifdefs in the code
+# from prehistory require this:
+#
+DEFINES += -DGLX_DIRECT_RENDERING
##### RULES #####
##### RULES #####
@@
-72,7
+74,7
@@
default: depend symlinks $(LIB_DIR)/$(LIBNAME)
# $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS)
# $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS)
-$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
..
/Makefile.template
+$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
$(TOP)/src/mesa/drivers/dri
/Makefile.template
rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(GL_LIB_DEPS)
rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(GL_LIB_DEPS)
@@
-83,7
+85,7
@@
$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile ../Makefil
depend: $(C_SOURCES) $(ASM_SOURCES)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
depend: $(C_SOURCES) $(ASM_SOURCES)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
- >
& /dev/null
+ >
/dev/null 2>&1
# Emacs tags
# Emacs tags
@@
-93,6
+95,6
@@
tags:
# Remove .o and backup files
clean:
# Remove .o and backup files
clean:
- -rm -f *.o */*.o *~ *.o *~ *.so server/*.o $(SYMLINKS)
+ -rm -f *.o */*.o *~ *.o *~ *.so server/*.o $(SYMLINKS)
depend
include depend
include depend