[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25859] trunk/blender/source: add OpenCOLLADA support to Makefiles

[Stefan Gartner]

Revision: 25859
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25859
Author:   sgefant
Date:     2010-01-10 10:11:48 +0100 (Sun, 10 Jan 2010)

Log Message:
-----------
add OpenCOLLADA support to Makefiles
add "export WITH_OPENCOLLADA=true" to user-def.mk to enable it 

Modified Paths:
--------------
    trunk/blender/source/Makefile
    trunk/blender/source/blender/Makefile
    trunk/blender/source/blender/windowmanager/intern/Makefile
    trunk/blender/source/nan_definitions.mk
    trunk/blender/source/nan_link.mk

Added Paths:
-----------
    trunk/blender/source/blender/collada/Makefile

Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile	2010-01-09 23:44:01 UTC (rev 25858)
+++ trunk/blender/source/Makefile	2010-01-10 09:11:48 UTC (rev 25859)
@@ -211,6 +211,11 @@
     COMLIB += $(OCGDIR)/extern/binreloc/$(DEBUG_DIR)libbinreloc.a
 endif
 
+ifeq ($(WITH_OPENCOLLADA), true)
+    COMLIB += $(OCGDIR)/blender/bf_collada/$(DEBUG_DIR)/libbf_collada.a
+    COMLIB += $(BF_PCRE_LIBS)
+endif
+
 ifeq ($(OS), windows)
     ifeq ($(FREE_WINDOWS), true)
         COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a

Modified: trunk/blender/source/blender/Makefile
===================================================================
--- trunk/blender/source/blender/Makefile	2010-01-09 23:44:01 UTC (rev 25858)
+++ trunk/blender/source/blender/Makefile	2010-01-10 09:11:48 UTC (rev 25859)
@@ -37,14 +37,18 @@
 DIRS += blenfont ikplugin
 
 ifeq ($(WITH_QUICKTIME), true)
-	DIRS += quicktime
+    DIRS += quicktime
 endif
 
 ifeq ($(WITH_OPENJPEG), true)
     CFLAGS += -DWITH_OPENJPEG -I../../../../extern/libopenjpeg
 endif
 
+ifeq ($(WITH_OPENCOLLADA), true)
+    DIRS += collada
+endif
 
+
 DIR = $(OCGDIR)/blender
 SOURCEDIR = source/blender
 TESTDIRS = deflate streamglue

Added: trunk/blender/source/blender/collada/Makefile
===================================================================
--- trunk/blender/source/blender/collada/Makefile	                        (rev 0)
+++ trunk/blender/source/blender/collada/Makefile	2010-01-10 09:11:48 UTC (rev 25859)
@@ -0,0 +1,42 @@
+#
+# $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) 2008 Blender Foundation.
+# All rights reserved.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = bf_collada
+DIR = $(OCGDIR)/blender/bf_collada
+
+include nan_compile.mk
+
+CCFLAGS += $(LEVEL_1_C_WARNINGS)
+
+CPPFLAGS += -I../makesdna -I../blenlib -I../blenkernel -I../editors/include
+CPPFLAGS += -I../windowmanager -I../makesrna
+CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+CPPFLAGS += -I$(BF_OPENCOLLADA)/include/COLLADABaseUtils
+CPPFLAGS += -I$(BF_OPENCOLLADA)/include/COLLADAFrameWork
+CPPFLAGS += -I$(BF_OPENCOLLADA)/include/COLLADAStreamWriter
+CPPFLAGS += -I$(BF_OPENCOLLADA)/include/COLLADASaxFrameworkLoader

Modified: trunk/blender/source/blender/windowmanager/intern/Makefile
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/Makefile	2010-01-09 23:44:01 UTC (rev 25858)
+++ trunk/blender/source/blender/windowmanager/intern/Makefile	2010-01-10 09:11:48 UTC (rev 25859)
@@ -74,6 +74,10 @@
 	CPPFLAGS += -DWITH_QUICKTIME
 endif
 
+ifeq ($(WITH_OPENCOLLADA), true)
+    CPPFLAGS += -DWITH_COLLADA
+endif
+
 ifeq ($(OS),linux)
     ifeq ($(CPU),alpha)
 	CPPFLAGS += -I$(NAN_MESA)/include

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2010-01-09 23:44:01 UTC (rev 25858)
+++ trunk/blender/source/nan_definitions.mk	2010-01-10 09:11:48 UTC (rev 25859)
@@ -150,9 +150,18 @@
     export NAN_FFMPEGCFLAGS = $(shell pkg-config --cflags libavcodec libavdevice libavformat libswscale libavutil)
   endif
 
-    # Compare recreated .mo files with committed ones
-    export BF_VERIFY_MO_FILES ?= true
+  ifeq ($(WITH_OPENCOLLADA), true)
+    export BF_OPENCOLLADA ?= $(LCGDIR)/opencollada
+    export BF_OPENCOLLADA_INC ?= $(BF_OPENCOLLADA)/include
+    export BF_OPENCOLLADA_LIBS ?= $(BF_OPENCOLLADA)/lib/libOpenCOLLADASaxFrameworkLoader.a $(BF_OPENCOLLADA)/lib/libOpenCOLLADAFramework.a $(BF_OPENCOLLADA)/lib/libOpenCOLLADABaseUtils.a $(BF_OPENCOLLADA)/lib/libOpenCOLLADAStreamWriter.a $(BF_OPENCOLLADA)/lib/libMathMLSolver.a $(BF_OPENCOLLADA)/lib/libGeneratedSaxParser.a $(BF_OPENCOLLADA)/lib/libUTF.a -lxml2
+    export BF_PCRE ?= $(LCGDIR)/pcre
+    export BF_PCRE_LIBS ?= $(NAN_PCRE)/lib/libpcre.a
+  endif
 
+
+  # Compare recreated .mo files with committed ones
+  export BF_VERIFY_MO_FILES ?= true
+
   # Platform Dependent settings go below:
   ifeq ($(OS),darwin)
 
@@ -265,6 +274,8 @@
         export USE_QTKIT = true
     endif
 
+    export NAN_PCRE = $(LCGDIR)/opencollada
+
   else
   ifeq ($(OS),freebsd)
 

Modified: trunk/blender/source/nan_link.mk
===================================================================
--- trunk/blender/source/nan_link.mk	2010-01-09 23:44:01 UTC (rev 25858)
+++ trunk/blender/source/nan_link.mk	2010-01-10 09:11:48 UTC (rev 25859)
@@ -187,4 +187,8 @@
     LLIBS += $(BF_FFTW3_LIBS)
 endif
 
+ifeq ($(WITH_OPENCOLLADA),true)
+    LLIBS += $(BF_OPENCOLLADA_LIBS)
+endif
+
 LLIBS += $(NAN_PYTHON_LIB)