Revision: 24077
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24077
Author: kazanbas
Date: 2009-10-25 08:51:40 +0100 (Sun, 25 Oct 2009)
Log Message:
-----------
Fixed support for building without collada (scons and cmake). Only tested scons.
Re-enabled collada code building by default in cmake. Realized this should be
off only in trunk.
Modified Paths:
--------------
branches/soc-2009-chingachgook/CMakeLists.txt
branches/soc-2009-chingachgook/source/blender/windowmanager/CMakeLists.txt
branches/soc-2009-chingachgook/source/blender/windowmanager/SConscript
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/soc-2009-chingachgook/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/CMakeLists.txt 2009-10-25 06:53:04 UTC
(rev 24076)
+++ branches/soc-2009-chingachgook/CMakeLists.txt 2009-10-25 07:51:40 UTC
(rev 24077)
@@ -80,7 +80,7 @@
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation"
OFF)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_INSTALL "Install accompanying scripts and language files
needed to run blender" ON)
-OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support
(http://www.opencollada.org/)" OFF)
+OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support
(http://www.opencollada.org/)" ON)
IF (APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
Modified:
branches/soc-2009-chingachgook/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/source/blender/windowmanager/CMakeLists.txt
2009-10-25 06:53:04 UTC (rev 24076)
+++ branches/soc-2009-chingachgook/source/blender/windowmanager/CMakeLists.txt
2009-10-25 07:51:40 UTC (rev 24077)
@@ -50,6 +50,10 @@
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_OPENEXR)
+IF(WITH_OPENCOLLADA)
+ ADD_DEFINITIONS(-DWITH_COLLADA)
+ENDIF(WITH_OPENCOLLADA)
+
IF(WITH_QUICKTIME)
SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
Modified: branches/soc-2009-chingachgook/source/blender/windowmanager/SConscript
===================================================================
--- branches/soc-2009-chingachgook/source/blender/windowmanager/SConscript
2009-10-25 06:53:04 UTC (rev 24076)
+++ branches/soc-2009-chingachgook/source/blender/windowmanager/SConscript
2009-10-25 07:51:40 UTC (rev 24077)
@@ -19,6 +19,9 @@
if not env['WITH_BF_PYTHON']:
defs.append('DISABLE_PYTHON')
+if env['WITH_BF_COLLADA']:
+ defs.append('WITH_COLLADA')
+
if env['OURPLATFORM'] == 'linux2':
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'
Modified:
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_operators.c
===================================================================
---
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_operators.c
2009-10-25 06:53:04 UTC (rev 24076)
+++
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_operators.c
2009-10-25 07:51:40 UTC (rev 24077)
@@ -1294,10 +1294,9 @@
}
+/* XXX: move these collada operators to a more appropriate place */
+#ifdef WITH_COLLADA
-
-
-/* XXX: move these to a more appropriate place */
#include "../../collada/collada.h"
static int wm_collada_export_invoke(bContext *C, wmOperator *op, wmEvent
*event)
@@ -1392,10 +1391,10 @@
RNA_def_property(ot->srna, "filename", PROP_STRING, PROP_FILEPATH);
}
+#endif
-
/* *********************** */
static void WM_OT_window_fullscreen_toggle(wmOperatorType *ot)
@@ -2284,9 +2283,12 @@
WM_operatortype_append(WM_OT_debug_menu);
WM_operatortype_append(WM_OT_search_menu);
+#ifdef WITH_COLLADA
/* XXX: move these */
WM_operatortype_append(WM_OT_collada_export);
WM_operatortype_append(WM_OT_collada_import);
+#endif
+
WM_operatortype_append(WM_OT_call_menu);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
