[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34567] trunk/blender: remove nan-makefiles

Campbell Barton ideasman42 at gmail.com
Sun Jan 30 16:29:28 CET 2011


Revision: 34567
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34567
Author:   campbellbarton
Date:     2011-01-30 15:29:22 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
remove nan-makefiles

Removed Paths:
-------------
    trunk/blender/Makefile
    trunk/blender/build_files/make/
    trunk/blender/doc/build_systems/README.windows-gcc
    trunk/blender/extern/Makefile
    trunk/blender/extern/binreloc/Makefile
    trunk/blender/extern/bullet2/Makefile
    trunk/blender/extern/bullet2/src/Makefile
    trunk/blender/extern/glew/src/Makefile
    trunk/blender/extern/libopenjpeg/Makefile
    trunk/blender/extern/lzma/Makefile
    trunk/blender/extern/lzo/minilzo/Makefile
    trunk/blender/intern/Makefile
    trunk/blender/intern/audaspace/FX/Makefile
    trunk/blender/intern/audaspace/Makefile
    trunk/blender/intern/audaspace/OpenAL/Makefile
    trunk/blender/intern/audaspace/Python/Makefile
    trunk/blender/intern/audaspace/SDL/Makefile
    trunk/blender/intern/audaspace/SRC/Makefile
    trunk/blender/intern/audaspace/ffmpeg/Makefile
    trunk/blender/intern/audaspace/fftw/Makefile
    trunk/blender/intern/audaspace/intern/Makefile
    trunk/blender/intern/audaspace/jack/Makefile
    trunk/blender/intern/audaspace/sndfile/Makefile
    trunk/blender/intern/boolop/Makefile
    trunk/blender/intern/boolop/intern/Makefile
    trunk/blender/intern/bsp/Makefile
    trunk/blender/intern/bsp/intern/Makefile
    trunk/blender/intern/bsp/test/BSP_GhostTest/Makefile
    trunk/blender/intern/bsp/test/Makefile
    trunk/blender/intern/container/Makefile
    trunk/blender/intern/container/intern/Makefile
    trunk/blender/intern/decimation/Makefile
    trunk/blender/intern/decimation/intern/Makefile
    trunk/blender/intern/decimation/test/Makefile
    trunk/blender/intern/decimation/test/decimate_glut_test/Makefile
    trunk/blender/intern/decimation/test/decimate_glut_test/intern/Makefile
    trunk/blender/intern/decimation/test/decimate_glut_test/intern/common/Makefile
    trunk/blender/intern/decimation/test/decimate_glut_test/intern/ply/Makefile
    trunk/blender/intern/elbeem/Makefile
    trunk/blender/intern/elbeem/intern/Makefile
    trunk/blender/intern/ghost/Makefile
    trunk/blender/intern/ghost/intern/Makefile
    trunk/blender/intern/ghost/test/Makefile
    trunk/blender/intern/ghost/test/gears/Makefile
    trunk/blender/intern/ghost/test/multitest/Makefile
    trunk/blender/intern/guardedalloc/Makefile
    trunk/blender/intern/guardedalloc/intern/Makefile
    trunk/blender/intern/guardedalloc/test/Makefile
    trunk/blender/intern/guardedalloc/test/simpletest/Makefile
    trunk/blender/intern/iksolver/Makefile
    trunk/blender/intern/iksolver/intern/Makefile
    trunk/blender/intern/iksolver/test/Makefile
    trunk/blender/intern/iksolver/test/ik_glut_test/Makefile
    trunk/blender/intern/iksolver/test/ik_glut_test/common/Makefile
    trunk/blender/intern/iksolver/test/ik_glut_test/intern/Makefile
    trunk/blender/intern/itasc/Makefile
    trunk/blender/intern/itasc/kdl/Makefile
    trunk/blender/intern/itasc/kdl/utilities/Makefile
    trunk/blender/intern/memutil/Makefile
    trunk/blender/intern/memutil/intern/Makefile
    trunk/blender/intern/moto/Makefile
    trunk/blender/intern/moto/intern/Makefile
    trunk/blender/intern/opennl/Makefile
    trunk/blender/intern/opennl/intern/Makefile
    trunk/blender/intern/opennl/superlu/Makefile
    trunk/blender/intern/smoke/Makefile
    trunk/blender/intern/smoke/intern/Makefile
    trunk/blender/intern/string/Makefile
    trunk/blender/intern/string/intern/Makefile
    trunk/blender/po/Makefile
    trunk/blender/release/Makefile
    trunk/blender/release/getversion.py
    trunk/blender/source/Makefile
    trunk/blender/source/blender/Makefile
    trunk/blender/source/blender/avi/Makefile
    trunk/blender/source/blender/avi/intern/Makefile
    trunk/blender/source/blender/blenfont/Makefile
    trunk/blender/source/blender/blenfont/intern/Makefile
    trunk/blender/source/blender/blenkernel/Makefile
    trunk/blender/source/blender/blenkernel/intern/Makefile
    trunk/blender/source/blender/blenlib/Makefile
    trunk/blender/source/blender/blenlib/intern/Makefile
    trunk/blender/source/blender/blenloader/Makefile
    trunk/blender/source/blender/blenloader/intern/Makefile
    trunk/blender/source/blender/blenpluginapi/Makefile
    trunk/blender/source/blender/blenpluginapi/intern/Makefile
    trunk/blender/source/blender/collada/Makefile
    trunk/blender/source/blender/editors/Makefile
    trunk/blender/source/blender/editors/animation/Makefile
    trunk/blender/source/blender/editors/armature/Makefile
    trunk/blender/source/blender/editors/curve/Makefile
    trunk/blender/source/blender/editors/datafiles/Makefile
    trunk/blender/source/blender/editors/gpencil/Makefile
    trunk/blender/source/blender/editors/interface/Makefile
    trunk/blender/source/blender/editors/mesh/Makefile
    trunk/blender/source/blender/editors/metaball/Makefile
    trunk/blender/source/blender/editors/object/Makefile
    trunk/blender/source/blender/editors/physics/Makefile
    trunk/blender/source/blender/editors/render/Makefile
    trunk/blender/source/blender/editors/screen/Makefile
    trunk/blender/source/blender/editors/sculpt_paint/Makefile
    trunk/blender/source/blender/editors/sound/Makefile
    trunk/blender/source/blender/editors/space_action/Makefile
    trunk/blender/source/blender/editors/space_api/Makefile
    trunk/blender/source/blender/editors/space_buttons/Makefile
    trunk/blender/source/blender/editors/space_console/Makefile
    trunk/blender/source/blender/editors/space_file/Makefile
    trunk/blender/source/blender/editors/space_graph/Makefile
    trunk/blender/source/blender/editors/space_image/Makefile
    trunk/blender/source/blender/editors/space_info/Makefile
    trunk/blender/source/blender/editors/space_logic/Makefile
    trunk/blender/source/blender/editors/space_nla/Makefile
    trunk/blender/source/blender/editors/space_node/Makefile
    trunk/blender/source/blender/editors/space_outliner/Makefile
    trunk/blender/source/blender/editors/space_script/Makefile
    trunk/blender/source/blender/editors/space_sequencer/Makefile
    trunk/blender/source/blender/editors/space_sound/Makefile
    trunk/blender/source/blender/editors/space_text/Makefile
    trunk/blender/source/blender/editors/space_time/Makefile
    trunk/blender/source/blender/editors/space_userpref/Makefile
    trunk/blender/source/blender/editors/space_view3d/Makefile
    trunk/blender/source/blender/editors/transform/Makefile
    trunk/blender/source/blender/editors/util/Makefile
    trunk/blender/source/blender/editors/uvedit/Makefile
    trunk/blender/source/blender/gpu/Makefile
    trunk/blender/source/blender/gpu/intern/Makefile
    trunk/blender/source/blender/ikplugin/Makefile
    trunk/blender/source/blender/ikplugin/intern/Makefile
    trunk/blender/source/blender/imbuf/Makefile
    trunk/blender/source/blender/imbuf/intern/Makefile
    trunk/blender/source/blender/imbuf/intern/cineon/Makefile
    trunk/blender/source/blender/imbuf/intern/dds/Makefile
    trunk/blender/source/blender/imbuf/intern/openexr/Makefile
    trunk/blender/source/blender/makesdna/Makefile
    trunk/blender/source/blender/makesdna/intern/Makefile
    trunk/blender/source/blender/makesrna/Makefile
    trunk/blender/source/blender/makesrna/intern/Makefile
    trunk/blender/source/blender/modifiers/Makefile
    trunk/blender/source/blender/modifiers/intern/Makefile
    trunk/blender/source/blender/nodes/Makefile
    trunk/blender/source/blender/nodes/intern/CMP_nodes/Makefile
    trunk/blender/source/blender/nodes/intern/Makefile
    trunk/blender/source/blender/nodes/intern/SHD_nodes/Makefile
    trunk/blender/source/blender/nodes/intern/TEX_nodes/Makefile
    trunk/blender/source/blender/python/Makefile
    trunk/blender/source/blender/python/generic/Makefile
    trunk/blender/source/blender/python/intern/Makefile
    trunk/blender/source/blender/quicktime/Makefile
    trunk/blender/source/blender/quicktime/apple/Makefile
    trunk/blender/source/blender/readblenfile/Makefile
    trunk/blender/source/blender/readblenfile/intern/Makefile
    trunk/blender/source/blender/readblenfile/stub/Makefile
    trunk/blender/source/blender/readblenfile/test/Makefile
    trunk/blender/source/blender/render/Makefile
    trunk/blender/source/blender/render/intern/Makefile
    trunk/blender/source/blender/render/intern/raytrace/Makefile
    trunk/blender/source/blender/render/intern/source/Makefile
    trunk/blender/source/blender/windowmanager/Makefile
    trunk/blender/source/blender/windowmanager/intern/Makefile
    trunk/blender/source/blenderplayer/bad_level_call_stubs/Makefile
    trunk/blender/source/creator/Makefile
    trunk/blender/source/darwin/Makefile
    trunk/blender/source/gameengine/BlenderRoutines/Makefile
    trunk/blender/source/gameengine/Converter/Makefile
    trunk/blender/source/gameengine/Expressions/Makefile
    trunk/blender/source/gameengine/GameLogic/Joystick/Makefile
    trunk/blender/source/gameengine/GameLogic/Makefile
    trunk/blender/source/gameengine/GamePlayer/Makefile
    trunk/blender/source/gameengine/GamePlayer/common/Makefile
    trunk/blender/source/gameengine/GamePlayer/ghost/Makefile
    trunk/blender/source/gameengine/Ketsji/KXNetwork/Makefile
    trunk/blender/source/gameengine/Ketsji/Makefile
    trunk/blender/source/gameengine/Makefile
    trunk/blender/source/gameengine/Network/LoopBackNetwork/Makefile
    trunk/blender/source/gameengine/Network/Makefile
    trunk/blender/source/gameengine/Network/TerraplayNetwork/Makefile
    trunk/blender/source/gameengine/Physics/Bullet/Makefile
    trunk/blender/source/gameengine/Physics/Dummy/Makefile
    trunk/blender/source/gameengine/Physics/Makefile
    trunk/blender/source/gameengine/Physics/common/Makefile
    trunk/blender/source/gameengine/Rasterizer/Makefile
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    trunk/blender/source/gameengine/SceneGraph/Makefile
    trunk/blender/source/gameengine/VideoTexture/Makefile
    trunk/blender/source/icons/Makefile
    trunk/blender/source/kernel/Makefile
    trunk/blender/source/kernel/gen_messaging/Makefile
    trunk/blender/source/kernel/gen_messaging/intern/Makefile
    trunk/blender/source/kernel/gen_system/Makefile
    trunk/blender/source/tools/guess/

