Include freeglut header via <GL/freeglut.h> rather than "../include/GL/freeglut.h"

This allows some additional flexibility with file layout.
It should be the responsibility of the build environment, rather than at source level.
This change tested on MSVC 6, cygwin and mingw32 gcc and Linux gcc.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@470 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index baaeee1..705c3d6 100644 (file)
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 

diff --git a/src/freeglut_cursor.c b/src/freeglut_cursor.c
index 63b9070..23839a5 100644 (file)
--- a/src/freeglut_cursor.c
+++ b/src/freeglut_cursor.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 #if TARGET_HOST_UNIX_X11

diff --git a/src/freeglut_display.c b/src/freeglut_display.c
index fe0ff13..eeac0ac 100644 (file)
--- a/src/freeglut_display.c
+++ b/src/freeglut_display.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 

diff --git a/src/freeglut_ext.c b/src/freeglut_ext.c
index 2c98d4b..79a64e4 100644 (file)
--- a/src/freeglut_ext.c
+++ b/src/freeglut_ext.c
@@ -31,7 +31,7 @@
 
 #define GLX_GLXEXT_PROTOTYPES
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 

diff --git a/src/freeglut_font.c b/src/freeglut_font.c
index 4bdfa88..4bf8ddd 100644 (file)
--- a/src/freeglut_font.c
+++ b/src/freeglut_font.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_font_data.c b/src/freeglut_font_data.c
index c18a15e..566aeba 100644 (file)
--- a/src/freeglut_font_data.c
+++ b/src/freeglut_font_data.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_gamemode.c b/src/freeglut_gamemode.c
index f4c51f6..0344525 100644 (file)
--- a/src/freeglut_gamemode.c
+++ b/src/freeglut_gamemode.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_geometry.c b/src/freeglut_geometry.c
index 8122a5b..b81a05f 100644 (file)
--- a/src/freeglut_geometry.c
+++ b/src/freeglut_geometry.c
@@ -29,9 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
-
-
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_init.c b/src/freeglut_init.c
index 590c2bb..eea5940 100644 (file)
--- a/src/freeglut_init.c
+++ b/src/freeglut_init.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c
index 042563f..478e287 100644 (file)
--- a/src/freeglut_joystick.c
+++ b/src/freeglut_joystick.c
@@ -39,7 +39,7 @@
 #    include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index 2882ede..722f075 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 #include <limits.h>

diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c
index 1f9a831..bdff2a5 100644 (file)
--- a/src/freeglut_menu.c
+++ b/src/freeglut_menu.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /* -- DEFINITIONS ---------------------------------------------------------- */

diff --git a/src/freeglut_misc.c b/src/freeglut_misc.c
index 2af1731..bbef626 100644 (file)
--- a/src/freeglut_misc.c
+++ b/src/freeglut_misc.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_overlay.c b/src/freeglut_overlay.c
index 2f3a4e6..93d5aec 100644 (file)
--- a/src/freeglut_overlay.c
+++ b/src/freeglut_overlay.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_state.c b/src/freeglut_state.c
index f399a8c..9dc38fb 100644 (file)
--- a/src/freeglut_state.c
+++ b/src/freeglut_state.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_structure.c b/src/freeglut_structure.c
index 42eb578..3a9c863 100644 (file)
--- a/src/freeglut_structure.c
+++ b/src/freeglut_structure.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 

diff --git a/src/freeglut_teapot.c b/src/freeglut_teapot.c
index 01aab4f..a6e0681 100644 (file)
--- a/src/freeglut_teapot.c
+++ b/src/freeglut_teapot.c
@@ -76,7 +76,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */

diff --git a/src/freeglut_videoresize.c b/src/freeglut_videoresize.c
index bdf4935..a7f449f 100644 (file)
--- a/src/freeglut_videoresize.c
+++ b/src/freeglut_videoresize.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index 60a72f1..6217627 100644 (file)
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*