diff --git a/.gitattributes b/.gitattributes index ac5c5df..4d24db6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -29,6 +29,7 @@ freeglut/freeglut/freeglut-1.3/freeglut_font_data.c svn_keywords=Author+Date+Id+ freeglut/freeglut/freeglut-1.3/freeglut_gamemode.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/freeglut-1.3/freeglut_geometry.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/freeglut-1.3/freeglut_init.c svn_keywords=Author+Date+Id+Revision +freeglut/freeglut/freeglut-1.3/freeglut_internal.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/freeglut-1.3/freeglut_joystick.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/freeglut-1.3/freeglut_main.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/freeglut-1.3/freeglut_menu.c svn_keywords=Author+Date+Id+Revision @@ -63,7 +64,6 @@ freeglut/freeglut/genfonts/wfont.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/include/GL/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/include/GL/freeglut.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/include/GL/freeglut_ext.h svn_keywords=Author+Date+Id+Revision -freeglut/freeglut/include/GL/freeglut_internal.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/include/GL/glut.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/include/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/install-sh svn_keywords=Author+Date+Id+Revision diff --git a/freeglut/freeglut/include/GL/freeglut_internal.h b/freeglut/freeglut/freeglut-1.3/freeglut_internal.h similarity index 99% rename from freeglut/freeglut/include/GL/freeglut_internal.h rename to freeglut/freeglut/freeglut-1.3/freeglut_internal.h index 54bb097..977e69d 100644 --- a/freeglut/freeglut/include/GL/freeglut_internal.h +++ b/freeglut/freeglut/freeglut-1.3/freeglut_internal.h @@ -54,8 +54,10 @@ * Somehow all Win32 include headers depend on this one: */ #if TARGET_HOST_WIN32 - #include - #include +#include +#include + +#define strdup _strdup #endif /* @@ -576,7 +578,7 @@ XVisualInfo* fgChooseVisual( void ); */ #if TARGET_HOST_WIN32 LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly ); +GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, unsigned char layer_type ); #endif /* @@ -584,6 +586,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly ); * Defined in freeglut_structure.c, freeglut_window.c. */ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, int x, int y, int w, int h, GLboolean gameMode ); +void fgSetWindow ( SFG_Window *window ) ; void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, int h, GLboolean gameMode, int isSubWindow ); void fgCloseWindow( SFG_Window* window ); void fgAddToWindowDestroyList ( SFG_Window* window, GLboolean needToClose ) ;