[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11368] branches/2-44-stable/blender/ source: - fix Makefiles :
Hans Lambermont
hans at lambermont.dyndns.org
Wed Jul 25 17:47:27 CEST 2007
Revision: 11368
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11368
Author: h_xnan
Date: 2007-07-25 17:47:27 +0200 (Wed, 25 Jul 2007)
Log Message:
-----------
- fix Makefiles :
- for systems that require a -I$(OPENGL_HEADERS)
- add libIlmThread to the NAN_OPENEXR_LIBS list
- bump python from 2.3 to 2.4 on FreeBSD
- follow FreeBSD's new sdl-config name
Modified Paths:
--------------
branches/2-44-stable/blender/source/blender/nodes/intern/CMP_nodes/Makefile
branches/2-44-stable/blender/source/blender/nodes/intern/Makefile
branches/2-44-stable/blender/source/blender/nodes/intern/SHD_nodes/Makefile
branches/2-44-stable/blender/source/nan_definitions.mk
Modified: branches/2-44-stable/blender/source/blender/nodes/intern/CMP_nodes/Makefile
===================================================================
--- branches/2-44-stable/blender/source/blender/nodes/intern/CMP_nodes/Makefile 2007-07-25 13:01:44 UTC (rev 11367)
+++ branches/2-44-stable/blender/source/blender/nodes/intern/CMP_nodes/Makefile 2007-07-25 15:47:27 UTC (rev 11368)
@@ -42,6 +42,7 @@
CFLAGS += $(LEVEL_1_C_WARNINGS)
+CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I../../../blenkernel
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
CPPFLAGS += -I../../../makesdna
Modified: branches/2-44-stable/blender/source/blender/nodes/intern/Makefile
===================================================================
--- branches/2-44-stable/blender/source/blender/nodes/intern/Makefile 2007-07-25 13:01:44 UTC (rev 11367)
+++ branches/2-44-stable/blender/source/blender/nodes/intern/Makefile 2007-07-25 15:47:27 UTC (rev 11368)
@@ -42,6 +42,7 @@
CFLAGS += $(LEVEL_1_C_WARNINGS)
+CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I../../blenkernel
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
CPPFLAGS += -I../../makesdna
Modified: branches/2-44-stable/blender/source/blender/nodes/intern/SHD_nodes/Makefile
===================================================================
--- branches/2-44-stable/blender/source/blender/nodes/intern/SHD_nodes/Makefile 2007-07-25 13:01:44 UTC (rev 11367)
+++ branches/2-44-stable/blender/source/blender/nodes/intern/SHD_nodes/Makefile 2007-07-25 15:47:27 UTC (rev 11368)
@@ -42,6 +42,7 @@
CFLAGS += $(LEVEL_1_C_WARNINGS)
+CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I../../../blenkernel
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
CPPFLAGS += -I../../../makesdna
Modified: branches/2-44-stable/blender/source/nan_definitions.mk
===================================================================
--- branches/2-44-stable/blender/source/nan_definitions.mk 2007-07-25 13:01:44 UTC (rev 11367)
+++ branches/2-44-stable/blender/source/nan_definitions.mk 2007-07-25 15:47:27 UTC (rev 11368)
@@ -142,7 +142,7 @@
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
+ export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.a
endif
endif
ifeq ($(WITH_OPENEXR), true)
@@ -268,7 +268,7 @@
export FREEDESKTOP ?= true
export NAN_PYTHON ?= /usr/local
- export NAN_PYTHON_VERSION ?= 2.3
+ export NAN_PYTHON_VERSION ?= 2.4
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_OPENAL ?= /usr/local
export NAN_FMOD ?= $(LCGDIR)/fmod
@@ -282,9 +282,9 @@
export NAN_NSPR ?= /usr/local
export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_GETTEXT ?= $(LCGDIR)/gettext
- export NAN_SDL ?= $(shell sdl11-config --prefix)
- export NAN_SDLLIBS ?= $(shell sdl11-config --libs)
- export NAN_SDLCFLAGS ?= $(shell sdl11-config --cflags)
+ export NAN_SDL ?= $(shell sdl-config --prefix)
+ export NAN_SDLLIBS ?= $(shell sdl-config --libs)
+ export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
# Uncomment the following line to use Mozilla inplace of netscape
# CPPFLAGS +=-DMOZ_NOT_NET
More information about the Bf-blender-cvs
mailing list