diff options
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | extern/Makefile | 7 | ||||
| -rw-r--r-- | po/Makefile | 44 | ||||
| -rw-r--r-- | source/Makefile | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/Makefile | 2 |
5 files changed, 42 insertions, 35 deletions
@@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # $Id$ # # ***** BEGIN 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 diff --git a/extern/Makefile b/extern/Makefile index 38bec4b73dd..29d7da5b822 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -49,9 +49,10 @@ ifeq ($(WITH_VERSE), true) DIRS += verse endif -ifneq ($(NAN_NO_KETSJI), true) - DIRS += bullet2 -endif +# Cloth requires it +#ifneq ($(NAN_NO_KETSJI), true) +DIRS += bullet2 +#endif ifeq ($(WITH_BINRELOC), true) DIRS += binreloc diff --git a/po/Makefile b/po/Makefile index 4bafba8a6e6..425efbc08b3 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # $Id$ # # ***** BEGIN GPL LICENSE BLOCK ***** @@ -9,47 +11,51 @@ # # 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 +# 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. +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # The Original Code is Copyright (C) 2002 by Stichting Blender Foundation, # Amsterdam, the Netherlands. # All rights reserved. # -# The Original Code is: revision 1.1 +# The Original Code is: revision 1.3 # -# Contributor(s): Wouter van Heyst +# Contributor(s): Wouter van Heyst, GSR # # ***** END GPL LICENSE BLOCK ***** # -# po Makefile for blender. Compiles the translations and places them +# po Makefile for blender. Compiles the translations in the place # where release can pick them up. +PO_FILES = $(wildcard *.po) + +LINGUAS = $(basename $(PO_FILES)) + SOURCEDIR = blender/po include nan_definitions.mk -LINGUAS = ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sr@Latn sv uk zh_CN - ifeq ($(OS), darwin) -DIR = $(OCGDIR)/bin/blender.app/Contents/Resources/locale/$@/LC_MESSAGES/ + DIR = $(OCGDIR)/bin/blender.app/Contents/Resources/locale/ else -DIR = $(OCGDIR)/bin/.blender/locale/$@/LC_MESSAGES/ + DIR = $(OCGDIR)/bin/.blender/locale/ endif -all debug:: $(LINGUAS) +LINGUAS_DEST= $(foreach LINGUA, $(LINGUAS),$(DIR)$(LINGUA)/LC_MESSAGES/blender.mo) -clean:: -ifeq ($(OS), darwin) - rm -rf $(OCGDIR)/bin/blender.app/Contents/Resources/locale/ -else - rm -rf $(OCGDIR)/bin/.blender/locale/ -endif +$(DIR)%/LC_MESSAGES/blender.mo: %.po + mkdir -p $(@D) + msgfmt -o $@ $< + @cmp $@ $(NANBLENDERHOME)/bin/.blender/locale/$(basename $<)/LC_MESSAGES/blender.mo \ + || ( echo Mismatch between generated and commited $(basename $<).mo catalog && \ + rm -f $@ && false ) -$(LINGUAS): - mkdir -p $(DIR) - msgfmt -o $(DIR)/blender.mo $@.po +all debug:: $(LINGUAS_DEST) +# Just trigger the deps + +clean:: + rm -rf $(DIR) diff --git a/source/Makefile b/source/Makefile index d8dee601998..b190118bc38 100644 --- a/source/Makefile +++ b/source/Makefile @@ -83,7 +83,7 @@ GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a GRPLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a -GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a +GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a # nlin: the reason that some libraries appear more than once below is @@ -154,6 +154,9 @@ ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(NAN_BULLET2)/lib/libbullet2.a endif +# Cloth requires bullet2, gameegine does not matter anymore +#COMLIB += $(NAN_BULLET2)/lib/libbullet2.a + COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 226e416dad7..75f75b0c3c5 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -82,7 +82,7 @@ CPPFLAGS += -I../../gpu CPPFLAGS += -I.. # path to bullet2, for cloth -CPPFLAGS += -I../../../../extern/bullet2/src +CPPFLAGS += -I$(NAN_BULLET2)/include ifeq ($(WITH_FREETYPE2), true) CPPFLAGS += -DWITH_FREETYPE2 |