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 bcea71a7969600d0352f442e0a8e5ee4197c2109..75c62af0f788ab74af15d0c36dd33edd1dad812e 100644
(file)
--- a/
src/mesa/drivers/dri/Makefile.template
+++ b/
src/mesa/drivers/dri/Makefile.template
@@
-1,7
+1,5
@@
# -*-makefile-*-
# -*-makefile-*-
-TOP = ../../../../..
-
MESA_MODULES = $(TOP)/src/mesa/mesa.a
MESA_MODULES = $(TOP)/src/mesa/mesa.a
@@
-21,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) \
@@
-35,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 \
@@
-74,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)