diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-30 18:29:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-30 18:29:22 +0300 |
commit | 89c617a1168294037b8878752b82daa1311a7b73 (patch) | |
tree | 561375b597ee2e4ed7a5a3cfd3cb8ccf025e66d4 /source/blender/render/intern | |
parent | 9400f4309a61ffd2df2d2b3e736f879af55069b0 (diff) |
remove nan-makefiles
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/Makefile | 34 | ||||
-rw-r--r-- | source/blender/render/intern/raytrace/Makefile | 69 | ||||
-rw-r--r-- | source/blender/render/intern/source/Makefile | 65 |
3 files changed, 0 insertions, 168 deletions
diff --git a/source/blender/render/intern/Makefile b/source/blender/render/intern/Makefile deleted file mode 100644 index 4043902a40f..00000000000 --- a/source/blender/render/intern/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# Bounces make to subdirectories. - -SOURCEDIR = source/blender/render/intern -DIRS = source raytrace - -include nan_subdirs.mk diff --git a/source/blender/render/intern/raytrace/Makefile b/source/blender/render/intern/raytrace/Makefile deleted file mode 100644 index 2da8038c610..00000000000 --- a/source/blender/render/intern/raytrace/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = render_raytrace -DIR = $(OCGDIR)/blender/render - -include nan_compile.mk - -CFLAGS += $(LEVEL_1_C_WARNINGS) - -# first /include is my own includes, second is the external interface. -# The external modules follow after. There should be a nicer way to say this. -CPPFLAGS += -I../include -CPPFLAGS += -I../../extern/include -CPPFLAGS += -I../../../blenlib -CPPFLAGS += -I../../../imbuf -CPPFLAGS += -I../../../makesdna -CPPFLAGS += -I../../../makesrna -CPPFLAGS += -I../../../blenkernel -CPPFLAGS += -I../../../quicktime -CPPFLAGS += -I../../../../kernel/gen_messaging -CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include -# not very neat: the rest of blender.. -CPPFLAGS += -I../../../editors/include -CPPFLAGS += $(NAN_SDLCFLAGS) -CPPFLAGS += -I../../../../../intern/smoke/extern - -ifeq ($(WITH_QUICKTIME), true) - CPPFLAGS += -DWITH_QUICKTIME -endif - -ifeq ($(WITH_FFMPEG),true) - CPPFLAGS += -DWITH_FFMPEG -endif - -ifeq ($(WITH_OPENEXR),true) - CPPFLAGS += -DWITH_OPENEXR -endif - -ifeq ($(WITH_BF_RAYOPTIMIZATION), true) - CPPFLAGS += -D__SSE__ -endif diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile deleted file mode 100644 index 5aaa66e7712..00000000000 --- a/source/blender/render/intern/source/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = render -DIR = $(OCGDIR)/blender/$(LIBNAME) - -include nan_compile.mk - -CFLAGS += $(LEVEL_1_C_WARNINGS) - -# first /include is my own includes, second is the external interface. -# The external modules follow after. There should be a nicer way to say this. -CPPFLAGS += -I../include -CPPFLAGS += -I../../extern/include -CPPFLAGS += -I../../../blenlib -CPPFLAGS += -I../../../imbuf -CPPFLAGS += -I../../../makesdna -CPPFLAGS += -I../../../makesrna -CPPFLAGS += -I../../../blenkernel -CPPFLAGS += -I../../../quicktime -CPPFLAGS += -I../../../../kernel/gen_messaging -CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include -# not very neat: the rest of blender.. -CPPFLAGS += -I../../../editors/include -CPPFLAGS += $(NAN_SDLCFLAGS) -CPPFLAGS += -I../../../../../intern/smoke/extern - -ifeq ($(WITH_QUICKTIME), true) - CPPFLAGS += -DWITH_QUICKTIME -endif - -ifeq ($(WITH_FFMPEG),true) - CPPFLAGS += -DWITH_FFMPEG -endif - -ifeq ($(WITH_OPENEXR),true) - CPPFLAGS += -DWITH_OPENEXR -endif |