Removing an extraneous "#if TARGET_HOST_POSIX_X11" and putting the path into the "#include" statements for "freeglut_internal.h"

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1062 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-02-05 04:21:26 +00:00
parent 1077bc750d
commit a370bd34d2
12 changed files with 12 additions and 16 deletions

View File

@ -27,7 +27,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow ) void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )
{ {

View File

@ -28,7 +28,7 @@
#define GLX_GLXEXT_PROTOTYPES #define GLX_GLXEXT_PROTOTYPES
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
GLUTproc fgPlatformGlutGetProcAddress( const char* procName ) GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
{ {

View File

@ -27,7 +27,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
static int xrandr_resize(int xsz, int ysz, int rate, int just_checking) static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
{ {

View File

@ -71,9 +71,7 @@
#undef glutBitmapHelvetica12 #undef glutBitmapHelvetica12
#undef glutBitmapHelvetica18 #undef glutBitmapHelvetica18
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
#if TARGET_HOST_POSIX_X11
struct freeglutStrokeFont struct freeglutStrokeFont
{ {
@ -104,5 +102,3 @@ struct freeglutBitmapFont glutBitmapHelvetica10 ;
struct freeglutBitmapFont glutBitmapHelvetica12 ; struct freeglutBitmapFont glutBitmapHelvetica12 ;
struct freeglutBitmapFont glutBitmapHelvetica18 ; struct freeglutBitmapFont glutBitmapHelvetica18 ;
#endif

View File

@ -29,7 +29,7 @@
#define FREEGLUT_BUILDING_LIB #define FREEGLUT_BUILDING_LIB
#include <limits.h> /* LONG_MAX */ #include <limits.h> /* LONG_MAX */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
/* Return the atom associated with "name". */ /* Return the atom associated with "name". */
static Atom fghGetAtom(const char * name) static Atom fghGetAtom(const char * name)

View File

@ -35,7 +35,7 @@
#endif #endif
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
#ifdef HAVE_ERRNO_H #ifdef HAVE_ERRNO_H
#include <errno.h> #include <errno.h>

View File

@ -34,7 +34,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
# include <sys/param.h> # include <sys/param.h>
#endif #endif

View File

@ -27,7 +27,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
#ifdef HAVE_ERRNO_H #ifdef HAVE_ERRNO_H
# include <errno.h> # include <errno.h>
#endif #endif

View File

@ -27,7 +27,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
/* /*
* * Private function to get the virtual maximum screen extent * * Private function to get the virtual maximum screen extent

View File

@ -10,7 +10,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>

View File

@ -30,7 +30,7 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include <limits.h> /* LONG_MAX */ #include <limits.h> /* LONG_MAX */
#include <unistd.h> /* usleep */ #include <unistd.h> /* usleep */
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
/* pushing attribute/value pairs into an array */ /* pushing attribute/value pairs into an array */
#define ATTRIB(a) attributes[where++]=(a) #define ATTRIB(a) attributes[where++]=(a)

View File

@ -3,7 +3,7 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "../Common/freeglut_internal.h"
#if HAVE_X11_EXTENSIONS_XINPUT2_H #if HAVE_X11_EXTENSIONS_XINPUT2_H