Moved the OPENGL_HEADERS to the end of the include paths
authorChris Want <cwant@ualberta.ca>
Sun, 29 Jun 2003 17:21:38 +0000 (17:21 +0000)
committerChris Want <cwant@ualberta.ca>
Sun, 29 Jun 2003 17:21:38 +0000 (17:21 +0000)
-- 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
source/creator/Makefile

index f9f308f275800a5d3a579a24c6021a21e00c6be0..35c29a8571ea36c54c048f006bb76552e583856d 100644 (file)
@@ -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)
index 147f68151f35c5dddfa91052070ca5ef3be491ff..c50f720acb5802ae591ea24183c9d227e4fb38df 100644 (file)
@@ -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)