forked from bartvdbraak/blender
== Makefiles ==
* add support for LCMS (disabled by default, set WITH_LCMS to true to enable it) * fixed typo that prevented TIFF support to be properly enabled * enable ray optimization by default (scons and cmake already did this) * fixed building with libsndfile on darwin (disabled by default) * quicktime: use audaspace headers from $(NAN_AUDASPACE)/include instead of intern * gameengine: add -DWITH_FFMPEG to compiler flags when building with ffmpeg support
This commit is contained in:
parent
708ef64663
commit
d50cc7826f
@ -89,7 +89,6 @@ ifeq ($(OS),darwin)
|
||||
CCFLAGS += -pipe -fPIC -funsigned-char
|
||||
endif
|
||||
|
||||
|
||||
CFLAGS += -arch $(MACOSX_ARCHITECTURE) #-isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MACOSX_MIN_VERS)
|
||||
CCFLAGS += -arch $(MACOSX_ARCHITECTURE) #-isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MACOSX_MIN_VERS)
|
||||
|
||||
|
@ -159,6 +159,11 @@ ifndef CONFIG_GUESS
|
||||
endif
|
||||
|
||||
export WITH_TIFF ?= true
|
||||
|
||||
#enable raytracing optimization (currently only for i386 and x86_64)
|
||||
export WITH_BF_RAYOPTIMIZATION ?= true
|
||||
|
||||
export WITH_LCMS ?= false
|
||||
export WITH_CINEON ?= true
|
||||
export WITH_HDR ?= true
|
||||
|
||||
@ -624,6 +629,11 @@ ifndef CONFIG_GUESS
|
||||
# default tiff libs
|
||||
export NAN_TIFF_LIBS ?= $(NAN_TIFF)/lib/libtiff.a
|
||||
|
||||
# default path to lcms, may be overidden in platform sections above or in user-def.mk
|
||||
export BF_LCMS ?= $(LCGDIR)/lcms
|
||||
export BF_LCMS_INC ?= $(BF_LCMS)/include
|
||||
export BF_LCMS_LIBS ?= $(BF_LCMS)/lib/liblcms.a
|
||||
|
||||
endif # CONFIG_GUESS
|
||||
|
||||
# Don't want to build the gameengine?
|
||||
|
@ -195,4 +195,8 @@ ifeq ($(WITH_TIFF),true)
|
||||
LLIBS += $(NAN_TIFF_LIBS)
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_LCMS),true)
|
||||
LLIBS += $(BF_LCMS_LIBS)
|
||||
endif
|
||||
|
||||
LLIBS += $(NAN_PYTHON_LIB)
|
||||
|
@ -420,7 +420,7 @@ ifeq ($(WITH_JACK),true)
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_SNDFILE),true)
|
||||
ifeq ($(OS),$(findstring $(OS), "linux"))
|
||||
ifeq ($(OS),$(findstring $(OS), "linux darwin"))
|
||||
NAN_SND_LIBS += $(NAN_SNDFILELIBS)
|
||||
endif
|
||||
endif
|
||||
|
@ -149,3 +149,8 @@ ifeq ($(OS), darwin)
|
||||
CPPFLAGS += -DPARALLEL=1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_LCMS), true)
|
||||
CPPFLAGS += -DWITH_LCMS
|
||||
CPPFLAGS += -I$(BF_LCMS_INC)
|
||||
endif
|
||||
|
@ -57,14 +57,20 @@ ifeq ($(WITH_OPENEXR), true)
|
||||
CPPFLAGS += -DWITH_OPENEXR
|
||||
endif
|
||||
|
||||
ifeq ($(WHITH_TIFF), true)
|
||||
ifeq ($(WITH_TIFF), true)
|
||||
CPPFLAGS += -DWITH_TIFF
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_LCMS), true)
|
||||
CPPFLAGS += -DWITH_LCMS
|
||||
CPPFLAGS += -I$(BF_LCMS_INC)
|
||||
endif
|
||||
|
||||
ifeq ($(WHITH_CINEON), true)
|
||||
CPPFLAGS += -DWITH_CINEON
|
||||
endif
|
||||
|
||||
ifeq ($(WHITH_HDR), true)
|
||||
CPPFLAGS += -DWITH_HDR
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -97,6 +97,10 @@ ifeq ($(WITH_TIFF),true)
|
||||
CPPFLAGS += -DWITH_TIFF
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_LCMS),true)
|
||||
CPPFLAGS += -DWITH_LCMS
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_CINEON),true)
|
||||
CPPFLAGS += -DWITH_CINEON
|
||||
endif
|
||||
|
@ -59,5 +59,5 @@ CPPFLAGS += -I..
|
||||
CPPFLAGS += -I../../blenloader -I../../imbuf/intern -I../../imbuf
|
||||
CPPFLAGS += -I../../blenlib -I../../makesdna -I../../editors/include -I../../avi
|
||||
CPPFLAGS += -I../../blenkernel -I../../render/extern/include -I../../windowmanager -I../../makesrna
|
||||
CPPFLAGS += -I../../../intern/audaspace/intern
|
||||
CPPFLAGS += -I$(NAN_AUDASPACE)/include
|
||||
|
||||
|
@ -63,3 +63,7 @@ endif
|
||||
ifeq ($(WITH_OPENEXR),true)
|
||||
CPPFLAGS += -DWITH_OPENEXR
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_BF_RAYOPTIMIZATION), true)
|
||||
CPPFLAGS += -D__SSE__
|
||||
endif
|
||||
|
@ -65,6 +65,10 @@ CPPFLAGS += -I../../blender/imbuf
|
||||
CPPFLAGS += -I../../blender/gpu
|
||||
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
||||
|
||||
ifeq ($(WITH_FFMPEG), true)
|
||||
CPPFLAGS += -DWITH_FFMPEG
|
||||
endif
|
||||
|
||||
###########################
|
||||
|
||||
SOURCEDIR = source/gameengine/Ketsji
|
||||
|
Loading…
Reference in New Issue
Block a user