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 /extern | |
| 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 'extern')
| -rw-r--r-- | extern/bFTGL/include/FTGL.h | 6 | ||||
| -rw-r--r-- | extern/bFTGL/src/Makefile | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/extern/bFTGL/include/FTGL.h b/extern/bFTGL/include/FTGL.h index e92bd526012..2b76de8b8bd 100644 --- a/extern/bFTGL/include/FTGL.h +++ b/extern/bFTGL/include/FTGL.h @@ -42,7 +42,11 @@ typedef float FTGL_FLOAT; #include <OpenGL/glu.h> #else #include <GL/gl.h> - #include <GL/glu.h> + #if defined (__sun__) && !defined (__sparc__) + #include <mesa/glu.h> + #else + #include <GL/glu.h> + #endif #endif #endif diff --git a/extern/bFTGL/src/Makefile b/extern/bFTGL/src/Makefile index 064480fbd16..3ebf9bee45c 100644 --- a/extern/bFTGL/src/Makefile +++ b/extern/bFTGL/src/Makefile @@ -46,7 +46,8 @@ CCSRCS = FTBitmapGlyph.cpp FTCharmap.cpp FTContour.cpp FTExtrdGlyph.cpp \ include nan_compile.mk CPPFLAGS += -I../include -CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2 +CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2 +CPPFLAGS += -I$(OPENGL_HEADERS) install: all debug @[ -d $(NAN_FTGL) ] || mkdir -p $(NAN_FTGL) |