Changes to help differentiate between OSX using Quicktime vs not using

quicktime, from Eric Sokolosky and Robert Osfield.

Make/dependencies

@@ -2,40 +2,37 @@
 # Dependency library which have been installed on this system
 
 GDAL_INSTALLED = yes
-
 LIBXML2_INSTALLED = yes
-
 JASPER_INSTALLED = yes
 
 FREETYPE_INSTALLED = yes
 
 ifeq ($(OS),Darwin)
+    DARWIN_QUICKTIME  = yes
+endif
+
+ifeq ($(DARWIN_QUICKTIME),yes)
 
     QUICKTIME_INSTALLED = yes
-
     LIBJPEG_INSTALLED = no
-
     LIBUNGIF_INSTALLED = no
-
     LIBTIFF_INSTALLED = no
-
+    LIBPNG_INSTALLED = no
     LIBMPEG3_INSTALLED = no
 
 else
 
+    QUICKTIME_INSTALLED = no
     LIBJPEG_INSTALLED = yes
-
     LIBUNGIF_INSTALLED = yes
-
     LIBTIFF_INSTALLED = yes
-
+    LIBPNG_INSTALLED = yes
     LIBMPEG3_INSTALLED = no
 
 endif
 
 
 COIN_INSTALLED = no
-
 INVENTOR_INSTALLED = no
 
 PERFORMER_INSTALLED = no

Make/makedefs

@@ -1,6 +1,8 @@
 SHELL = /bin/sh
 OS := $(shell uname)
 
+include $(TOPDIR)/Make/dependencies
+
 ## We don't care about architectural distinguishers in the OS
 ## such as IRIX64, IRIX32, etc. so we truncate IRIX?? to IRIX
 ifeq ($(findstring IRIX,$(OS)),IRIX)
@@ -406,13 +408,21 @@ ifeq ($(OS),Darwin)
   SOCKET_LIBS       = 
   OTHER_LIBS        = -lm -lstdc++ -lobjc -lOpenThreads
   LIB_EXT           = dylib
-  QUICKTIME	    = -framework QuickTime $(CARBON_LIB)
   FREETYPE_INCLUDE  = -I/usr/X11R6/include/freetype2 -I/sw/include/freetype2
   LIBXML2_INCLUDE   = -I/usr/include/libxml2 -I/sw/include/libxml2 
-  TIFF_LIB	    = -ltiff
   LIBVERSION	    = -current_version $(VERSION) \
                         -compatibility_version \
                         $(VERSION_MAJOR).$(VERSION_MINOR).0
+  DARWIN_QUICKTIME  = yes
+  ifeq ($(DARWIN_QUICKTIME),yes)
+    QUICKTIME	    = -framework QuickTime $(CARBON_LIB)
+    DEF             += -DDARWIN_QUICKTIME
+  else
+    PNG_LIBS        = -lpng -lz
+    JPEG_LIBS       = -ljpeg
+    GIF_LIBS        = -lungif
+    TIFF_LIBS       = -ltiff -lz -ljpeg
+  endif
 endif
 
 #### Cygwin/Mingw specific definitions

Make/makedirdefs

@@ -1,5 +1,3 @@
-include $(TOPDIR)/Make/dependencies
-
 
 ################################################################
 # Directories traversed from the top level
@@ -47,14 +45,14 @@ PLUGIN_DIRS = \
 	osg\
 	osgtgz\
 	pic\
-        pnm\
+	pnm\
 	rgb\
 	tga\
 	tgz\
 	txp\
 	zip\
-        3dc\
-        ive\
+	3dc\
+	ive\
 
 ifeq ($(GDAL_INSTALLED),yes)
     PLUGIN_DIRS += gdal
@@ -74,19 +72,19 @@ ifeq ($(QUICKTIME_INSTALLED),yes)
 endif
   
 ifeq ($(LIBJPEG_INSTALLED),yes)
-  PLUGIN_DIRS += tiff
-endif
-
-ifeq ($(LIBUNGIF_INSTALLED),yes)
   PLUGIN_DIRS += jpeg
 endif
 
-ifeq ($(LIBTIFF_INSTALLED),yes)
-  PLUGIN_DIRS += png
+ifeq ($(LIBUNGIF_INSTALLED),yes)
+  PLUGIN_DIRS += gif
 endif
 
-ifeq ($(LIBMPEG3_INSTALLED),yes)
-  PLUGIN_DIRS += gif
+ifeq ($(LIBTIFF_INSTALLED),yes)
+  PLUGIN_DIRS += tiff
+endif
+
+ifeq ($(LIBPNG_INSTALLED),yes)
+  PLUGIN_DIRS += png
 endif
 
 

src/osgDB/Registry.cpp

@@ -151,7 +151,7 @@ Registry::Registry()
     addFileExtensionAlias("ivz",   "gz");
     addFileExtensionAlias("ozg",   "gz");
     
-#if defined(__DARWIN_OSX__)
+#if defined(DARWIN_QUICKTIME)
     addFileExtensionAlias("jpg",  "qt");
     addFileExtensionAlias("jpe",  "qt");
     addFileExtensionAlias("jpeg", "qt");