Deleted: trunk/blender/Makefile
===================================================================
--- trunk/blender/Makefile	2011-01-30 14:43:24 UTC (rev 34566)
+++ trunk/blender/Makefile	2011-01-30 15:29:22 UTC (rev 34567)
@@ -1,60 +0,0 @@
-# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-# $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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2002 by Wouter van Heyst
-# All rights reserved.
-#
-# The Original Code is: revision 1.1
-#
-# Contributor(s): Hans Lambermont, GSR
-#
-# ***** END GPL LICENSE BLOCK *****
-#
-# Toplevel Makefile for blender. Bounces make to subdirectories.
-# Available targets: 'all' 'debug' 'release'
-
-# If the user wants to override some of the build
-# vars they can put it in the file user-def.mk which
-# will get included if it exists (please do not commit
-# user-def.mk to the revision control server).
-sinclude user-def.mk
-
-# To build without openAL, set it as an environment variable,
-# or put it uncommented in user-def.mk:
-# export NAN_NO_OPENAL=true
-
-export NANBLENDERHOME=$(shell pwd)
-MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory
-
-SOURCEDIR = 
-ifeq ($(FREE_WINDOWS),true)
-    DIRS ?= $(NANBLENDERHOME)/build_files/make/dlltool extern intern source po
-else
-    DIRS ?= extern intern source po
-endif
-
-include build_files/make/nan_subdirs.mk
-
-.PHONY: release
-release:
-	@echo "====> $(MAKE) $@ in $(SOURCEDIR)/$@" ;\
-	    $(MAKE) -C $@ $@ || exit 1;
-
-

