Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Gartner <stefang@aon.at>2010-01-10 12:11:48 +0300
committerStefan Gartner <stefang@aon.at>2010-01-10 12:11:48 +0300
commit9da2c0c6c2507e16a6c38361f423c9eb35d40546 (patch)
tree1f2af86fab8d5341d5a678eec2ca2f9a8c71dd74 /source/blender
parent08c9ecb3b043322f34e55f335f76dc2657c187ef (diff)
add OpenCOLLADA support to Makefiles
add "export WITH_OPENCOLLADA=true" to user-def.mk to enable it
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/Makefile6
-rw-r--r--source/blender/collada/Makefile42
-rw-r--r--source/blender/windowmanager/intern/Makefile4
3 files changed, 51 insertions, 1 deletions
diff --git a/source/blender/Makefile b/source/blender/Makefile
index 6bc874c3c93..1c4ff6935b9 100644
--- a/source/blender/Makefile
+++ b/source/blender/Makefile
@@ -37,13 +37,17 @@ DIRS += python nodes gpu
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
diff --git a/source/blender/collada/Makefile b/source/blender/collada/Makefile
new file mode 100644
index 00000000000..29a731dbcb2
--- /dev/null
+++ b/source/blender/collada/Makefile
@@ -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
diff --git a/source/blender/windowmanager/intern/Makefile b/source/blender/windowmanager/intern/Makefile
index f4d65975d43..e472c87fe54 100644
--- a/source/blender/windowmanager/intern/Makefile
+++ b/source/blender/windowmanager/intern/Makefile
@@ -74,6 +74,10 @@ ifeq ($(WITH_QUICKTIME),true)
CPPFLAGS += -DWITH_QUICKTIME
endif
+ifeq ($(WITH_OPENCOLLADA), true)
+ CPPFLAGS += -DWITH_COLLADA
+endif
+
ifeq ($(OS),linux)
ifeq ($(CPU),alpha)
CPPFLAGS += -I$(NAN_MESA)/include