FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Putting in changes recommended by Evan Felix to fix the X11 build per e-mail dated 2/4/12 at 1:16 PM

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1049 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-02-05 00:52:55 +00:00
parent cf4fb42ef1
commit fb55e0df4f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeglut/freeglut/src/Common/freeglut_ext.c
View File

@ -204,7 +204,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
#if TARGET_HOST_POSIX_X11 #if TARGET_HOST_POSIX_X11
static GLUTproc fgPlatformGetGLUTProcAddress( const char* procName ) GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
{ {
/* optimization: quick initial check */ /* optimization: quick initial check */
if( strncmp( procName, "glut", 4 ) != 0 ) if( strncmp( procName, "glut", 4 ) != 0 )

1
freeglut/freeglut/src/Common/freeglut_joystick.c
View File

@ -1037,6 +1037,7 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
char *cp; char *cp;
#endif #endif
#ifdef JS_NEW #ifdef JS_NEW
int i = 0;
unsigned char u; unsigned char u;
#else #else
# if defined( __linux__ ) || TARGET_HOST_SOLARIS # if defined( __linux__ ) || TARGET_HOST_SOLARIS

14
freeglut/freeglut/src/Common/freeglut_window.c
View File

@ -525,6 +525,13 @@ void fgPlatformSetWindow ( SFG_Window *window )
} }
static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
{
Window window = (Window)arg;
return (event->type == MapNotify) && (event->xmap.window == window);
}
/* /*
* Opens a window. Requires a SFG_Window object created and attached * Opens a window. Requires a SFG_Window object created and attached
* to the freeglut structure. OpenGL context is created here. * to the freeglut structure. OpenGL context is created here.
@ -759,13 +766,6 @@ void fgPlatformCloseWindow( SFG_Window* window )
} }
static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
{
Window window = (Window)arg;
return (event->type == MapNotify) && (event->xmap.window == window);
}
/* /*

1
freeglut/freeglut/src/Makefile.am
View File

@ -20,7 +20,6 @@ lib@LIBRARY@_la_SOURCES = Common/freeglut_callbacks.c \
Common/freeglut_display.c \ Common/freeglut_display.c \
Common/freeglut_ext.c \ Common/freeglut_ext.c \
Common/freeglut_font.c \ Common/freeglut_font.c \
Common/freeglut_glutfont_definitions.c \
Common/freeglut_font_data.c \ Common/freeglut_font_data.c \
Common/freeglut_stroke_roman.c \ Common/freeglut_stroke_roman.c \
Common/freeglut_stroke_mono_roman.c \ Common/freeglut_stroke_mono_roman.c \