forked from bartvdbraak/blender
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.
This commit is contained in:
parent
3284916aeb
commit
67e9d00936
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user