Removing an extraneous "#if TARGET_HOST_POSIX_X11" and putting the path into the...

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

diff --git a/src/x11/freeglut_display_x11.c b/src/x11/freeglut_display_x11.c
index f03c064..86233d8 100644 (file)
--- a/src/x11/freeglut_display_x11.c
+++ b/src/x11/freeglut_display_x11.c
@@ -27,7 +27,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )\r
 {\r

diff --git a/src/x11/freeglut_ext_x11.c b/src/x11/freeglut_ext_x11.c
index 280ebc9..b4c9032 100644 (file)
--- a/src/x11/freeglut_ext_x11.c
+++ b/src/x11/freeglut_ext_x11.c
@@ -28,7 +28,7 @@
 \r
 #define GLX_GLXEXT_PROTOTYPES\r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 GLUTproc fgPlatformGlutGetProcAddress( const char* procName )\r
 {\r

diff --git a/src/x11/freeglut_gamemode_x11.c b/src/x11/freeglut_gamemode_x11.c
index 409a621..ffbf240 100644 (file)
--- a/src/x11/freeglut_gamemode_x11.c
+++ b/src/x11/freeglut_gamemode_x11.c
@@ -27,7 +27,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)\r
 {\r

diff --git a/src/x11/freeglut_glutfont_definitions_x11.c b/src/x11/freeglut_glutfont_definitions_x11.c
index 742dd15..394c6c1 100644 (file)
--- a/src/x11/freeglut_glutfont_definitions_x11.c
+++ b/src/x11/freeglut_glutfont_definitions_x11.c
@@ -71,9 +71,7 @@
 #undef glutBitmapHelvetica12\r
 #undef glutBitmapHelvetica18\r
 \r
-#include "freeglut_internal.h"\r
-\r
-#if TARGET_HOST_POSIX_X11\r
+#include "../Common/freeglut_internal.h"\r
 \r
 struct freeglutStrokeFont\r
 {\r
@@ -104,5 +102,3 @@ struct freeglutBitmapFont glutBitmapHelvetica10 ;
 struct freeglutBitmapFont glutBitmapHelvetica12 ;\r
 struct freeglutBitmapFont glutBitmapHelvetica18 ;\r
 \r
-#endif\r
-\r

diff --git a/src/x11/freeglut_init_x11.c b/src/x11/freeglut_init_x11.c
index 5c3dc4d..8574ce1 100644 (file)
--- a/src/x11/freeglut_init_x11.c
+++ b/src/x11/freeglut_init_x11.c
@@ -29,7 +29,7 @@
 #define FREEGLUT_BUILDING_LIB\r
 #include <limits.h>  /* LONG_MAX */\r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 /* Return the atom associated with "name". */\r
 static Atom fghGetAtom(const char * name)\r

diff --git a/src/x11/freeglut_input_devices_x11.c b/src/x11/freeglut_input_devices_x11.c
index ebd99eb..15faf4f 100644 (file)
--- a/src/x11/freeglut_input_devices_x11.c
+++ b/src/x11/freeglut_input_devices_x11.c
@@ -35,7 +35,7 @@
 #endif\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 #ifdef HAVE_ERRNO_H\r
 #include <errno.h>\r

diff --git a/src/x11/freeglut_joystick_x11.c b/src/x11/freeglut_joystick_x11.c
index a006301..9e2ee0c 100644 (file)
--- a/src/x11/freeglut_joystick_x11.c
+++ b/src/x11/freeglut_joystick_x11.c
@@ -34,7 +34,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 #ifdef HAVE_SYS_PARAM_H\r
 #    include <sys/param.h>\r
 #endif\r

diff --git a/src/x11/freeglut_main_x11.c b/src/x11/freeglut_main_x11.c
index 1e982d7..94a3cbd 100644 (file)
--- a/src/x11/freeglut_main_x11.c
+++ b/src/x11/freeglut_main_x11.c
@@ -27,7 +27,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 #ifdef HAVE_ERRNO_H\r
 #    include <errno.h>\r
 #endif\r

diff --git a/src/x11/freeglut_menu_x11.c b/src/x11/freeglut_menu_x11.c
index f10cd8c..a09c6eb 100644 (file)
--- a/src/x11/freeglut_menu_x11.c
+++ b/src/x11/freeglut_menu_x11.c
@@ -27,7 +27,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 /*\r
  *  * Private function to get the virtual maximum screen extent\r

diff --git a/src/x11/freeglut_spaceball_x11.c b/src/x11/freeglut_spaceball_x11.c
index 0e29b3f..84f8511 100644 (file)
--- a/src/x11/freeglut_spaceball_x11.c
+++ b/src/x11/freeglut_spaceball_x11.c
@@ -10,7 +10,7 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 #include <X11/Xlib.h>\r
 \r

diff --git a/src/x11/freeglut_window_x11.c b/src/x11/freeglut_window_x11.c
index 54dc786..f810965 100644 (file)
--- a/src/x11/freeglut_window_x11.c
+++ b/src/x11/freeglut_window_x11.c
@@ -30,7 +30,7 @@
 #include <GL/freeglut.h>\r
 #include <limits.h>  /* LONG_MAX */\r
 #include <unistd.h>  /* usleep */\r
-#include "freeglut_internal.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 /* pushing attribute/value pairs into an array */\r
 #define ATTRIB(a) attributes[where++]=(a)\r

diff --git a/src/x11/freeglut_xinput_x11.c b/src/x11/freeglut_xinput_x11.c
index 68e4562..d3d8968 100644 (file)
--- a/src/x11/freeglut_xinput_x11.c
+++ b/src/x11/freeglut_xinput_x11.c
@@ -3,7 +3,7 @@
 
 #include <GL/freeglut.h>
 
-#include "freeglut_internal.h"
+#include "../Common/freeglut_internal.h"
 
 #if HAVE_X11_EXTENSIONS_XINPUT2_H