diff --git a/Make/makedefs b/Make/makedefs
index 5703b0f7c..b577a2e58 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -430,9 +430,22 @@ ifeq ($(OS),Darwin)
   else
     C++             = $(CXX)
   endif
-  FINC              += -F$(SDKPATH)/System/Library/Frameworks
-  INC               += $(FINC) -I$(SDKPATH)/usr/include -I$(SDKPATH)/usr/X11R6/include
-  LDFLAGS	    += $(FINC) -L$(SDKPATH)/usr/include -L$(SDKPATH)/usr/X11R6/lib -L/sw/lib
+
+  FINC              += -F/System/Library/Frameworks
+
+  ifeq ($(USE_CGL),1)
+	 DEF            += -D__USE_OSX_CGL_IMPLEMENTATION__
+     INC            += $(FINC) 
+     LDFLAGS	    += $(FINC) 
+     X_INC          = 
+     X_LIBS         = 
+  else
+     INC            += $(FINC) -I$(SDKPATH)/usr/X11R6/include
+     LDFLAGS	    += $(FINC) -L$(SDKPATH)/usr/include -L$(SDKPATH)/usr/X11R6/lib -L/sw/lib
+     X_INC          = -I$(SDKPATH)/usr/X11R6/include
+     X_LIBS         = -lX11 
+  endif
+
   DEF               += -Wall
   OPTF              = -O2
   DBGF              = -g -DOSG_COMPILE_UNIT_TESTS
@@ -446,8 +459,6 @@ ifeq ($(OS),Darwin)
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   CARBON_LIB        = -framework Carbon
   GL_LIBS           = -framework OpenGL $(CARBON_LIB)
-  X_INC             = -I$(SDKPATH)/usr/X11R6/include
-  X_LIBS            = -lX11 
   SOCKET_LIBS       = 
   OTHER_LIBS        = -lm -lstdc++ -lobjc -lOpenThreads
   LIB_EXT           = dylib
diff --git a/src/osgPlugins/freetype/GNUmakefile b/src/osgPlugins/freetype/GNUmakefile
index 943b26d92..fae2dd63a 100644
--- a/src/osgPlugins/freetype/GNUmakefile
+++ b/src/osgPlugins/freetype/GNUmakefile
@@ -8,7 +8,7 @@ CXXFILES =\
 
 INC += $(FREETYPE_INCLUDE)
 
-LIBS   += -losgText $(OSG_LIBS) $(FREETYPE_LIB) $(OTHER_LIBS)
+LIBS   += -losgText $(OSG_LIBS) $(FREETYPE_LIB) $(OTHER_LIBS) -L/usr/X11R6/lib -lX11
 
 
 TARGET_BASENAME = freetype
diff --git a/src/osgProducer/OsgSceneHandler.cpp b/src/osgProducer/OsgSceneHandler.cpp
index d2609feea..dbf7a0599 100644
--- a/src/osgProducer/OsgSceneHandler.cpp
+++ b/src/osgProducer/OsgSceneHandler.cpp
@@ -90,7 +90,8 @@ void OsgSceneHandler::drawImplementation(Producer::Camera &)
         double minimumTargetMaxFrameTime = 0.010; // 10ms.
         double targetMaxFrameTime = osg::minimum(timeForPreviousFrame, minimumTargetMaxFrameTime);
         
-        double maximumAvailableTime = 0.0025; // 2.5ms.
+		// Unused variable warning
+        //double maximumAvailableTime = 0.0025; // 2.5ms.
         double drawCostFactor = 2.0; // must be greater than 1 to account for the extra cost of emptying the OpenGL fifo.
         double frameFactor = 0.9; // must be less than 1, to compensate for extra time spent in update and swap buffers etc.
         double timeLeftTillEndOfFrame = targetMaxFrameTime*frameFactor - timeForCullAndDraw*drawCostFactor;