kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

This is a modified version of this patch:

Browse Source 
[#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
This commit is contained in:
Kent Mein 2007-12-05 16:58:52 +00:00
parent b3c1e458b4
commit 7b2e348d4f
21 changed files with 123 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extern/bFTGL/include/FTGL.h vendored
View File

@ -42,7 +42,11 @@ typedef float FTGL_FLOAT;
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #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
#endif #endif

3
extern/bFTGL/src/Makefile vendored
View File

@ -46,7 +46,8 @@ CCSRCS = FTBitmapGlyph.cpp FTCharmap.cpp FTContour.cpp FTExtrdGlyph.cpp \
include nan_compile.mk include nan_compile.mk
CPPFLAGS += -I../include 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 install: all debug
@[ -d $(NAN_FTGL) ] || mkdir -p $(NAN_FTGL) @[ -d $(NAN_FTGL) ] || mkdir -p $(NAN_FTGL)

5
release/Makefile
View File

@ -55,6 +55,11 @@ ifeq ($(OS),$(findstring $(OS), "freebsd irix linux openbsd solaris"))
COMPRESS="bzip2" COMPRESS="bzip2"
COMPRESSFLAGS="-f" COMPRESSFLAGS="-f"
EXT2=".bz2" EXT2=".bz2"
ifeq ($(OS), solaris)
ifeq ($(CPU), i386)
NOPLUGINS=true
endif
endif
endif endif
ifeq ($(OS),windows) ifeq ($(OS),windows)

71
source/Makefile
View File

@ -61,7 +61,6 @@ endif
############# set pyplayerlib ################## ############# set pyplayerlib ##################
PYPLAYERLIB ?= $(PYLIB)
############# libraries ################## ############# libraries ##################
# COMLIB COMmon LIBraries for all targets # COMLIB COMmon LIBraries for all targets
@ -175,54 +174,25 @@ ifeq ($(WITH_DDS), true)
endif endif
ifeq ($(WITH_FREETYPE2), true) ifeq ($(WITH_FREETYPE2), true)
COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
ifeq ($(OS), windows) ifeq ($(OS), windows)
ifeq ($(FREE_WINDOWS), true) ifeq ($(FREE_WINDOWS), true)
COMLIB += $(NAN_FTGL)/lib/libftgl.a
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
else else
COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
endif endif
else else
COMLIB += $(NAN_FTGL)/lib/libftgl.a
ifeq ($(OS), irix) ifeq ($(OS), irix)
COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
else else
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
endif endif
endif endif
endif endif
ifeq ($(INTERNATIONAL), true)
COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
ifeq ($(OS), windows)
ifeq ($(FREE_WINDOWS), true)
COMLIB += $(NAN_GETTEXT)/lib/freegettext.a
COMLIB += $(NAN_FTGL)/lib/libftgl.a
#COMLIB += $(NAN_ICONV)/lib/freeiconv.a
else
COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
COMLIB += $(NAN_ICONV)/lib/iconv.lib
endif
else
COMLIB += $(NAN_FTGL)/lib/libftgl.a
ifeq ($(OS), irix)
COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
COMLIB += $(NAN_FREETYPE)/lib32/libintl.a
else
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
endif
endif
ifeq ($(OS), darwin)
COMLIB += $(NAN_GETTEXT)/lib/libintl.a
ifeq ($(CPU), i386)
COMLIB += $(NAN_GETTEXT)/lib/libiconv.a
endif
endif
ifeq ($(OS), solaris)
COMLIB += $(NAN_GETTEXT)/lib/libintl.a
endif
endif
ifeq ($(WITH_VERSE), true) ifeq ($(WITH_VERSE), true)
ifeq ($(OS), windows) ifeq ($(OS), windows)
ifeq ($(FREE_WINDOWS), true) ifeq ($(FREE_WINDOWS), true)
@ -352,14 +322,7 @@ ifeq ($(WITH_BF_WEBPLUGIN), true)
endif endif
endif endif
ifdef PY_FRAMEWORK
PYLIB = -framework Python
else
PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
endif
ifeq ($(OS),solaris) ifeq ($(OS),solaris)
PYLIB += $(NAN_ZLIB)/lib/libz.a
PULIB += $(NAN_ZLIB)/lib/libz.a PULIB += $(NAN_ZLIB)/lib/libz.a
SPLIB += $(NAN_ZLIB)/lib/libz.a SPLIB += $(NAN_ZLIB)/lib/libz.a
endif endif
@ -434,14 +397,6 @@ else
endif endif
ifeq ($(OS),windows) ifeq ($(OS),windows)
ifeq ($(FREE_WINDOWS),true)
PYLIB = $(NAN_PYTHON)/lib/freepy.a
else
PYLIB = $(NAN_PYTHON)/lib/python23.lib
endif
PYPLAYERLIB = $(NAN_PYTHON)/static/*.obj
PYPLAYERLIB = $(PYLIB)
# Might need to change this to $(NAN_MOZILLA_LIB)/nspr4.lib # Might need to change this to $(NAN_MOZILLA_LIB)/nspr4.lib
NSPLUGLIB += $(NAN_NSPR)/lib/nspr4.lib NSPLUGLIB += $(NAN_NSPR)/lib/nspr4.lib
@ -548,7 +503,7 @@ ifdef NAN_BUILDINFO
$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"static"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"static"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin mkdir -p $(DIR)/$(DEBUG_DIR)bin
$(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(PYLIB) $(LLIBS) $(SADD) $(LOPTS) $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(SADD) $(LOPTS)
ifdef NAN_BUILDINFO ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O) /bin/rm $(BUILDINFO_O)
endif endif
@ -562,7 +517,7 @@ ifdef NAN_BUILDINFO
$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin mkdir -p $(DIR)/$(DEBUG_DIR)bin
$(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS) $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O) /bin/rm $(BUILDINFO_O)
endif endif
@ -576,7 +531,7 @@ ifdef NAN_BUILDINFO
$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin mkdir -p $(DIR)/$(DEBUG_DIR)bin
$(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYPLAYERLIB) $(LLIBS) $(DADD) $(LOPTS) $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O) /bin/rm $(BUILDINFO_O)
endif endif
@ -590,7 +545,7 @@ ifdef NAN_BUILDINFO
$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin mkdir -p $(DIR)/$(DEBUG_DIR)bin
$(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS) $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O) /bin/rm $(BUILDINFO_O)
endif endif
@ -619,8 +574,8 @@ $(DIR)/$(DEBUG_DIR)npB3DPlg$(SOEXT): $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLI
ifdef NAN_BUILDINFO ifdef NAN_BUILDINFO
$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif endif
# $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS) # $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS)
$(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS) /def:$(DEFFILE) $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS) /def:$(DEFFILE)
ifdef NAN_BUILDINFO ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O) /bin/rm $(BUILDINFO_O)
endif endif
@ -631,7 +586,7 @@ ifdef NAN_BUILDINFO
$(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin mkdir -p $(DIR)/$(DEBUG_DIR)bin
$(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS) $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O) /bin/rm $(BUILDINFO_O)
endif endif

2
source/blender/Makefile
View File

@ -38,7 +38,7 @@ DIRS += avi imbuf render radiosity blenlib blenkernel blenpluginapi
DIRS += makesdna src yafray DIRS += makesdna src yafray
DIRS += python nodes DIRS += python nodes
ifeq ($(INTERNATIONAL), true) ifeq ($(WITH_FREETYPE2), true)
DIRS += ftfont DIRS += ftfont
endif endif

1
source/blender/ftfont/intern/Makefile
View File

@ -47,6 +47,7 @@ CPPFLAGS += -I$(NAN_FTGL)/include
CPPFLAGS += -I$(NAN_FTGL)/include/FTGL CPPFLAGS += -I$(NAN_FTGL)/include/FTGL
CPPFLAGS += -I$(NAN_GETTEXT)/include CPPFLAGS += -I$(NAN_GETTEXT)/include
CPPFLAGS += -I$(NAN_FREETYPE)/include CPPFLAGS += -I$(NAN_FREETYPE)/include
CPPFLAGS += -I$(OPENGL_HEADERS)
ifeq ($(OS), windows) ifeq ($(OS), windows)
CPPFLAGS += -I$(NAN_ICONV)/include CPPFLAGS += -I$(NAN_ICONV)/include
ifeq ($(FREE_WINDOWS), true) ifeq ($(FREE_WINDOWS), true)

4
source/blender/include/BIF_gl.h
View File

@ -57,7 +57,11 @@
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#if defined(__sun__) && !defined(__sparc__)
#include <mesa/glu.h>
#else
#include <GL/glu.h> #include <GL/glu.h>
#endif
#endif #endif
/* /*
* these should be phased out. cpack should be replaced in * these should be phased out. cpack should be replaced in

1
source/blender/nodes/intern/CMP_nodes/Makefile
View File

@ -45,3 +45,4 @@ CPPFLAGS += -I../../../blenlib
CPPFLAGS += -I../../../include CPPFLAGS += -I../../../include
CPPFLAGS += -I../../../imbuf CPPFLAGS += -I../../../imbuf
CPPFLAGS += -I../../../render/extern/include CPPFLAGS += -I../../../render/extern/include
CPPFLAGS += -I$(OPENGL_HEADERS)

1
source/blender/nodes/intern/Makefile
View File

@ -45,3 +45,4 @@ CPPFLAGS += -I../../blenlib
CPPFLAGS += -I../../include CPPFLAGS += -I../../include
CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../imbuf
CPPFLAGS += -I../../render/extern/include CPPFLAGS += -I../../render/extern/include
CPPFLAGS += -I$(OPENGL_HEADERS)

1
source/blender/nodes/intern/SHD_nodes/Makefile
View File

@ -45,3 +45,4 @@ CPPFLAGS += -I../../../blenlib
CPPFLAGS += -I../../../include CPPFLAGS += -I../../../include
CPPFLAGS += -I../../../imbuf CPPFLAGS += -I../../../imbuf
CPPFLAGS += -I../../../render/extern/include CPPFLAGS += -I../../../render/extern/include
CPPFLAGS += -I$(OPENGL_HEADERS)

4
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
View File

@ -54,8 +54,12 @@
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#if defined(__sun__) && !defined(__sparc__)
#include <mesa/glu.h>
#else
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif
#include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h" #include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
#include "RAS_OpenGLRasterizer/ARB_multitexture.h" #include "RAS_OpenGLRasterizer/ARB_multitexture.h"
#include "BL_Material.h" // MAXTEX #include "BL_Material.h" // MAXTEX

4
source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
View File

@ -43,8 +43,12 @@
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#if defined(__sun__) && !defined(__sparc__)
#include <mesa/glu.h>
#else
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif

4
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
View File

@ -46,8 +46,12 @@
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#if defined(__sun__) && !defined(__sparc__)
#include <mesa/glu.h>
#else
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif
#include "GPG_Application.h" #include "GPG_Application.h"

4
source/gameengine/Ketsji/BL_Shader.cpp
View File

@ -9,8 +9,12 @@
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#if defined(__sun__) && !defined(__sparc__)
#include <mesa/glu.h>
#else
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif
#include <iostream> #include <iostream>
#include "BL_Shader.h" #include "BL_Shader.h"

4
source/gameengine/Ketsji/BL_Texture.cpp
View File

@ -8,8 +8,12 @@
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#if defined(__sun__) && !defined(__sparc__)
#include <mesa/glu.h>
#else
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif
#include <iostream> #include <iostream>
#include <map> #include <map>

4
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
View File

@ -15,8 +15,12 @@
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#if defined(__sun__) && !defined(__sparc__)
#include <mesa/glu.h>
#else
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif
#include "KX_BlenderMaterial.h" #include "KX_BlenderMaterial.h"
#include "BL_Material.h" #include "BL_Material.h"

4
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@ -44,8 +44,12 @@
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#if defined(__sun__) && !defined(__sparc__)
#include <mesa/glu.h>
#else
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif
#ifdef WIN32 #ifdef WIN32
#pragma warning (disable : 4786) #pragma warning (disable : 4786)

4
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@ -46,8 +46,12 @@
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#if defined(__sun__) && !defined(__sparc__)
#include <mesa/glu.h>
#else
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#endif
#include "RAS_Rect.h" #include "RAS_Rect.h"
#include "RAS_TexVert.h" #include "RAS_TexVert.h"

2
source/nan_compile.mk
View File

@ -190,7 +190,7 @@ ifeq ($(OS),solaris)
JAVA_HEADERS = /usr/java/include JAVA_HEADERS = /usr/java/include
JAVA_SYSTEM_HEADERS = /usr/java/include/solaris JAVA_SYSTEM_HEADERS = /usr/java/include/solaris
else else
OPENGL_HEADERS = /usr/local/include OPENGL_HEADERS = /usr/X11/include
endif endif
AR = ar AR = ar
ARFLAGS = ruv ARFLAGS = ruv

63
source/nan_definitions.mk
View File

@ -141,8 +141,13 @@ endif
NAN_OPENEXR_LIBS?=$(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs OpenEXR | sed -s "s/-l//g" ))) NAN_OPENEXR_LIBS?=$(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs OpenEXR | sed -s "s/-l//g" )))
endif endif
else else
export NAN_OPENEXR ?= /usr/local ifeq ($(OS), solaris)
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a export NAN_OPENEXR ?= /usr/local
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.a -lrt
else
export NAN_OPENEXR ?= /usr/local
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
endif
endif endif
endif endif
ifeq ($(WITH_OPENEXR), true) ifeq ($(WITH_OPENEXR), true)
@ -165,6 +170,7 @@ endif
export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON ?= $(LCGDIR)/python
export NAN_PYTHON_VERSION ?= 2.3 export NAN_PYTHON_VERSION ?= 2.3
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_OPENAL ?= $(LCGDIR)/openal
export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_FMOD ?= $(LCGDIR)/fmod
export NAN_JPEG ?= $(LCGDIR)/jpeg export NAN_JPEG ?= $(LCGDIR)/jpeg
@ -211,10 +217,12 @@ endif
export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/2.3 export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/2.3
export NAN_PYTHON_VERSION ?= 2.3 export NAN_PYTHON_VERSION ?= 2.3
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_PYTHON_LIB ?= -framework Python
else else
export NAN_PYTHON ?= /sw export NAN_PYTHON ?= /sw
export NAN_PYTHON_VERSION ?= 2.3 export NAN_PYTHON_VERSION ?= 2.3
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
endif endif
export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_OPENAL ?= $(LCGDIR)/openal
@ -229,6 +237,10 @@ endif
export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_GETTEXT ?= $(LCGDIR)/gettext
export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/libintl.a
ifeq (($CPU), i386)
export NAN_GETTEXT_LIB += $(NAN_GETTEXT)/lib/libintl.a
endif
export NAN_SDL ?= $(LCGDIR)/sdl export NAN_SDL ?= $(LCGDIR)/sdl
export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include
export NAN_SDLLIBS ?= $(NAN_SDL)/lib/libSDL.a -framework Cocoa -framework IOKit export NAN_SDLLIBS ?= $(NAN_SDL)/lib/libSDL.a -framework Cocoa -framework IOKit
@ -270,6 +282,7 @@ endif
export NAN_PYTHON ?= /usr/local export NAN_PYTHON ?= /usr/local
export NAN_PYTHON_VERSION ?= 2.3 export NAN_PYTHON_VERSION ?= 2.3
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
export NAN_OPENAL ?= /usr/local export NAN_OPENAL ?= /usr/local
export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_FMOD ?= $(LCGDIR)/fmod
export NAN_JPEG ?= /usr/local export NAN_JPEG ?= /usr/local
@ -314,6 +327,7 @@ endif
export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON ?= $(LCGDIR)/python
export NAN_PYTHON_VERSION ?= 2.3 export NAN_PYTHON_VERSION ?= 2.3
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_OPENAL ?= $(LCGDIR)/openal
export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_FMOD ?= $(LCGDIR)/fmod
export NAN_JPEG ?= $(LCGDIR)/jpeg export NAN_JPEG ?= $(LCGDIR)/jpeg
@ -326,6 +340,7 @@ endif
export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_FREETYPE ?= /usr/freeware export NAN_FREETYPE ?= /usr/freeware
export NAN_GETTEXT ?= /usr/freeware export NAN_GETTEXT ?= /usr/freeware
export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib32/libintl.a
export NAN_SDL ?= $(LCGDIR)/sdl export NAN_SDL ?= $(LCGDIR)/sdl
export NAN_SDLLIBS ?= -L$(NAN_SDL)/lib -lSDL export NAN_SDLLIBS ?= -L$(NAN_SDL)/lib -lSDL
export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include/SDL export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include/SDL
@ -358,6 +373,7 @@ endif
export NAN_PYTHON ?= /usr export NAN_PYTHON ?= /usr
export NAN_PYTHON_VERSION ?= 2.5 export NAN_PYTHON_VERSION ?= 2.5
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
export NAN_OPENAL ?= /usr export NAN_OPENAL ?= /usr
export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_FMOD ?= $(LCGDIR)/fmod
export NAN_JPEG ?= /usr export NAN_JPEG ?= /usr
@ -413,6 +429,7 @@ endif
export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON ?= $(LCGDIR)/python
export NAN_PYTHON_VERSION ?= 2.3 export NAN_PYTHON_VERSION ?= 2.3
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_OPENAL ?= $(LCGDIR)/openal
export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_FMOD ?= $(LCGDIR)/fmod
export NAN_JPEG ?= $(LCGDIR)/jpeg export NAN_JPEG ?= $(LCGDIR)/jpeg
@ -455,21 +472,23 @@ endif
export NAN_PYTHON ?= /usr/local export NAN_PYTHON ?= /usr/local
export NAN_PYTHON_VERSION ?= 2.3 export NAN_PYTHON_VERSION ?= 2.3
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_OPENAL ?= /usr/local export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
export NAN_OPENAL ?= $(LCGDIR)/openal
export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_FMOD ?= $(LCGDIR)/fmod
export NAN_JPEG ?= /usr/local export NAN_JPEG ?= $(LCGDIR)/jpeg
export NAN_PNG ?= /usr/local export NAN_PNG ?= $(LCGDIR)/png
export NAN_TIFF ?= /usr export NAN_TIFF ?= /usr
export NAN_ODE ?= $(LCGDIR)/ode export NAN_ODE ?= $(LCGDIR)/ode
export NAN_TERRAPLAY ?= export NAN_TERRAPLAY ?=
export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_MESA ?= /usr/src/Mesa-3.1
export NAN_ZLIB ?= /usr export NAN_ZLIB ?= $(LCGDIR)/zlib
export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_GETTEXT ?= $(LCGDIR)/gettext
export NAN_SDL ?= $(shell sdl-config --prefix) export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/libintl.a $(NAN_GETTEXT)/lib/libiconv.a
export NAN_SDLLIBS ?= $(shell sdl-config --libs) export NAN_SDL ?= $(LCGDIR)/sdl
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags) export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include/SDL
export NAN_SDLLIBS ?= $(NAN_SDL)/lib/libSDL.a
# Uncomment the following line to use Mozilla inplace of netscape # Uncomment the following line to use Mozilla inplace of netscape
# CPPFLAGS +=-DMOZ_NOT_NET # CPPFLAGS +=-DMOZ_NOT_NET
@ -498,20 +517,18 @@ endif
export NAN_PYTHON_VERSION ?= 2.5 export NAN_PYTHON_VERSION ?= 2.5
ifeq ($(FREE_WINDOWS), true) ifeq ($(FREE_WINDOWS), true)
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/freepy.a
export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype
export NAN_ODE ?= $(LCGDIR)/gcc/ode export NAN_ODE ?= $(LCGDIR)/gcc/ode
ifeq ($(NAN_SDL),) export NAN_SDL ?= $(LCGDIR)/gcc/sdl
export NAN_SDL ?= $(LCGDIR)/gcc/sdl export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include
export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include
endif
else else
export NAN_PYTHON_BINARY ?= python export NAN_PYTHON_BINARY ?= python
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python23.lib
export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_ODE ?= $(LCGDIR)/ode export NAN_ODE ?= $(LCGDIR)/ode
ifeq ($(NAN_SDL),) export NAN_SDL ?= $(LCGDIR)/sdl
export NAN_SDL ?= $(LCGDIR)/sdl export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include
export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include
endif
endif endif
export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_OPENAL ?= $(LCGDIR)/openal
export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_FMOD ?= $(LCGDIR)/fmod
@ -523,6 +540,11 @@ endif
export NAN_ZLIB ?= $(LCGDIR)/zlib export NAN_ZLIB ?= $(LCGDIR)/zlib
export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_GETTEXT ?= $(LCGDIR)/gettext
ifeq ($FREE_WINDOWS), true)
export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/freegettext.a $(NAN_GETTEXT)/lib/freeiconv.a
else
export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/gnu_gettext.lib $(NAN_GETTEXT)/lib/iconv.lib
endif
# Uncomment the following line to use Mozilla inplace of netscape # Uncomment the following line to use Mozilla inplace of netscape
# CPPFLAGS +=-DMOZ_NOT_NET # CPPFLAGS +=-DMOZ_NOT_NET
@ -550,6 +572,8 @@ endif
export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON ?= $(LCGDIR)/python
export NAN_PYTHON_VERSION ?= 2.3 export NAN_PYTHON_VERSION ?= 2.3
export NAN_PYTHON_BINARY ?= python export NAN_PYTHON_BINARY ?= python
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_OPENAL ?= $(LCGDIR)/openal
export NAN_FMOD ?= $(LCGDIR)/fmod export NAN_FMOD ?= $(LCGDIR)/fmod
export NAN_JPEG ?= $(LCGDIR)/jpeg export NAN_JPEG ?= $(LCGDIR)/jpeg
@ -601,3 +625,8 @@ ifeq ($(NAN_NO_KETSJI), true)
export NAN_JUST_BLENDERDYNAMIC=true export NAN_JUST_BLENDERDYNAMIC=true
export NAN_NO_OPENAL=true export NAN_NO_OPENAL=true
endif endif
# INTERNATIONAL implies WITH_FREETYPE2
ifeq ($(INTERNATIONAL), true)
export WITH_FREETYPE2=true
endif

12
source/nan_link.mk
View File

@ -52,7 +52,6 @@ SOEXT = .so
ifeq ($(OS),beos) ifeq ($(OS),beos)
LLIBS = -L/boot/develop/lib/x86/ -lGL -lbe -L/boot/home/config/lib/ LLIBS = -L/boot/develop/lib/x86/ -lGL -lbe -L/boot/home/config/lib/
LLIBS += -lpython1.5
endif endif
ifeq ($(OS),darwin) ifeq ($(OS),darwin)
@ -118,7 +117,10 @@ ifeq ($(OS),openbsd)
endif endif
ifeq ($(OS),solaris) ifeq ($(OS),solaris)
LLIBS = -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl ifeq ($(CPU), i386)
LLIBS = -L/usr/X11/lib
endif
LLIBS += -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl
DYNLDFLAGS = -shared $(LDFLAGS) DYNLDFLAGS = -shared $(LDFLAGS)
endif endif
@ -162,3 +164,9 @@ endif
ifeq ($(WITH_FFMPEG),true) ifeq ($(WITH_FFMPEG),true)
LLIBS += $(NAN_FFMPEGLIBS) LLIBS += $(NAN_FFMPEGLIBS)
endif endif
ifeq ($(INTERNATIONAL),true)
LLIBS += $(NAN_GETTEXT_LIB)
endif
LLIBS += $(NAN_PYTHON_LIB)