diff options
-rw-r--r-- | source/blender/nodes/intern/CMP_util.h | 20 | ||||
-rw-r--r-- | source/blender/nodes/intern/Makefile | 52 | ||||
-rw-r--r-- | source/blender/nodes/intern/SHD_util.h | 19 |
3 files changed, 89 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h index 1ff412e081e..fd132ab7d49 100644 --- a/source/blender/nodes/intern/CMP_util.h +++ b/source/blender/nodes/intern/CMP_util.h @@ -63,6 +63,18 @@ #include "../CMP_node.h" + +#include "BIF_gl.h" +#include "BIF_glutil.h" +#include "BIF_interface.h" +#include "BIF_interface_icons.h" +#include "BIF_language.h" +#include "BIF_mywindow.h" +#include "BIF_previewrender.h" +#include "BIF_resources.h" +#include "BIF_screen.h" +#include "BIF_space.h" + #include "BLI_arithb.h" #include "BLI_blenlib.h" #include "BLI_rand.h" @@ -71,10 +83,18 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "BSE_drawipo.h" +#include "BSE_node.h" +#include "BSE_view.h" + #include "RE_pipeline.h" #include "RE_shader_ext.h" #include "RE_render_ext.h" +#include "butspace.h" +#include "blendef.h" +#include "mydevice.h" + /* *************************** operations support *************************** */ /* general signal that's in output sockets, and goes over the wires */ diff --git a/source/blender/nodes/intern/Makefile b/source/blender/nodes/intern/Makefile index ab7e089befa..7158c57aefe 100644 --- a/source/blender/nodes/intern/Makefile +++ b/source/blender/nodes/intern/Makefile @@ -32,7 +32,7 @@ # LIBNAME = nodes -SOURCEDIR = $(OCGDIR)/blender/nodes/ +DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk @@ -42,18 +42,66 @@ endif CFLAGS += $(LEVEL_1_C_WARNINGS) +# OpenGL and Python +CPPFLAGS += -I$(OPENGL_HEADERS) +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) + CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +# Reference to the types in makesdna and imbuf CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../imbuf -CPPFLAGS += -I../../blenkernel +# This mod uses the BLI and BLO module CPPFLAGS += -I../../blenlib +CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../python +# also avi is used +CPPFLAGS += -I../../avi +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +# we still refer to /include a bit... +CPPFLAGS += -I../../include # to include the render stuff: CPPFLAGS += -I../../render/extern/include +# for sound +#CPPFLAGS += -I../../../kernel/gen_system +CPPFLAGS += $(NAN_SDLCFLAGS) + +CPPFLAGS += -I$(NAN_IKSOLVER)/include +CPPFLAGS += -I$(NAN_DECIMATION)/include +CPPFLAGS += -I$(NAN_ELBEEM)/include + +# path to zlib +CPPFLAGS += -I$(NAN_ZLIB)/include + #path to nodes CPPFLAGS += -I../ # path to our own external headerfiles CPPFLAGS += -I.. + +ifeq ($(WITH_FREETYPE2), true) + CPPFLAGS += -DWITH_FREETYPE2 + CPPFLAGS += -I$(NAN_FREETYPE)/include + CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 +endif + +ifeq ($(WITH_VERSE), true) + CPPFLAGS += -DWITH_VERSE + CPPFLAGS += -I$(NAN_VERSE)/include +endif + +ifeq ($(WITH_FFMPEG),true) + CPPFLAGS += -DWITH_FFMPEG + CPPFLAGS += $(NAN_FFMPEGCFLAGS) +endif + +ifeq ($(WITH_OPENEXR), true) + CPPFLAGS += -DWITH_OPENEXR +endif + +ifeq ($(WITH_QUICKTIME), true) + CPPFLAGS += -I../../quicktime + CPPFLAGS += -DWITH_QUICKTIME +endif diff --git a/source/blender/nodes/intern/SHD_util.h b/source/blender/nodes/intern/SHD_util.h index f7e4e7a741a..5ab7e3a7031 100644 --- a/source/blender/nodes/intern/SHD_util.h +++ b/source/blender/nodes/intern/SHD_util.h @@ -61,6 +61,17 @@ #include "../SHD_node.h" +#include "BIF_gl.h" +#include "BIF_glutil.h" +#include "BIF_interface.h" +#include "BIF_interface_icons.h" +#include "BIF_language.h" +#include "BIF_mywindow.h" +#include "BIF_previewrender.h" +#include "BIF_resources.h" +#include "BIF_screen.h" +#include "BIF_space.h" + #include "BLI_arithb.h" #include "BLI_blenlib.h" #include "BLI_rand.h" @@ -69,9 +80,17 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "BSE_drawipo.h" +#include "BSE_node.h" +#include "BSE_view.h" + #include "RE_pipeline.h" #include "RE_shader_ext.h" +#include "butspace.h" +#include "blendef.h" +#include "mydevice.h" + /* ********* exec data struct, remains internal *********** */ |