diff options
21 files changed, 123 insertions, 81 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) diff --git a/release/Makefile b/release/Makefile index c55e62be003..daba1cce754 100644 --- a/release/Makefile +++ b/release/Makefile @@ -55,6 +55,11 @@ ifeq ($(OS),$(findstring $(OS), "freebsd irix linux openbsd solaris")) COMPRESS="bzip2" COMPRESSFLAGS="-f" EXT2=".bz2" + ifeq ($(OS), solaris) + ifeq ($(CPU), i386) + NOPLUGINS=true + endif + endif endif ifeq ($(OS),windows) diff --git a/source/Makefile b/source/Makefile index f5e9e57fa55..ff5c6d5551e 100644 --- a/source/Makefile +++ b/source/Makefile @@ -61,7 +61,6 @@ endif ############# set pyplayerlib ################## -PYPLAYERLIB ?= $(PYLIB) ############# libraries ################## # COMLIB COMmon LIBraries for all targets @@ -175,51 +174,22 @@ ifeq ($(WITH_DDS), true) endif ifeq ($(WITH_FREETYPE2), true) + COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a ifeq ($(OS), windows) ifeq ($(FREE_WINDOWS), true) + COMLIB += $(NAN_FTGL)/lib/libftgl.a COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a else + COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib endif else + COMLIB += $(NAN_FTGL)/lib/libftgl.a ifeq ($(OS), irix) COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a - else - COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - 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 + COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a + endif endif endif @@ -352,14 +322,7 @@ ifeq ($(WITH_BF_WEBPLUGIN), true) 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) - PYLIB += $(NAN_ZLIB)/lib/libz.a PULIB += $(NAN_ZLIB)/lib/libz.a SPLIB += $(NAN_ZLIB)/lib/libz.a endif @@ -434,14 +397,6 @@ else endif 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 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 endif 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 /bin/rm $(BUILDINFO_O) 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 endif 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 /bin/rm $(BUILDINFO_O) 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 endif 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 /bin/rm $(BUILDINFO_O) 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 endif 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 /bin/rm $(BUILDINFO_O) endif @@ -619,8 +574,8 @@ $(DIR)/$(DEBUG_DIR)npB3DPlg$(SOEXT): $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLI 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 endif -# $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(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) + $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS) /def:$(DEFFILE) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) 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 endif 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 /bin/rm $(BUILDINFO_O) endif 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) diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index 8f7609aed74..413b16bc300 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -54,8 +54,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 #include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h" #include "RAS_OpenGLRasterizer/ARB_multitexture.h" #include "BL_Material.h" // MAXTEX diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp index 5b3c2c84edb..840230902f8 100644 --- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp +++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp @@ -43,8 +43,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 diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 0d2aa774394..4f6c78a0fd8 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -46,8 +46,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 #include "GPG_Application.h" diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index ab0479eb88b..3b74b74727a 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -9,8 +9,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 #include <iostream> #include "BL_Shader.h" diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index d6b57f062f2..53e1af46e4e 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -8,8 +8,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 #include <iostream> #include <map> diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index fa1c67f251c..c3aa83bec69 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -15,8 +15,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 #include "KX_BlenderMaterial.h" #include "BL_Material.h" diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 1a3a0490d21..1a6aafafabf 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -44,8 +44,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 #ifdef WIN32 #pragma warning (disable : 4786) diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 85250fcd552..4f9c3a1bfb3 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -46,8 +46,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 #include "RAS_Rect.h" #include "RAS_TexVert.h" diff --git a/source/nan_compile.mk b/source/nan_compile.mk index ae2717e3b5c..192528aa5a6 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -190,7 +190,7 @@ ifeq ($(OS),solaris) JAVA_HEADERS = /usr/java/include JAVA_SYSTEM_HEADERS = /usr/java/include/solaris else - OPENGL_HEADERS = /usr/local/include + OPENGL_HEADERS = /usr/X11/include endif AR = ar ARFLAGS = ruv diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 7fa3eb98e00..43a3eb5f998 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -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" ))) endif 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 + ifeq ($(OS), solaris) + 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 ifeq ($(WITH_OPENEXR), true) @@ -165,6 +170,7 @@ endif export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON_VERSION ?= 2.3 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_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= $(LCGDIR)/jpeg @@ -211,10 +217,12 @@ endif export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/2.3 export NAN_PYTHON_VERSION ?= 2.3 export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) + export NAN_PYTHON_LIB ?= -framework Python else export NAN_PYTHON ?= /sw export NAN_PYTHON_VERSION ?= 2.3 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 export NAN_OPENAL ?= $(LCGDIR)/openal @@ -229,6 +237,10 @@ endif export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_FREETYPE ?= $(LCGDIR)/freetype 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_SDLCFLAGS ?= -I$(NAN_SDL)/include 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_VERSION ?= 2.3 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_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= /usr/local @@ -314,6 +327,7 @@ endif export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON_VERSION ?= 2.3 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_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= $(LCGDIR)/jpeg @@ -326,6 +340,7 @@ endif export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_FREETYPE ?= /usr/freeware export NAN_GETTEXT ?= /usr/freeware + export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib32/libintl.a export NAN_SDL ?= $(LCGDIR)/sdl export NAN_SDLLIBS ?= -L$(NAN_SDL)/lib -lSDL export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include/SDL @@ -358,6 +373,7 @@ endif export NAN_PYTHON ?= /usr export NAN_PYTHON_VERSION ?= 2.5 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_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= /usr @@ -413,6 +429,7 @@ endif export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON_VERSION ?= 2.3 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_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= $(LCGDIR)/jpeg @@ -455,21 +472,23 @@ endif export NAN_PYTHON ?= /usr/local export NAN_PYTHON_VERSION ?= 2.3 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_JPEG ?= /usr/local - export NAN_PNG ?= /usr/local + export NAN_JPEG ?= $(LCGDIR)/jpeg + export NAN_PNG ?= $(LCGDIR)/png export NAN_TIFF ?= /usr export NAN_ODE ?= $(LCGDIR)/ode export NAN_TERRAPLAY ?= export NAN_MESA ?= /usr/src/Mesa-3.1 - export NAN_ZLIB ?= /usr + export NAN_ZLIB ?= $(LCGDIR)/zlib export NAN_NSPR ?= $(LCGDIR)/nspr export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_GETTEXT ?= $(LCGDIR)/gettext - export NAN_SDL ?= $(shell sdl-config --prefix) - export NAN_SDLLIBS ?= $(shell sdl-config --libs) - export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags) + export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/libintl.a $(NAN_GETTEXT)/lib/libiconv.a + export NAN_SDL ?= $(LCGDIR)/sdl + 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 # CPPFLAGS +=-DMOZ_NOT_NET @@ -498,20 +517,18 @@ endif export NAN_PYTHON_VERSION ?= 2.5 ifeq ($(FREE_WINDOWS), true) 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_ODE ?= $(LCGDIR)/gcc/ode - ifeq ($(NAN_SDL),) - export NAN_SDL ?= $(LCGDIR)/gcc/sdl - export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include - endif + export NAN_SDL ?= $(LCGDIR)/gcc/sdl + export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include else export NAN_PYTHON_BINARY ?= python + export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python23.lib export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_ODE ?= $(LCGDIR)/ode - ifeq ($(NAN_SDL),) - export NAN_SDL ?= $(LCGDIR)/sdl - export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include - endif + export NAN_SDL ?= $(LCGDIR)/sdl + export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include endif export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_FMOD ?= $(LCGDIR)/fmod @@ -523,6 +540,11 @@ endif export NAN_ZLIB ?= $(LCGDIR)/zlib export NAN_NSPR ?= $(LCGDIR)/nspr 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 # CPPFLAGS +=-DMOZ_NOT_NET @@ -550,6 +572,8 @@ endif export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON_VERSION ?= 2.3 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_FMOD ?= $(LCGDIR)/fmod export NAN_JPEG ?= $(LCGDIR)/jpeg @@ -601,3 +625,8 @@ ifeq ($(NAN_NO_KETSJI), true) export NAN_JUST_BLENDERDYNAMIC=true export NAN_NO_OPENAL=true endif + +# INTERNATIONAL implies WITH_FREETYPE2 +ifeq ($(INTERNATIONAL), true) + export WITH_FREETYPE2=true +endif diff --git a/source/nan_link.mk b/source/nan_link.mk index e6824643a04..35a0a9d0070 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -52,7 +52,6 @@ SOEXT = .so ifeq ($(OS),beos) LLIBS = -L/boot/develop/lib/x86/ -lGL -lbe -L/boot/home/config/lib/ - LLIBS += -lpython1.5 endif ifeq ($(OS),darwin) @@ -118,7 +117,10 @@ ifeq ($(OS),openbsd) endif 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) endif @@ -162,3 +164,9 @@ endif ifeq ($(WITH_FFMPEG),true) LLIBS += $(NAN_FFMPEGLIBS) endif + +ifeq ($(INTERNATIONAL),true) + LLIBS += $(NAN_GETTEXT_LIB) +endif + +LLIBS += $(NAN_PYTHON_LIB) |