Deleted: trunk/blender/doc/build_systems/README.windows-gcc
===================================================================
--- trunk/blender/doc/build_systems/README.windows-gcc	2011-01-30 14:43:24 UTC (rev 34566)
+++ trunk/blender/doc/build_systems/README.windows-gcc	2011-01-30 15:29:22 UTC (rev 34567)
@@ -1,123 +0,0 @@
-An updated version of this guide can be found at:
-
-http://www.blender3d.org/cms/Building_with_Cygwin.524.0.html
-
-Introduction
-------------
-
-Here are some basic instructions for building
-blender for windows using gcc under cygwin.
-Please note that the resulting executable does not
-depend on cygwin and can be distrubuted to machines
-that don't have cygwin installed.
-
-The instructions are:
-
-1. Download cygwin (www.cygwin.com) and use the setup program
-   to install packages for gcc, gcc-mingw, gcc-g++, w32api, make, cvs,
-   python, perl, gettext, and gettext-devel (and maybe others... the 
-   dependency list is bound to change over time and hopefully these 
-   instructions will keep up with the changes). All of the following
-   commands will be entered at the cygwin prompt so launch
-   cygwin now.
-
-2. Create a directory to put your sources and then enter that
-   directory, e.g.:
-     mkdir bf-blender
-     cd bf-blender
-
-   *********WARNING: if the directory path you are in contains a space in
-   it you will get errors in trying to compile the code.  Change directorys
-   to a one that does not contain a space in the path before creating the
-   above directory *********
-
-
-Please note that a backslash at the end of a line in the following 
-means that the command spans two lines. If you wish to type the command as 
-one line, exclude the '\'.
-
-3. Checkout the blender module from the bf-blender tree using cvs 
-   (use password anonymous):
-     cvs -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender login
-     cvs -z3 -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender \
-          co blender
-
-4. Checkout the lib/windows module from bf-blender using cvs:
-     cvs -z3 -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender \
-          co lib/windows
-
-5. Enter the newly created blender directory:
-     cd blender
-
-6. To prepare the build system to use only the free tools we must
-   set some environment variables. This is done by creating a
-   file called "user-def.mk" in the blender directory and
-   inserting the following line with notepad or your favorite
-   text editor:
-       export FREE_WINDOWS=true
-
-   The quickest way to do this though is to issue the following
-   command:
-      echo 'export FREE_WINDOWS=true' > user-def.mk
-
-7. Time to build... issue the command:
-     make
-
-8. Wait for it to finish (there is this mysterious place called 
-   'outside' that I am told is nice to go to while waiting for a 
-   compile to finish).
-
-9. After it finishes compiling, if you would like to run your freshly compiled
-   blender, type make release.  Then change directorys to obj/233.a/ and move
-   the zip file to where you want to use it, unzip the file, enter the directory
-   and run your brand new blender.
-
-
-Getting Help
-------------
-If you have problems, come by #blendercompilers on irc.freenode.net
-or post questions to the "Compiling, Libraries, Modules" forum
-at www.blender.org. There is also the very useful bf-committers 
-mailing list, what you can subscribe to here:
-
-http://www.blender.org/mailman/listinfo/bf-committers
-(as a bonus you can get info about the most recent features that
-are coming down the pipe ...)
-
-This said, the most common fix to a problem will
-probably involve installing an additional cygwin package,
-so keep that cygwin setup program close by ...
-
-Some final notes
-----------------
-
-- The build will take a long time, even on a fast machine
-  (a clean build takes almost an hour on my Athlon 1800+
-  based laptop).
-- If the build is successful you will find it has created
-  the program obj/windows/bin/blender.exe
-- The executable generated by gcc will generally be slower
-  that an msvc++ generated executable at rendering, but the 
-  OpenGL speed should be about the same.
-- Sound is disabled
-- If you want to clean your sources issue a 'make clean'
-  in the top blender directory.
-- If you want to update your sources when somebody has
-  added a new awesome feature, you will want to go to the
-  topmost blender directory and issue the following command:
-      cvs -z3 update -P -d
-  It would probably be best to clean your sources before
-  re-building (see previous note).
-- This is a work in progress, so some things may not be working
-  right or it may not support all of the cutting edge features.
-- Want to make a fancy zipped up blender package to give
-  to your buddies? Try "make release" ... read the output
-  to find out where the zip file was placed (note: you will
-  probably need the zip/unzip packages from cygwin to do
-  this).
-- You can make a debug executable using 'make debug'. The
-  debug executable will be larger and slower that the
-  regular executable, but when used with the gnu debugger
-  (gdb) it can help debug a blender problem (for example,
-  it can locate the line of code that caused blender to
-  crash).

