Part 4 of the event refactor branch: all changes in existing files,

Makefiles especially, and of course the windowmanager DNA!
2007-12-24 18:53:37 +00:00
parent c79966be52
commit 463cf8e332
20 changed files with 509 additions and 115 deletions
--- a/source/blender/nodes/Makefile
+++ b/source/blender/nodes/Makefile
@@ -29,9 +29,19 @@
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 #
-# Bounces make to subdirectories.
+#

-SOURCEDIR = source/blender/nodes
-DIRS = intern intern/CMP_nodes intern/SHD_nodes
+LIBNAME = nodes
+DIR = $(OCGDIR)/blender/$(LIBNAME)

-include nan_subdirs.mk
+include nan_compile.mk
+
+CFLAGS += $(LEVEL_1_C_WARNINGS)
+
+CPPFLAGS += -I../../blenkernel
+CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+CPPFLAGS += -I../../makesdna
+CPPFLAGS += -I../../blenlib
+CPPFLAGS += -I../../editors/include
+CPPFLAGS += -I../../imbuf
+CPPFLAGS += -I../../render/extern/include
--- a/source/blender/nodes/intern/CMP_nodes/Makefile
+++ b/source/blender/nodes/intern/CMP_nodes/Makefile
@@ -42,7 +42,6 @@ CPPFLAGS += -I../../../blenkernel
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 CPPFLAGS += -I../../../makesdna
 CPPFLAGS += -I../../../blenlib
-CPPFLAGS += -I../../../include
+CPPFLAGS += -I../../../editors/include
 CPPFLAGS += -I../../../imbuf
 CPPFLAGS += -I../../../render/extern/include
-CPPFLAGS += -I$(OPENGL_HEADERS)
--- a/source/blender/nodes/intern/SHD_nodes/Makefile
+++ b/source/blender/nodes/intern/SHD_nodes/Makefile
@@ -42,7 +42,6 @@ CPPFLAGS += -I../../../blenkernel
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 CPPFLAGS += -I../../../makesdna
 CPPFLAGS += -I../../../blenlib
-CPPFLAGS += -I../../../include
+CPPFLAGS += -I../../../editors/include
 CPPFLAGS += -I../../../imbuf
 CPPFLAGS += -I../../../render/extern/include
-CPPFLAGS += -I$(OPENGL_HEADERS)