archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Moved the OPENGL_HEADERS to the end of the include paths

Browse Source 
-- 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:
Chris Want
2003-06-29 17:21:38 +00:00
parent 3284916aeb
commit 67e9d00936
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/src/Makefile
View File

@@ -56,7 +56,6 @@ endif
# PreProcessor stuff ------------------------------------------ # PreProcessor stuff ------------------------------------------
CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_GHOST)/include CPPFLAGS += -I$(NAN_GHOST)/include
CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_BMFONT)/include
@@ -112,3 +111,5 @@ endif
ifeq ($(INTERNATIONAL), true) ifeq ($(INTERNATIONAL), true)
CPPFLAGS += -DINTERNATIONAL CPPFLAGS += -DINTERNATIONAL
endif endif
CPPFLAGS += -I$(OPENGL_HEADERS)

3
source/creator/Makefile
View File

@@ -44,7 +44,6 @@ endif
CFLAGS += $(LEVEL_1_C_WARNINGS) CFLAGS += $(LEVEL_1_C_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I../blender/render/extern/include CPPFLAGS += -I../blender/render/extern/include
CPPFLAGS += -I../blender/radiosity/extern/include CPPFLAGS += -I../blender/radiosity/extern/include
# two needed for the kernel # two needed for the kernel
@@ -63,3 +62,5 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
ifeq ($(WITH_QUICKTIME), true) ifeq ($(WITH_QUICKTIME), true)
CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME
endif endif
CPPFLAGS += -I$(OPENGL_HEADERS)