diff --git a/source/Makefile b/source/Makefile index c8669761d45..905041900b1 100644 --- a/source/Makefile +++ b/source/Makefile @@ -74,7 +74,6 @@ PYPLAYERLIB ?= $(PYLIB) GRPLIB = $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a - GRPLIB += $(OCGDIR)/blender/misc/$(DEBUG_DIR)libmisc.a GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a GRPLIB += $(NAN_DECIMATION)/lib/libdecimation.a GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a diff --git a/source/blender/Makefile b/source/blender/Makefile index acd297eed6e..7ccb0f0c042 100644 --- a/source/blender/Makefile +++ b/source/blender/Makefile @@ -36,7 +36,7 @@ include nan_definitions.mk DIRS = blenloader DIRS += deflate inflate encrypt decrypt sign verify DIRS += writestreamglue readstreamglue writeblenfile readblenfile -DIRS += avi imbuf img misc render radiosity blenlib blenkernel blenpluginapi +DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi DIRS += bpython makesdna src renderconverter DIR = $(OCGDIR)/blender diff --git a/source/blender/radiosity/intern/source/Makefile b/source/blender/radiosity/intern/source/Makefile index e0bb43772c2..7040f17f448 100644 --- a/source/blender/radiosity/intern/source/Makefile +++ b/source/blender/radiosity/intern/source/Makefile @@ -56,5 +56,4 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # first /include is my own includes, second are the external includes # third is the external interface. there should be a nicer way to say this CPPFLAGS += -I../include -I../../../include -I../../extern/include -CPPFLAGS += -I../../../render/extern/include -I../../../misc diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile index 5e3d1b095ad..39491081298 100644 --- a/source/blender/render/intern/source/Makefile +++ b/source/blender/render/intern/source/Makefile @@ -48,7 +48,6 @@ CFLAGS += $(LEVEL_2_C_WARNINGS) CPPFLAGS += -I../include CPPFLAGS += -I../../extern/include CPPFLAGS += -I../../../radiosity/extern/include -CPPFLAGS += -I../../../misc CPPFLAGS += -I../../../blenlib CPPFLAGS += -I../../../imbuf CPPFLAGS += -I../../../makesdna diff --git a/source/blender/renderconverter/intern/Makefile b/source/blender/renderconverter/intern/Makefile index b5680e0cba8..529cb8e0ec7 100644 --- a/source/blender/renderconverter/intern/Makefile +++ b/source/blender/renderconverter/intern/Makefile @@ -52,6 +52,5 @@ CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../include -CPPFLAGS += -I../../misc CPPFLAGS += -I../../ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index 50679ebfdf6..38d28469af3 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -77,7 +77,6 @@ CPPFLAGS += -I../img CPPFLAGS += -I../blenloader CPPFLAGS += -I../verify CPPFLAGS += -I.. -CPPFLAGS += -I../misc CPPFLAGS += -I../../kernel/gen_system CPPFLAGS += -I../../gameengine/SoundSystem diff --git a/source/creator/Makefile b/source/creator/Makefile index c652b0228ad..9c754c74bbe 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -47,7 +47,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I../blender/render/extern/include CPPFLAGS += -I../blender/radiosity/extern/include -CPPFLAGS += -I../blender/misc # two needed for the kernel CPPFLAGS += -I../blender/imbuf CPPFLAGS += -I../blender/makesdna diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index 93faaa64a32..d09a8d613d7 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -47,8 +47,6 @@ CPPFLAGS += -I$(NAN_FUZZICS)/include # because of kernel dependency on makesdna CPPFLAGS += -I../../blender/makesdna CPPFLAGS += -I../../blender/include -# timer stuff -CPPFLAGS += -I../../blender/misc # because of kernel dependency on imbuf CPPFLAGS += -I../../blender/imbuf CPPFLAGS += -I../../blender/blenlib