Moved freeglut_internal.h to the freeglut source code private directory.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@50 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
304a5d98a6
commit
f89b393190
@ -32,7 +32,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-callbacks"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
|
||||
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
|
||||
|
@ -32,7 +32,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-cursor"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
#if TARGET_HOST_UNIX_X11
|
||||
#include <X11/cursorfont.h>
|
||||
|
@ -36,7 +36,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-display"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
|
||||
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
|
||||
|
@ -29,7 +29,7 @@
|
||||
#endif
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
/*
|
||||
* Following fonts are defined in this file:
|
||||
|
@ -32,7 +32,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-gamemode"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
/*
|
||||
* TODO BEFORE THE STABLE RELEASE:
|
||||
|
@ -32,7 +32,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-geometry"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
/*
|
||||
* TODO BEFORE THE STABLE RELEASE:
|
||||
|
@ -32,7 +32,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-init"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
/*
|
||||
* TODO BEFORE THE STABLE RELEASE:
|
||||
@ -367,8 +367,8 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
|
||||
* This is harmless under Win32, so let's let it stay here...
|
||||
*/
|
||||
#if TARGET_HOST_WIN32
|
||||
if ( !getenv( "DISPLAY" ) )
|
||||
displayName = strdup( "" );
|
||||
if ( !getenv ( "DISPLAY" ) )
|
||||
displayName = strdup ( "" ) ;
|
||||
else
|
||||
#endif
|
||||
displayName = strdup( getenv( "DISPLAY" ) );
|
||||
@ -613,7 +613,7 @@ void FGAPIENTRY glutInitWindowSize( int width, int height )
|
||||
/*
|
||||
* Sets the default display mode for all new windows
|
||||
*/
|
||||
void FGAPIENTRY glutInitDisplayMode( int displayMode )
|
||||
void FGAPIENTRY glutInitDisplayMode( unsigned int displayMode )
|
||||
{
|
||||
/*
|
||||
* We will make use of this value when creating a new OpenGL context...
|
||||
@ -821,7 +821,7 @@ void FGAPIENTRY glutInitDisplayString( char* displayMode )
|
||||
* Grab the value string that must follow the comparison operator...
|
||||
*/
|
||||
if( comparison != FG_NONE && i < (gint) strlen( scanner->value.v_identifier ) )
|
||||
valueString = g_strdup( scanner->value.v_identifier + i );
|
||||
valueString = strdup( scanner->value.v_identifier + i );
|
||||
|
||||
/*
|
||||
* If there was a value string, convert it to integer...
|
||||
@ -923,7 +923,7 @@ static int TokenLengths[] =
|
||||
10, 12
|
||||
};
|
||||
|
||||
void FGAPIENTRY glutInitDisplayString( char* displayMode )
|
||||
void FGAPIENTRY glutInitDisplayString( const char* displayMode )
|
||||
{
|
||||
int glut_state_flag = 0 ;
|
||||
/*
|
||||
|
@ -44,7 +44,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-joystick"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
/*
|
||||
* PWO: I don't like it at all. It's a mess. Could it be cleared?
|
||||
@ -544,7 +544,7 @@ void fgJoystickClose( void )
|
||||
#endif
|
||||
|
||||
free ( fgJoystick ) ;
|
||||
fgJoystick = NULL ;
|
||||
fgJoystick = NULL ; // show joystick has been deinitialized
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -32,7 +32,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-misc"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
/*
|
||||
* TODO BEFORE THE STABLE RELEASE:
|
||||
|
@ -32,7 +32,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-overlay"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
/*
|
||||
* NOTE: functions declared in this file probably will not be implemented.
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
/* This file has been automatically generated by the genstroke utility. */
|
||||
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
#ifdef TARGET_HOST_WIN32
|
||||
#pragma warning ( once:4305 )
|
||||
#endif
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
/* This file has been automatically generated by the genstroke utility. */
|
||||
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
#ifdef TARGET_HOST_WIN32
|
||||
#pragma warning ( once:4305 )
|
||||
#endif
|
||||
|
@ -79,7 +79,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-teapot"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
|
||||
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
|
||||
|
@ -32,7 +32,7 @@
|
||||
#define G_LOG_DOMAIN "freeglut-videoresize"
|
||||
|
||||
#include "../include/GL/freeglut.h"
|
||||
#include "../include/GL/freeglut_internal.h"
|
||||
#include "freeglut_internal.h"
|
||||
|
||||
/*
|
||||
* NOTE: functions declared in this file probably will not be implemented.
|
||||
|
Reference in New Issue
Block a user