diff options
| author | Kent Mein <mein@cs.umn.edu> | 2007-12-05 19:58:52 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2007-12-05 19:58:52 +0300 |
| commit | 7b2e348d4f0252470f0ee484d812a264d5a86fc3 (patch) | |
| tree | f45b343af1600761ff269dca18a7b0d4f3b2cdcc /source/blender | |
| parent | b3c1e458b43d4014bc720c7eb20af5e02f6f5ab5 (diff) | |
This is a modified version of this patch:
[#7660] Solaris 10 x86 support (Makefiles)
Hopefully it will not mess up anything for anyone else. I removed
some hardcoded static libs and made NAN_*_LIB definitions so they could be
overridden, to allow greater flexability.
Let me know if there are any problems/questions.
Kent
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/ftfont/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/include/BIF_gl.h | 4 | ||||
| -rw-r--r-- | source/blender/nodes/intern/CMP_nodes/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/nodes/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/nodes/intern/SHD_nodes/Makefile | 1 |
6 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/Makefile b/source/blender/Makefile index c0001495210..2c1f83edf39 100644 --- a/source/blender/Makefile +++ b/source/blender/Makefile @@ -38,7 +38,7 @@ DIRS += avi imbuf render radiosity blenlib blenkernel blenpluginapi DIRS += makesdna src yafray DIRS += python nodes -ifeq ($(INTERNATIONAL), true) +ifeq ($(WITH_FREETYPE2), true) DIRS += ftfont endif diff --git a/source/blender/ftfont/intern/Makefile b/source/blender/ftfont/intern/Makefile index 064ec5dc597..4668241c5c8 100644 --- a/source/blender/ftfont/intern/Makefile +++ b/source/blender/ftfont/intern/Makefile @@ -47,6 +47,7 @@ CPPFLAGS += -I$(NAN_FTGL)/include CPPFLAGS += -I$(NAN_FTGL)/include/FTGL CPPFLAGS += -I$(NAN_GETTEXT)/include CPPFLAGS += -I$(NAN_FREETYPE)/include +CPPFLAGS += -I$(OPENGL_HEADERS) ifeq ($(OS), windows) CPPFLAGS += -I$(NAN_ICONV)/include ifeq ($(FREE_WINDOWS), true) diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h index 215e88dc002..611cefca51c 100644 --- a/source/blender/include/BIF_gl.h +++ b/source/blender/include/BIF_gl.h @@ -57,8 +57,12 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> +#if defined(__sun__) && !defined(__sparc__) +#include <mesa/glu.h> +#else #include <GL/glu.h> #endif +#endif /* * these should be phased out. cpack should be replaced in * code with calls to glColor3ub, lrectwrite probably should diff --git a/source/blender/nodes/intern/CMP_nodes/Makefile b/source/blender/nodes/intern/CMP_nodes/Makefile index 036812548b4..3564bf9034b 100644 --- a/source/blender/nodes/intern/CMP_nodes/Makefile +++ b/source/blender/nodes/intern/CMP_nodes/Makefile @@ -45,3 +45,4 @@ CPPFLAGS += -I../../../blenlib CPPFLAGS += -I../../../include CPPFLAGS += -I../../../imbuf CPPFLAGS += -I../../../render/extern/include +CPPFLAGS += -I$(OPENGL_HEADERS) diff --git a/source/blender/nodes/intern/Makefile b/source/blender/nodes/intern/Makefile index bae9a8dcf1d..3b7783c5d1e 100644 --- a/source/blender/nodes/intern/Makefile +++ b/source/blender/nodes/intern/Makefile @@ -45,3 +45,4 @@ CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../include CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../render/extern/include +CPPFLAGS += -I$(OPENGL_HEADERS) diff --git a/source/blender/nodes/intern/SHD_nodes/Makefile b/source/blender/nodes/intern/SHD_nodes/Makefile index 6344af4a5cb..0ab6134ac93 100644 --- a/source/blender/nodes/intern/SHD_nodes/Makefile +++ b/source/blender/nodes/intern/SHD_nodes/Makefile @@ -45,3 +45,4 @@ CPPFLAGS += -I../../../blenlib CPPFLAGS += -I../../../include CPPFLAGS += -I../../../imbuf CPPFLAGS += -I../../../render/extern/include +CPPFLAGS += -I$(OPENGL_HEADERS) |