From Stefan Eileman, fixes for OSX gmake build to allow AGL or X11 implementation of osgViewer

Make/makedefs

@@ -496,6 +496,8 @@ ifeq ($(OS),Darwin)
       LDFLAGS        += $(FINC) 
       X_INC          = 
       X_LIBS         = 
+      GL_LIBS        = -framework OpenGL $(CARBON_LIB)
+      GLUT_LIBS      = -framework GLUT
 
   else
       ifeq ($(USE_CGL),yes)
@@ -505,6 +507,8 @@ ifeq ($(OS),Darwin)
          LDFLAGS        += $(FINC) 
          X_INC          = 
          X_LIBS         = 
+         GL_LIBS        = -framework OpenGL $(CARBON_LIB)
+         GLUT_LIBS      = -framework GLUT
 
       else
 
@@ -512,6 +516,8 @@ ifeq ($(OS),Darwin)
          LDFLAGS        += $(FINC) -L$(SDKPATH)/usr/include -L$(SDKPATH)/usr/X11R6/lib -L/sw/lib
          X_INC          = -I$(SDKPATH)/usr/X11R6/include
          X_LIBS         = -lX11 
+         GL_LIBS        = -lGL -lGLU
+         GLUT_LIBS      = -lGLUT
 
       endif
   endif
@@ -528,8 +534,6 @@ ifeq ($(OS),Darwin)
   DYNAMICLIBRARYLIB =
   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
   CARBON_LIB        = -framework Carbon
-  GL_LIBS           = -framework OpenGL $(CARBON_LIB)
-  GLUT_LIBS         = -framework GLUT
   SOCKET_LIBS       = 
   OTHER_LIBS        = -lm -lstdc++ -lobjc -lOpenThreads
   LIB_EXT           = dylib

src/osgViewer/GNUmakefile

@@ -13,7 +13,16 @@ CXXFILES = \
 
 
 ifeq ($(OS),Darwin)
-   CXXFILES += GraphicsWindowCarbon.cpp
+  ifeq ($(USE_AGL),yes)
+     CXXFILES += GraphicsWindowCarbon.cpp
+  else 
+    ifeq ($(USE_CGL),yes)
+       CXXFILES += GraphicsWindowCarbon.cpp
+    else
+       CXXFILES += GraphicsWindowX11.cpp
+       LIBS     += $(X_LIBS)
+    endif
+  endif
 else
   ifeq ($(OS),MINGW)
      CXXFILES += GraphicsWindowWin32.cpp