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

fixed documentation for GLUT_ICON (its not an environment variable, but

Browse Source 
an identifier for a resource file) and added an example of it for the
One demo


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1530 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2013-02-28 13:40:28 +00:00
parent 766e0cafc5
commit cd92d7fdd2
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
freeglut/freeglut/CMakeLists.txt
View File

@ -432,7 +432,12 @@ ADD_DEMO(CallbackMaker progs/demos/CallbackMaker/CallbackMaker.c)
ADD_DEMO(Fractals progs/demos/Fractals/fractals.c) ADD_DEMO(Fractals progs/demos/Fractals/fractals.c)
ADD_DEMO(Fractals_random progs/demos/Fractals_random/fractals_random.c) ADD_DEMO(Fractals_random progs/demos/Fractals_random/fractals_random.c)
ADD_DEMO(Lorenz progs/demos/Lorenz/lorenz.c) ADD_DEMO(Lorenz progs/demos/Lorenz/lorenz.c)
IF (NOT WIN32)
ADD_DEMO(One progs/demos/One/one.c) ADD_DEMO(One progs/demos/One/one.c)
ELSE()
ADD_DEMO(One progs/demos/One/one.c
progs/demos/One/one.rc)
ENDIF()
ADD_DEMO(Resizer progs/demos/Resizer/Resizer.cpp) ADD_DEMO(Resizer progs/demos/Resizer/Resizer.cpp)
ADD_DEMO(multi-touch progs/demos/multi-touch/multi-touch.c) ADD_DEMO(multi-touch progs/demos/multi-touch/multi-touch.c)
ADD_DEMO(shapes progs/demos/shapes/shapes.c ADD_DEMO(shapes progs/demos/shapes/shapes.c

12
freeglut/web-src/docs/api.php
View File

@ -2318,10 +2318,18 @@ are recognized by <i>freeglut</i>:
if FREEGLUT_FPS is set to 5000, every 5 seconds a message will be printed if FREEGLUT_FPS is set to 5000, every 5 seconds a message will be printed
to stderr showing the current frame rate. The frame rate is measured by counting to stderr showing the current frame rate. The frame rate is measured by counting
the number of times glutSwapBuffers() is called over the time interval.</li> the number of times glutSwapBuffers() is called over the time interval.</li>
<li>GLUT_ICON - specifies the icon that
goes in the upper left-hand corner of the <i>freeglut</i><i> </i>windows </li>
</ul> </ul>
<p>
Furthermore, on windows, there is a resource file identifier GLUT_ICON
that you can specify for your executable file. It specifies the icon
that goes in the upper left-hand corner of the <i>freeglut</i> windows.
Your application's resource file should contain the line:<br>
<tt>GLUT_ICON ICON DISCARDABLE "icon.ico"</tt><br>, where
icon.ico is the filename of your icon. The One demo includes such an
icon as an example.
</p>
<h1>21. <a name="ImplementationNotes"></a>Implementation Notes</h1> <h1>21. <a name="ImplementationNotes"></a>Implementation Notes</h1>
<h1>22. <a name="GLUT_State"></a>GLUT State</h1> <h1>22. <a name="GLUT_State"></a>GLUT State</h1>