forked from bartvdbraak/blender
Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.
And handful of whitespace clean ups.
This commit is contained in:
parent
8ab49a4c5e
commit
3e2766bc2e
6
extern/Makefile
vendored
6
extern/Makefile
vendored
@ -34,7 +34,7 @@ DIRS = glew/src
|
|||||||
|
|
||||||
# Cloth requires it
|
# Cloth requires it
|
||||||
ifeq ($(NAN_USE_BULLET), true)
|
ifeq ($(NAN_USE_BULLET), true)
|
||||||
DIRS += bullet2
|
DIRS += bullet2
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(WITH_BINRELOC), true)
|
ifeq ($(WITH_BINRELOC), true)
|
||||||
@ -42,7 +42,9 @@ ifeq ($(WITH_BINRELOC), true)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(WITH_OPENJPEG), true)
|
ifeq ($(WITH_OPENJPEG), true)
|
||||||
DIRS += libopenjpeg
|
ifndef BF_OPENJPEG
|
||||||
|
DIRS += libopenjpeg
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(WITH_LZO), true)
|
ifeq ($(WITH_LZO), true)
|
||||||
|
@ -41,6 +41,11 @@ ifeq ($(WITH_BF_OPENMP),true)
|
|||||||
CPPFLAGS += -DPARALLEL
|
CPPFLAGS += -DPARALLEL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_FFTW3),true)
|
||||||
|
CPPFLAGS += -DFFTW3=1
|
||||||
|
CPPFLAGS += $(BF_FFTW3_INC)
|
||||||
|
endif
|
||||||
|
|
||||||
CPPFLAGS += -I.
|
CPPFLAGS += -I.
|
||||||
CPPFLAGS += -I../extern
|
CPPFLAGS += -I../extern
|
||||||
CPPFLAGS += -I$(NAN_PNG)/include
|
CPPFLAGS += -I$(NAN_PNG)/include
|
||||||
|
@ -188,7 +188,11 @@ ifeq ($(WITH_OPENEXR), true)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(WITH_OPENJPEG), true)
|
ifeq ($(WITH_OPENJPEG), true)
|
||||||
COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a
|
ifndef BF_OPENJPEG_LIBS
|
||||||
|
COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a
|
||||||
|
else
|
||||||
|
COMLIB += $(BF_OPENJPEG_LIBS)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a
|
COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a
|
||||||
|
@ -39,7 +39,7 @@ include nan_definitions.mk
|
|||||||
DIRS = cineon
|
DIRS = cineon
|
||||||
|
|
||||||
ifeq ($(WITH_OPENEXR), true)
|
ifeq ($(WITH_OPENEXR), true)
|
||||||
DIRS += openexr
|
DIRS += openexr
|
||||||
CFLAGS += -DWITH_OPENEXR
|
CFLAGS += -DWITH_OPENEXR
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -49,7 +49,11 @@ ifeq ($(WITH_DDS), true)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(WITH_OPENJPEG), true)
|
ifeq ($(WITH_OPENJPEG), true)
|
||||||
CFLAGS += -DWITH_OPENJPEG -I../../../../extern/libopenjpeg
|
ifndef BF_OPENJPEG_INC
|
||||||
|
CFLAGS += -DWITH_OPENJPEG -I../../../../extern/libopenjpeg
|
||||||
|
else
|
||||||
|
CFLAGS += -DWITH_OPENJPEG -I$(BF_OPENJPEG_INC)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS += $(LEVEL_1_C_WARNINGS)
|
CFLAGS += $(LEVEL_1_C_WARNINGS)
|
||||||
|
@ -81,8 +81,8 @@ ifndef CONFIG_GUESS
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
export NAN_MOTO ?= $(LCGDIR)/moto
|
export NAN_MOTO ?= $(LCGDIR)/moto
|
||||||
export NAN_ITASC ?= $(LCGDIR)/itasc
|
export NAN_ITASC ?= $(LCGDIR)/itasc
|
||||||
|
|
||||||
export BF_PROFILE ?= false
|
export BF_PROFILE ?= false
|
||||||
export NAN_USE_BULLET ?= true
|
export NAN_USE_BULLET ?= true
|
||||||
export NAN_BULLET2 ?= $(LCGDIR)/bullet2
|
export NAN_BULLET2 ?= $(LCGDIR)/bullet2
|
||||||
@ -122,6 +122,7 @@ ifndef CONFIG_GUESS
|
|||||||
export WITH_OPENAL ?= false
|
export WITH_OPENAL ?= false
|
||||||
export WITH_JACK ?= false
|
export WITH_JACK ?= false
|
||||||
export WITH_SNDFILE ?= false
|
export WITH_SNDFILE ?= false
|
||||||
|
export WITH_FFTW3 ?= false
|
||||||
|
|
||||||
ifeq ($(WITH_OPENAL), true)
|
ifeq ($(WITH_OPENAL), true)
|
||||||
export NAN_OPENAL ?= /usr
|
export NAN_OPENAL ?= /usr
|
||||||
@ -195,7 +196,7 @@ ifndef CONFIG_GUESS
|
|||||||
export NAN_OPENEXR ?= $(LCGDIR)/openexr
|
export NAN_OPENEXR ?= $(LCGDIR)/openexr
|
||||||
export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
|
export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
|
||||||
export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.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
|
||||||
|
|
||||||
export NAN_NO_KETSJI=false
|
export NAN_NO_KETSJI=false
|
||||||
|
|
||||||
ifeq ($(CPU), i386)
|
ifeq ($(CPU), i386)
|
||||||
@ -350,6 +351,18 @@ ifndef CONFIG_GUESS
|
|||||||
export NAN_OPENEXR_LIBS ?= $(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs-only-l OpenEXR | sed -s "s/-l//g" )))
|
export NAN_OPENEXR_LIBS ?= $(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs-only-l OpenEXR | sed -s "s/-l//g" )))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_FFTW3), true)
|
||||||
|
export BF_FFTW3 ?= $(shell pkg-config --variable=prefix fftw3 )
|
||||||
|
export BF_FFTW3_INC ?= $(shell pkg-config --variable=includedir fftw3 )
|
||||||
|
export BF_FFTW3_LIBS ?= $(shell pkg-config --libs fftw3 )
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_OPENJPEG), true)
|
||||||
|
export BF_OPENJPEG ?= /usr
|
||||||
|
export BF_OPENJPEG_INC ?= /usr/include
|
||||||
|
export BF_OPENJPEG_LIBS ?= -lopenjpeg
|
||||||
|
endif
|
||||||
|
|
||||||
# Uncomment the following line to use Mozilla inplace of netscape
|
# Uncomment the following line to use Mozilla inplace of netscape
|
||||||
|
|
||||||
# Location of MOZILLA/Netscape header files...
|
# Location of MOZILLA/Netscape header files...
|
||||||
|
@ -170,4 +170,8 @@ ifeq ($(WITH_BF_OPENMP),true)
|
|||||||
LLIBS += -lgomp
|
LLIBS += -lgomp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_FFTW3),true)
|
||||||
|
LLIBS += $(BF_FFTW3_LIBS)
|
||||||
|
endif
|
||||||
|
|
||||||
LLIBS += $(NAN_PYTHON_LIB)
|
LLIBS += $(NAN_PYTHON_LIB)
|
||||||
|
Loading…
Reference in New Issue
Block a user