Fixing the previous commit so we don't have a circular include. Under the new regime...

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

diff --git a/src/mswin/freeglut_cursor_mswin.c b/src/mswin/freeglut_cursor_mswin.c
index 8dd7a4c..641a722 100644 (file)
--- a/src/mswin/freeglut_cursor_mswin.c
+++ b/src/mswin/freeglut_cursor_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 \r
 \r

diff --git a/src/mswin/freeglut_ext_mswin.c b/src/mswin/freeglut_ext_mswin.c
index da35307..c08c840 100644 (file)
--- a/src/mswin/freeglut_ext_mswin.c
+++ b/src/mswin/freeglut_ext_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 GLUTproc fgPlatformGlutGetProcAddress( const char* procName )\r
 {\r

diff --git a/src/mswin/freeglut_gamemode_mswin.c b/src/mswin/freeglut_gamemode_mswin.c
index 9f31fe7..83acbac 100644 (file)
--- a/src/mswin/freeglut_gamemode_mswin.c
+++ b/src/mswin/freeglut_gamemode_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 /*\r
  * Remembers the current visual settings, so that\r

diff --git a/src/mswin/freeglut_init_mswin.c b/src/mswin/freeglut_init_mswin.c
index d75765f..8627651 100644 (file)
--- a/src/mswin/freeglut_init_mswin.c
+++ b/src/mswin/freeglut_init_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 \r
 \r

diff --git a/src/mswin/freeglut_input_devices_mswin.c b/src/mswin/freeglut_input_devices_mswin.c
index c0b795e..f92eadc 100644 (file)
--- a/src/mswin/freeglut_input_devices_mswin.c
+++ b/src/mswin/freeglut_input_devices_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 #include <sys/types.h>\r
 #include <winbase.h>\r

diff --git a/src/mswin/freeglut_internal_mswin.h b/src/mswin/freeglut_internal_mswin.h
index 1fadebc..b0697b5 100644 (file)
--- a/src/mswin/freeglut_internal_mswin.h
+++ b/src/mswin/freeglut_internal_mswin.h
@@ -30,7 +30,5 @@
 \r
 \r
 \r
-#include "..\Common\freeglut_internal.h"\r
-\r
 \r
 #endif  /* FREEGLUT_INTERNAL_MSWIN_H */
\ No newline at end of file

diff --git a/src/mswin/freeglut_main_mswin.c b/src/mswin/freeglut_main_mswin.c
index e233ecf..b4d1bc9 100644 (file)
--- a/src/mswin/freeglut_main_mswin.c
+++ b/src/mswin/freeglut_main_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 \r
 extern void fghRedrawWindow ( SFG_Window *window );\r

diff --git a/src/mswin/freeglut_menu_mswin.c b/src/mswin/freeglut_menu_mswin.c
index db15f14..3def1b9 100644 (file)
--- a/src/mswin/freeglut_menu_mswin.c
+++ b/src/mswin/freeglut_menu_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 \r
 GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )\r

diff --git a/src/mswin/freeglut_state_mswin.c b/src/mswin/freeglut_state_mswin.c
index 8a67c4b..ed1f57e 100644 (file)
--- a/src/mswin/freeglut_state_mswin.c
+++ b/src/mswin/freeglut_state_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 \r
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,\r

diff --git a/src/mswin/freeglut_structure_mswin.c b/src/mswin/freeglut_structure_mswin.c
index 6f2b883..228d618 100644 (file)
--- a/src/mswin/freeglut_structure_mswin.c
+++ b/src/mswin/freeglut_structure_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 \r
 void fgPlatformCreateWindow ( SFG_Window *window )\r

diff --git a/src/mswin/freeglut_window_mswin.c b/src/mswin/freeglut_window_mswin.c
index d53ba76..e5062b4 100644 (file)
--- a/src/mswin/freeglut_window_mswin.c
+++ b/src/mswin/freeglut_window_mswin.c
@@ -26,7 +26,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 \r
 /* The following include file is available from SGI but is not standard:\r