diff options
author | Ton Roosendaal <ton@blender.org> | 2007-03-25 17:54:07 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2007-03-25 17:54:07 +0400 |
commit | e5455fa1f30a88b1d45e0389ac4980c202a188c5 (patch) | |
tree | 5c346fa73836705727fa2f56a8e807d4236dfc3f | |
parent | ac2ff8f97c8f92136fbc0915cd9341870be99b60 (diff) |
Fixing Makefiles for new nodes module, part 1:
- removed all UI .h include stuff! (Not allowed outside of src/)
- Makefile had typo error, compilation failed
Now it survives make, but it does not enter the two the subdirectories for
shader and compo nodes. So a linking gives unrecovered stuff in the end.
How does that work? I need help!
-rw-r--r-- | source/blender/nodes/intern/CMP_util.h | 20 | ||||
-rw-r--r-- | source/blender/nodes/intern/Makefile | 54 | ||||
-rw-r--r-- | source/blender/nodes/intern/SHD_util.h | 19 |
3 files changed, 3 insertions, 90 deletions
diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h index fd132ab7d49..1ff412e081e 100644 --- a/source/blender/nodes/intern/CMP_util.h +++ b/source/blender/nodes/intern/CMP_util.h @@ -63,18 +63,6 @@ #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" @@ -83,18 +71,10 @@ #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 c35e03173e6..ab7e089befa 100644 --- a/source/blender/nodes/intern/Makefile +++ b/source/blender/nodes/intern/Makefile @@ -31,8 +31,8 @@ # # -LIBNAME = nodes -DIR = $(OCGDIR)/blender/$(LIBNAME) +LIBNAME = nodes +SOURCEDIR = $(OCGDIR)/blender/nodes/ include nan_compile.mk @@ -42,66 +42,18 @@ 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 -# This mod uses the BLI and BLO module +CPPFLAGS += -I../../blenkernel 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 5ab7e3a7031..f7e4e7a741a 100644 --- a/source/blender/nodes/intern/SHD_util.h +++ b/source/blender/nodes/intern/SHD_util.h @@ -61,17 +61,6 @@ #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" @@ -80,17 +69,9 @@ #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 *********** */ |