From: <sp...@us...> - 2008-11-02 18:42:52
|
Revision: 745 http://freeglut.svn.sourceforge.net/freeglut/?rev=745&view=rev Author: spanne Date: 2008-11-02 18:42:49 +0000 (Sun, 02 Nov 2008) Log Message: ----------- Removed superfluous #includes. Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2008-11-02 18:27:21 UTC (rev 744) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2008-11-02 18:42:49 UTC (rev 745) @@ -105,8 +105,6 @@ #endif /* These files should be available on every platform. */ -#include <GL/gl.h> -#include <GL/glu.h> #include <stdio.h> #include <string.h> #include <math.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2008-11-05 18:05:43
|
Revision: 750 http://freeglut.svn.sourceforge.net/freeglut/?rev=750&view=rev Author: spanne Date: 2008-11-05 18:05:36 +0000 (Wed, 05 Nov 2008) Log Message: ----------- Make freeglut compile under Cygwin, which has an ancient GLX header Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2008-11-02 21:30:53 UTC (rev 749) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2008-11-05 18:05:36 UTC (rev 750) @@ -101,6 +101,14 @@ # ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H # include <X11/extensions/xf86vmode.h> # endif +/* If GLX is too old, we will fail during runtime when multisampling + is requested, but at least freeglut compiles. */ +# ifndef GLX_SAMPLE_BUFFERS +# define GLX_SAMPLE_BUFFERS 0x80A8 +# endif +# ifndef GLX_SAMPLES +# define GLX_SAMPLES 0x80A9 +# endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2009-02-28 13:22:33
|
Revision: 781 http://freeglut.svn.sourceforge.net/freeglut/?rev=781&view=rev Author: spanne Date: 2009-02-28 12:16:03 +0000 (Sat, 28 Feb 2009) Log Message: ----------- Synched version number with configure.ac. We should better remove this redundancy and calculate this from configure.ac directly. Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2009-02-19 16:53:18 UTC (rev 780) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2009-02-28 12:16:03 UTC (rev 781) @@ -34,7 +34,7 @@ /* XXX Update these for each release! */ #define VERSION_MAJOR 2 -#define VERSION_MINOR 4 +#define VERSION_MINOR 6 #define VERSION_PATCH 0 /* Freeglut is intended to function under all Unix/X11 and Win32 platforms. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2009-11-18 13:02:12
|
Revision: 850 http://freeglut.svn.sourceforge.net/freeglut/?rev=850&view=rev Author: fayjf Date: 2009-11-18 12:29:05 +0000 (Wed, 18 Nov 2009) Log Message: ----------- Adding Mac OSX to the list of platforms covered by the X11 support. This is a stopgap measure so we can get something out the door; I would prefer native OSX support. See e-mail from Paul Martz at 3:25 PM, 11/16/09 for some thoughts on this. Apparently this allows the library to build but the demos do not work. Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2009-11-18 01:52:13 UTC (rev 849) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2009-11-18 12:29:05 UTC (rev 850) @@ -49,9 +49,11 @@ #elif defined(__posix__) || defined(__unix__) || defined(__linux__) # define TARGET_HOST_POSIX_X11 1 -/* FIXME: no Macintosh support? -#if ... -# define TARGET_HOST_MAC_OSX 1 +#elif defined(__APPLE__) +/* This is a placeholder until we get native OSX support ironed out -- JFF 11/18/09 */ +# define TARGET_HOST_POSIX_X11 1 +/* # define TARGET_HOST_MAC_OSX 1 */ + #else # error "Unrecognized target host!" */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2009-12-21 01:50:48
|
Revision: 864 http://freeglut.svn.sourceforge.net/freeglut/?rev=864&view=rev Author: fayjf Date: 2009-12-21 01:50:35 +0000 (Mon, 21 Dec 2009) Log Message: ----------- Adding a check for Solaris in the "freeglut_internal.h" code to avoid duplication Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2009-12-13 13:47:20 UTC (rev 863) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2009-12-21 01:50:35 UTC (rev 864) @@ -41,7 +41,7 @@ /* XXX: Don't all MS-Windows compilers (except Cygwin) have _WIN32 defined? * XXX: If so, remove the first set of defined()'s below. */ -#if !defined(TARGET_HOST_POSIX_X11) && !defined(TARGET_HOST_MS_WINDOWS) && !defined(TARGET_HOST_MAC_OSX) +#if !defined(TARGET_HOST_POSIX_X11) && !defined(TARGET_HOST_MS_WINDOWS) && !defined(TARGET_HOST_MAC_OSX) && !defined(TARGET_HOST_SOLARIS) #if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__MINGW32__) \ || defined(_WIN32) || defined(_WIN32_WCE) \ || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2010-01-30 00:55:12
|
Revision: 874 http://freeglut.svn.sourceforge.net/freeglut/?rev=874&view=rev Author: fayjf Date: 2010-01-30 00:54:59 +0000 (Sat, 30 Jan 2010) Log Message: ----------- Putting the definition of "HAVE_VFPRINTF" back in (and adding the errant "F") per e-mail from Eero Pajarre dated 1/29/2010 at 7:51 AM Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2010-01-30 00:03:48 UTC (rev 873) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2010-01-30 00:54:59 UTC (rev 874) @@ -160,6 +160,10 @@ # endif #endif +#if TARGET_HOST_MS_WINDOWS +# define HAVE_VFPRINTF 1 +#endif + /* MinGW may lack a prototype for ChangeDisplaySettingsEx() (depending on the version?) */ #if TARGET_HOST_MS_WINDOWS && !defined(ChangeDisplaySettingsEx) LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2011-01-23 14:29:53
|
Revision: 883 http://freeglut.svn.sourceforge.net/freeglut/?rev=883&view=rev Author: fayjf Date: 2011-01-23 14:29:47 +0000 (Sun, 23 Jan 2011) Log Message: ----------- Adding support to Solaris courtesy of Dagobert Michelsen, bug report 3077828 (thank you, Dagobert). Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2011-01-23 14:18:25 UTC (rev 882) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2011-01-23 14:29:47 UTC (rev 883) @@ -47,7 +47,7 @@ || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) ) # define TARGET_HOST_MS_WINDOWS 1 -#elif defined(__posix__) || defined(__unix__) || defined(__linux__) +#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) # define TARGET_HOST_POSIX_X11 1 #elif defined(__APPLE__) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2011-01-23 22:30:19
|
Revision: 887 http://freeglut.svn.sourceforge.net/freeglut/?rev=887&view=rev Author: fayjf Date: 2011-01-23 22:30:13 +0000 (Sun, 23 Jan 2011) Log Message: ----------- Fixing bug report 2952457 -- modifying the "FREEGLUT_EXIT_IF_NO_WINDOW" macro so that it does not exit if the user has specified "GLUT_ACTION_CONTINUE_EXECUTION". Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2011-01-23 22:19:16 UTC (rev 886) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2011-01-23 22:30:13 UTC (rev 887) @@ -801,11 +801,12 @@ * A call to those macros assures us that there is a current * window set, respectively: */ -#define FREEGLUT_EXIT_IF_NO_WINDOW( string ) \ - if ( ! fgStructure.CurrentWindow ) \ - { \ - fgError ( " ERROR: Function <%s> called" \ - " with no current window defined.", (string) ) ; \ +#define FREEGLUT_EXIT_IF_NO_WINDOW( string ) \ + if ( ! fgStructure.CurrentWindow && \ + ( fgState.ActionOnWindowClose != GLUT_ACTION_CONTINUE_EXECUTION ) ) \ + { \ + fgError ( " ERROR: Function <%s> called" \ + " with no current window defined.", (string) ) ; \ } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2011-09-04 03:35:35
|
Revision: 927 http://freeglut.svn.sourceforge.net/freeglut/?rev=927&view=rev Author: fayjf Date: 2011-09-04 03:35:29 +0000 (Sun, 04 Sep 2011) Log Message: ----------- Fixing bug 3292122 from Nigel Stewart (thanks, Nigel) so that "freeglut" will build on Ubuntu, per e-mail from Diederick Niehorster vintage 6/8/2011 at 3:07 AM. There was a problem with variables being declared only with an X extension but being used for all of X. Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2011-06-10 03:53:12 UTC (rev 926) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2011-09-04 03:35:29 UTC (rev 927) @@ -381,11 +381,11 @@ int DisplayModeClock; /* The display mode's refresh rate */ int DisplayViewPortX; /* saved X location of the viewport */ int DisplayViewPortY; /* saved Y location of the viewport */ +#endif /* HAVE_X11_EXTENSIONS_XF86VMODE_H */ + int DisplayPointerX; /* saved X location of the pointer */ int DisplayPointerY; /* saved Y location of the pointer */ -#endif /* HAVE_X11_EXTENSIONS_XF86VMODE_H */ - #elif TARGET_HOST_MS_WINDOWS HINSTANCE Instance; /* The application's instance */ DEVMODE DisplayMode; /* Desktop's display settings */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2011-09-10 12:53:12
|
Revision: 938 http://freeglut.svn.sourceforge.net/freeglut/?rev=938&view=rev Author: fayjf Date: 2011-09-10 12:53:06 +0000 (Sat, 10 Sep 2011) Log Message: ----------- Fixing build warnings on OpenSUSE (and probably other Linux distros) by enclosing some function prototypes within an "ifdef" checking for Windows per e-mail from Johannes Obermayr dated 8/8/2011 at 1:05 PM (thank you, Johannes) Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_internal.h Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2011-09-05 17:26:30 UTC (rev 937) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2011-09-10 12:53:06 UTC (rev 938) @@ -932,6 +932,7 @@ void fgEnumSubWindows( SFG_Window* window, FGCBenumerator enumCallback, SFG_Enumerator* enumerator ); +#if TARGET_HOST_MS_WINDOWS /* * Helper functions for getting client area from the window rect * and the window rect from the client area given the style of the window @@ -942,6 +943,7 @@ void fghComputeClientAreaFromWindowRect ( const SFG_Window *window, RECT *windowRect, BOOL wantPosOutside ); RECT fghGetClientArea ( const SFG_Window *window, BOOL wantPosOutside ); void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth); +#endif /* * fgWindowByHandle returns a (SFG_Window *) value pointing to the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |