From 086a322d264d30952f7114e3585454780e0c1019 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 11 Apr 2003 07:18:13 +0000 Subject: [PATCH] Added guards around Geo plugin to prevent it from being built under OSX, Solaris and IRIX as it breaks the OSX build and doesn't handle Endian issues. --- Make/makedirdefs | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Make/makedirdefs b/Make/makedirdefs index dcb968dc0..7a50c8b98 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -29,7 +29,6 @@ PLUGIN_DIRS = \ dds\ dw\ flt\ - geo\ iv\ lib3ds\ logo\ @@ -50,14 +49,23 @@ PLUGIN_DIRS = \ # comment in if you have Performer installed. # PLUGIN_DIRS += pfb -# comment in if you want Open DX support, currently not on by default -# since we havn't yet checked compilation on all platforms yet. -PLUGIN_DIRS += dx # comment in if have freetype2.x installed, provides type type font support to osgText. PLUGIN_DIRS += freetype +# Geo plugin breaks Darwin build and doens't handle BigEndian issue. +ifneq ($(OS),Darwin) +ifneq ($(OS),SunOS) +ifneq ($(OS),IRIX) + + PLUGIN_DIRS += geo + +endif +endif +endif + + #### MacOS X specific definitions ifeq ($(OS),Darwin) @@ -65,6 +73,12 @@ ifeq ($(OS),Darwin) else + # comment in if you want Open DX support, currently not on by default + # since we havn't yet checked compilation on all platforms yet. + # note, moved to non Darwin build since it currently breaks the Drawin build. + PLUGIN_DIRS += dx + + # comment in if you have libtiff installed. PLUGIN_DIRS += tiff