summaryrefslogtreecommitdiff
path: root/src/mesa/sources
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/sources')
-rw-r--r--src/mesa/sources8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/sources b/src/mesa/sources
index d006191f30..9278ca88e9 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -293,7 +293,15 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
### Include directories
+### XXX we should be able to trim this down to just -Iinclude/ and -Isrc/mesa/
+### since most #includes have been changed from #include "mtypes.h" to
+### #include "main/mtypes.h", etc.
INCLUDE_DIRS = \
-I$(TOP)/include \
+<<<<<<< HEAD:src/mesa/sources
-I$(TOP)/src/mesa
+=======
+ -I$(TOP)/src/mesa \
+ -I$(TOP)/src/mesa/main
+>>>>>>> master:src/mesa/sources