[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19855] trunk/blender: Some Makefile changes still laying around.
gsr b3d
gsr.b3d at infernal-iceberg.com
Tue Apr 21 19:24:16 CEST 2009
Revision: 19855
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19855
Author: gsrb3d
Date: 2009-04-21 19:24:16 +0200 (Tue, 21 Apr 2009)
Log Message:
-----------
Some Makefile changes still laying around.
Modified Paths:
--------------
trunk/blender/Makefile
trunk/blender/extern/Makefile
trunk/blender/extern/ffmpeg/Makefile
trunk/blender/extern/ffmpeg/libavcodec/Makefile
trunk/blender/po/Makefile
trunk/blender/source/Makefile
trunk/blender/source/blender/blenkernel/intern/Makefile
Modified: trunk/blender/Makefile
===================================================================
--- trunk/blender/Makefile 2009-04-21 16:58:25 UTC (rev 19854)
+++ trunk/blender/Makefile 2009-04-21 17:24:16 UTC (rev 19855)
@@ -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,15 +45,11 @@
SOURCEDIR =
ifeq ($(FREE_WINDOWS),true)
- DIRS ?= dlltool extern intern source
+ DIRS ?= dlltool extern intern source po
+else
+ DIRS ?= extern intern source po
endif
-DIRS ?= extern intern source
-
-ifneq ($(INTERNATIONAL),false)
- DIRS += po
-endif
-
include source/nan_subdirs.mk
.PHONY: release
Modified: trunk/blender/extern/Makefile
===================================================================
--- trunk/blender/extern/Makefile 2009-04-21 16:58:25 UTC (rev 19854)
+++ trunk/blender/extern/Makefile 2009-04-21 17:24:16 UTC (rev 19855)
@@ -49,9 +49,10 @@
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
Modified: trunk/blender/extern/ffmpeg/Makefile
===================================================================
--- trunk/blender/extern/ffmpeg/Makefile 2009-04-21 16:58:25 UTC (rev 19854)
+++ trunk/blender/extern/ffmpeg/Makefile 2009-04-21 17:24:16 UTC (rev 19855)
@@ -35,7 +35,7 @@
ALLDIRS = libavcodec libavformat libavutil libswscale libavdevice
config::
- ./configure --disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads --disable-yasm --disable-bzlib --disable-outdevs --disable-demuxer=alsa
+ ./configure --disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads --enable-yasm --disable-bzlib --disable-outdevs --disable-demuxer=alsa
all::
@for i in $(ALLDIRS); do \
echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
Modified: trunk/blender/extern/ffmpeg/libavcodec/Makefile
===================================================================
--- trunk/blender/extern/ffmpeg/libavcodec/Makefile 2009-04-21 16:58:25 UTC (rev 19854)
+++ trunk/blender/extern/ffmpeg/libavcodec/Makefile 2009-04-21 17:24:16 UTC (rev 19855)
@@ -1,5 +1,8 @@
include $(SUBDIR)../config.mak
+$(OCGDIR)/extern/ffmpeg/libavcodec/x86/%.o: $(SUBDIR)x86/%.asm
+ $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+
NAME = avcodec
FFLIBS = avutil
Modified: trunk/blender/po/Makefile
===================================================================
--- trunk/blender/po/Makefile 2009-04-21 16:58:25 UTC (rev 19854)
+++ trunk/blender/po/Makefile 2009-04-21 17:24:16 UTC (rev 19855)
@@ -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 at 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)
+$(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 )
+
+all debug:: $(LINGUAS_DEST)
+# Just trigger the deps
+
clean::
-ifeq ($(OS), darwin)
- rm -rf $(OCGDIR)/bin/blender.app/Contents/Resources/locale/
-else
- rm -rf $(OCGDIR)/bin/.blender/locale/
-endif
-
-$(LINGUAS):
- mkdir -p $(DIR)
- msgfmt -o $(DIR)/blender.mo $@.po
+ rm -rf $(DIR)
Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile 2009-04-21 16:58:25 UTC (rev 19854)
+++ trunk/blender/source/Makefile 2009-04-21 17:24:16 UTC (rev 19855)
@@ -83,7 +83,7 @@
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 @@
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
Modified: trunk/blender/source/blender/blenkernel/intern/Makefile
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/Makefile 2009-04-21 16:58:25 UTC (rev 19854)
+++ trunk/blender/source/blender/blenkernel/intern/Makefile 2009-04-21 17:24:16 UTC (rev 19855)
@@ -82,7 +82,7 @@
CPPFLAGS += -I..
# path to bullet2, for cloth
-CPPFLAGS += -I../../../../extern/bullet2/src
+CPPFLAGS += -I$(NAN_BULLET2)/include
ifeq ($(WITH_FREETYPE2), true)
CPPFLAGS += -DWITH_FREETYPE2
More information about the Bf-blender-cvs
mailing list