Updated cmake so it has the option to use WITH_DDS

Kent

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e615ecdfa593239f70801a97a882eca6b730903..41f2311af985a4daea4ee4f472ee071e04265ba9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,8 @@ OPTION(WITH_VERSE             "Enable Verse  (http://verse.blender.org)"              OFF)
 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)

diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index a21eadf15fa830432af8bc39c74aa00a7dafb849..007ee34e4e779c0a475ffa9d0eefd46fc63ba133 100644 (file)
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -34,6 +34,10 @@ IF(WITH_OPENEXR)
   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)

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c3cbc36a94fb62f7e7faa7dc38d76c717ad5a2a0..0ed4f38e457bffbf932c3131d49ece2d22d47a1e 100644 (file)
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -47,6 +47,10 @@ IF(WITH_OPENEXR)
   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)

diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 0aac462573ac6b69bae8afb362d4cb2c5a8e4de1..2d41a6d73e68b5cbffd103c122506266715ce233 100644 (file)
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -54,5 +54,9 @@ IF(WITH_FFMPEG)
   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] )

diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
new file mode 100644 (file)
index 0000000..842f53b
--- /dev/null
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -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])

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index c4b77f893fd967f1a16ddfd7787671a06d78dc56..e84d1aac3a797e3d05b8e4c3d2c1504f46353c45 100644 (file)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -222,6 +222,7 @@ IF(UNIX)
     bf_avi 
     bf_cineon 
     bf_openexr 
+    bf_dds
     bf_readblenfile 
     blender_bop 
     bf_kernel