diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
| commit | be50ce61be7fdc96943dbdac79aabd88ba29996f (patch) | |
| tree | 4dfde72478458923a3b2ce8d22e1658d4508024c /Makefile | |
| parent | 0a4d70f4d0ddc5bc709b162d84ec334e66ed848d (diff) | |
Merged
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).
After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 9 insertions, 12 deletions
@@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # $Id$ # # ***** BEGIN GPL LICENSE BLOCK ***** @@ -21,7 +23,7 @@ # # The Original Code is: revision 1.1 # -# Contributor(s): Hans Lambermont +# Contributor(s): Hans Lambermont, GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -31,12 +33,11 @@ # 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 cvs). - +# user-def.mk to the revision control server). sinclude user-def.mk -# To build without openAL, uncomment the following line, or set it as -# an environment variable, or put it uncommented in 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) @@ -44,13 +45,9 @@ MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory SOURCEDIR = ifeq ($(FREE_WINDOWS),true) - DIRS ?= dlltool extern intern source -endif - -DIRS ?= extern intern source - -ifneq ($(INTERNATIONAL),false) - DIRS += po + DIRS ?= dlltool extern intern source po +else + DIRS ?= extern intern source po endif include source/nan_subdirs.mk |