Revision: 17206
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17206
Author: sirdude
Date: 2008-10-28 19:33:34 +0100 (Tue, 28 Oct 2008)
Log Message:
-----------
Updated cmake so it has the option to use WITH_DDS
Kent
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
Added Paths:
-----------
trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2008-10-28 02:03:13 UTC (rev 17205)
+++ trunk/blender/CMakeLists.txt 2008-10-28 18:33:34 UTC (rev 17206)
@@ -61,7 +61,9 @@
OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)"
ON)
OPTION(WITH_QUICKTIME "Enable Quicktime Support"
OFF)
OPTION(WITH_OPENEXR "Enable OpenEXR Support
(http://www.openexr.com)" ON)
+OPTION(WITH_DDS "Enable DDS Support"
ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support
(http://ffmpeg.mplayerhq.hu/)" OFF)
+OPTION(WITH_FFMPEG "Enable FFMPeg Support
(http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)"
ON)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the
compiler)" OFF)
OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)"
OFF)
Modified: trunk/blender/source/blender/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/CMakeLists.txt 2008-10-28 02:03:13 UTC (rev
17205)
+++ trunk/blender/source/blender/CMakeLists.txt 2008-10-28 18:33:34 UTC (rev
17206)
@@ -34,6 +34,10 @@
SUBDIRS(imbuf/intern/openexr)
ENDIF(WITH_OPENEXR)
+IF(WITH_DDS)
+ SUBDIRS(imbuf/intern/dds)
+ENDIF(WITH_DDS)
+
IF(WITH_QUICKTIME)
SUBDIRS(quicktime)
ENDIF(WITH_QUICKTIME)
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2008-10-28
02:03:13 UTC (rev 17205)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2008-10-28
18:33:34 UTC (rev 17206)
@@ -47,6 +47,10 @@
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_OPENEXR)
+IF(WITH_DDS)
+ ADD_DEFINITIONS(-DWITH_DDS)
+ENDIF(WITH_DDS)
+
IF(WITH_QUICKTIME)
SET(INC ${INC} ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt 2008-10-28 02:03:13 UTC
(rev 17205)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2008-10-28 18:33:34 UTC
(rev 17206)
@@ -54,5 +54,9 @@
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
+if(WITH_DDS)
+ ADD_DEFINITIONS(-DWITH_DDS)
+ENDIF(WITH_DDS)
+
BLENDERLIB(bf_imbuf "${SRC}" "${INC}")
#env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes =
Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
Added: trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
(rev 0)
+++ trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
2008-10-28 18:33:34 UTC (rev 17206)
@@ -0,0 +1,45 @@
+# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $
+# ***** 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) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s):
+#
+# ***** END GPL LICENSE BLOCK *****
+
+FILE (GLOB SRC *.cpp)
+
+SET(INC
+ .
+ ../../../blenkernel
+ ../../../makesdna
+ ../../
+ ..
+ ../../../blenlib
+ intern/include
+ ../../../../../intern/guardedalloc
+)
+
+if(WITH_DDS)
+ ADD_DEFINITIONS(-DWITH_DDS)
+ENDIF(WITH_DDS)
+
+BLENDERLIB(bf_dds "${SRC}" "${INC}")
+#env.BlenderLib ('bf_dds', source_files, incs, defs,
libtype=['core','player'], priority = [90, 200])
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2008-10-28 02:03:13 UTC (rev
17205)
+++ trunk/blender/source/creator/CMakeLists.txt 2008-10-28 18:33:34 UTC (rev
17206)
@@ -222,6 +222,7 @@
bf_avi
bf_cineon
bf_openexr
+ bf_dds
bf_readblenfile
blender_bop
bf_kernel
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