Deleted: trunk/blender/extern/Makefile
===================================================================
--- trunk/blender/extern/Makefile	2011-01-30 14:43:24 UTC (rev 34566)
+++ trunk/blender/extern/Makefile	2011-01-30 15:29:22 UTC (rev 34567)
@@ -1,72 +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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2002 by Hans Lambermont
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): none yet.
-#
-# ***** END GPL LICENSE BLOCK *****
-# Bounces make to subdirectories. Also installs after succesful all target.
-
-include nan_definitions.mk
-
-SOURCEDIR = extern
-DIR = $(OCGDIR)/extern
-DIRS = glew/src
-
-# Cloth requires it
-ifeq ($(NAN_USE_BULLET), true)
-    DIRS += bullet2
-endif
-
-ifeq ($(WITH_BINRELOC), true)
-    DIRS += binreloc
-endif
-
-ifeq ($(WITH_OPENJPEG), true)
-    ifndef BF_OPENJPEG
-        DIRS += libopenjpeg
-    endif
-endif
-
-ifeq ($(WITH_LZO), true)
-    DIRS += lzo/minilzo
-endif
-
-ifeq ($(WITH_LZMA), true)
-    DIRS += lzma
-endif
-
-TARGET = solid
-
-all::
-	@[ -d $(OCGDIR)/extern ] || mkdir -p $(OCGDIR)/extern
-	@for i in $(DIRS); do \
-	    echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
-	    $(MAKE) -C $$i install || exit 1; \
-	done
-
-clean test debug::
-	@[ -d $(OCGDIR)/extern ] || mkdir -p $(OCGDIR)/extern
-	@for i in $(DIRS); do \
-	    echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
-	    $(MAKE) -C $$i $@ || exit 1; \
-	done

Deleted: trunk/blender/extern/binreloc/Makefile
===================================================================
--- trunk/blender/extern/binreloc/Makefile	2011-01-30 14:43:24 UTC (rev 34566)
+++ trunk/blender/extern/binreloc/Makefile	2011-01-30 15:29:22 UTC (rev 34567)
@@ -1,38 +0,0 @@
-# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-#
-# ***** 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

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list