From 67e9d009365b6f56f9744dacac040bb2f1465c91 Mon Sep 17 00:00:00 2001
From: Chris Want <cwant@ualberta.ca>
Date: Sun, 29 Jun 2003 17:21:38 +0000
Subject: [PATCH] Moved the OPENGL_HEADERS to the end of the include paths --
 so that render.h from another package (such as the Xrender extension on irix)
 doesn't conflict with the blender one.

---
 source/blender/src/Makefile | 3 ++-
 source/creator/Makefile     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile
index f9f308f2758..35c29a8571e 100644
--- a/source/blender/src/Makefile
+++ b/source/blender/src/Makefile
@@ -56,7 +56,6 @@ endif
 
 # PreProcessor stuff ------------------------------------------
 
-CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 CPPFLAGS += -I$(NAN_GHOST)/include
 CPPFLAGS += -I$(NAN_BMFONT)/include
@@ -112,3 +111,5 @@ endif
 ifeq ($(INTERNATIONAL), true)
     CPPFLAGS += -DINTERNATIONAL
 endif
+
+CPPFLAGS += -I$(OPENGL_HEADERS)
diff --git a/source/creator/Makefile b/source/creator/Makefile
index 147f68151f3..c50f720acb5 100644
--- a/source/creator/Makefile
+++ b/source/creator/Makefile
@@ -44,7 +44,6 @@ endif
 
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
-CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I../blender/render/extern/include
 CPPFLAGS += -I../blender/radiosity/extern/include
 # two needed for the kernel
@@ -63,3 +62,5 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 ifeq ($(WITH_QUICKTIME), true)
 	CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME
 endif
+
+CPPFLAGS += -I$(OPENGL_HEADERS)