projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'shader-file-reorg'
[mesa.git]
/
src
/
mesa
/
drivers
/
osmesa
/
Makefile
diff --git
a/src/mesa/drivers/osmesa/Makefile
b/src/mesa/drivers/osmesa/Makefile
index 9010bbd130a5ed10bf67e5f3b1b3c02d4c4860a7..c6b4a040851b45149e57930d60c3732fd7699256 100644
(file)
--- a/
src/mesa/drivers/osmesa/Makefile
+++ b/
src/mesa/drivers/osmesa/Makefile
@@
-16,20
+16,15
@@
OBJECTS = $(SOURCES:.c=.o)
INCLUDE_DIRS = \
-I$(TOP)/include \
INCLUDE_DIRS = \
-I$(TOP)/include \
+ -I$(TOP)/src/mapi \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main
-# Standalone osmesa needs to be linked with core Mesa APIs
-ifeq ($(DRIVER_DIRS), osmesa)
CORE_MESA = \
$(TOP)/src/mesa/libmesa.a \
CORE_MESA = \
$(TOP)/src/mesa/libmesa.a \
- $(TOP)/src/m
esa
/libglapi.a \
+ $(TOP)/src/m
api/glapi
/libglapi.a \
$(TOP)/src/glsl/cl/libglslcl.a \
$(TOP)/src/glsl/pp/libglslpp.a
$(TOP)/src/glsl/cl/libglslcl.a \
$(TOP)/src/glsl/pp/libglslpp.a
-else
-CORE_MESA =
-endif
-
.c.o:
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
.c.o:
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@