makefile patch to support OSX

[josch]

https://sourceforge.net/p/glui/patches/9/

Context diff of changes to makefile to support building on either linux or Mac OS X.

*** makefile    Mon Aug 20 23:59:54 2007
--- makefile.new    Tue Jun  3 22:14:16 2008
***************
*** 11,28 ****

  UNAME = $(shell uname)

  ifeq ($(UNAME), Linux)
  CXX       = g++
  CPPFLAGS += $(OPTS) -Wall -pedantic
  endif

  #######################################

- CPPFLAGS += -I./ -I./include

  LIBGLUI = -L./lib -lglui
- LIBGL   = -lGLU -lGL
- LIBS    = -lXmu -lXext -lX11 -lXi -lm

  # One of the following options only...

--- 11,38 ----

  UNAME = $(shell uname)

+ CPPFLAGS += -I./ -I./include
+ 
  ifeq ($(UNAME), Linux)
  CXX       = g++
  CPPFLAGS += $(OPTS) -Wall -pedantic
+ LIBGL   = -lGLU -lGL
+ LIBS    = -lXmu -lXext -lX11 -lXi -lm
+ LIBGLUT   = -L/usr/X11R6/lib -lglut
+ CPPFLAGS += -I/usr/X11R6/include
+ endif
+ 
+ ifeq ($(UNAME), Darwin)
+ CXX = g++
+ CPPFLAGS += $(OPTS) -Wall -pedantic
+ LIBGL = -framework OpenGL
+ LIBGLUT = -framework GLUT
  endif

  #######################################

  LIBGLUI = -L./lib -lglui

  # One of the following options only...

***************
*** 35,42 ****
  # CPPFLAGS += -I/usr/X11R6/include -DGLUI_FREEGLUT

  # (3) GLUT
! LIBGLUT   = -L/usr/X11R6/lib -lglut
! CPPFLAGS += -I/usr/X11R6/include

  #######################################

--- 45,51 ----
  # CPPFLAGS += -I/usr/X11R6/include -DGLUI_FREEGLUT

  # (3) GLUT
! 

  #######################################

[nigels-com]

Merged.