Index: /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/CMakeLists.txt
===================================================================
--- /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/CMakeLists.txt (revision 9835)
+++ /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/CMakeLists.txt (revision 9859)
@@ -115,8 +115,19 @@
 
 
-# imageio-plugin for os x
+
+############################################################
+#
+#  Quicktime or ImageIO
+#
+
 IF(APPLE)
 	ADD_SUBDIRECTORY(imageio)
 ENDIF(APPLE)
+
+IF(QUICKTIME_FOUND)
+    ADD_SUBDIRECTORY(quicktime)
+ENDIF(QUICKTIME_FOUND)
+
+
 
 
@@ -206,7 +217,5 @@
 ENDIF(FFMPEG_FOUND)
 
-IF(QUICKTIME_FOUND)
-    ADD_SUBDIRECTORY(quicktime)
-ENDIF(QUICKTIME_FOUND)
+
 
 IF(FREETYPE_FOUND)
Index: /OpenSceneGraph/branches/osg-cocoa-dev/src/osgDB/Registry.cpp
===================================================================
--- /OpenSceneGraph/branches/osg-cocoa-dev/src/osgDB/Registry.cpp (revision 9831)
+++ /OpenSceneGraph/branches/osg-cocoa-dev/src/osgDB/Registry.cpp (revision 9859)
@@ -240,8 +240,4 @@
     addFileExtensionAlias("frag",   "glsl");
 
-#if defined (__APPLE__) && (__LP64__)
-#undef DARWIN_QUICKTIME
-#define DARWIN_IMAGEIO 1
-#endif
 
 #if defined(DARWIN_IMAGEIO)
Index: /OpenSceneGraph/branches/osg-cocoa-dev/src/osgDB/CMakeLists.txt
===================================================================
--- /OpenSceneGraph/branches/osg-cocoa-dev/src/osgDB/CMakeLists.txt (revision 9671)
+++ /OpenSceneGraph/branches/osg-cocoa-dev/src/osgDB/CMakeLists.txt (revision 9859)
@@ -77,5 +77,14 @@
     # Needs CoreFoundation calls and a Carbon function
     SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY})
-    ADD_DEFINITIONS(-DDARWIN_QUICKTIME)
+ 
+    SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "quicktime" CACHE STRING "standard image plugin for os x, options are quicktime, imageio")
+
+
+    IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
+        ADD_DEFINITIONS(-DDARWIN_QUICKTIME)
+    ELSE(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
+        ADD_DEFINITIONS(-DDARWIN_IMAGEIO)
+    ENDIF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
+
 ENDIF(APPLE)