[Plib-cvs] plib/examples/src/pui PointPicker.cxx,1.14,1.15 complex.cxx,1.20,1.21 simple.cxx,1.9,1.10 widget_list.cxx,1.13,1.14

[Sebastian U. <ud...@us...>]

Update of /cvsroot/plib/plib/examples/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv6971/pui

Modified Files:
	PointPicker.cxx complex.cxx simple.cxx widget_list.cxx 
Log Message:
Mac OS-X compatibility; Minor cleanups

Index: PointPicker.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/PointPicker.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- PointPicker.cxx	31 Aug 2002 14:55:16 -0000	1.14
+++ PointPicker.cxx	1 Sep 2002 06:57:58 -0000	1.15
@@ -21,13 +21,23 @@
 #include <string.h>
 #include <time.h>
 #ifdef WIN32
-#include <windows.h>
+#  include <windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 #include <math.h>
-#include <GL/glut.h>
-#include "plib/pu.h"
+
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
+#include <plib/pu.h>
 
 //#define VOODOO 1
 

Index: complex.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/complex.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- complex.cxx	31 Aug 2002 14:55:16 -0000	1.20
+++ complex.cxx	1 Sep 2002 06:57:58 -0000	1.21
@@ -4,13 +4,23 @@
 #include <string.h>
 #include <time.h>
 #ifdef WIN32
-#include <windows.h>
+#  include <windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 #include <math.h>
-#include <GL/glut.h>
-#include "plib/pu.h"
+
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
+#include <plib/pu.h>
 
 //#define VOODOO 1
 

Index: simple.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/simple.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- simple.cxx	1 Sep 2002 05:22:25 -0000	1.9
+++ simple.cxx	1 Sep 2002 06:57:58 -0000	1.10
@@ -3,12 +3,22 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef WIN32
-#include <windows.h>
+#  include <windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 #include <math.h>
-#include <GL/glut.h>
+
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
 #include <plib/pu.h>
 
 //#define VOODOO 1

Index: widget_list.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/widget_list.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- widget_list.cxx	31 Aug 2002 14:55:16 -0000	1.13
+++ widget_list.cxx	1 Sep 2002 06:57:58 -0000	1.14
@@ -6,13 +6,23 @@
 #include <string.h>
 #include <time.h>
 #ifdef WIN32
-#include <windows.h>
+#  include <windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 #include <math.h>
-#include <GL/glut.h>
-#include "plib/pu.h"
+
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
+#include <plib/pu.h>
 
 //#define VOODOO 1