From cd92d7fdd2951f5a17ac4ff512bbd5c233add4c3 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Thu, 28 Feb 2013 13:40:28 +0000 Subject: [PATCH] fixed documentation for GLUT_ICON (its not an environment variable, but 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 --- freeglut/freeglut/CMakeLists.txt | 7 ++++++- freeglut/web-src/docs/api.php | 12 ++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/freeglut/freeglut/CMakeLists.txt b/freeglut/freeglut/CMakeLists.txt index 8dd1fef..6f6130e 100644 --- a/freeglut/freeglut/CMakeLists.txt +++ b/freeglut/freeglut/CMakeLists.txt @@ -432,7 +432,12 @@ ADD_DEMO(CallbackMaker progs/demos/CallbackMaker/CallbackMaker.c) ADD_DEMO(Fractals progs/demos/Fractals/fractals.c) ADD_DEMO(Fractals_random progs/demos/Fractals_random/fractals_random.c) ADD_DEMO(Lorenz progs/demos/Lorenz/lorenz.c) -ADD_DEMO(One progs/demos/One/one.c) +IF (NOT WIN32) + 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(multi-touch progs/demos/multi-touch/multi-touch.c) ADD_DEMO(shapes progs/demos/shapes/shapes.c diff --git a/freeglut/web-src/docs/api.php b/freeglut/web-src/docs/api.php index ecdc6d3..ef9a457 100644 --- a/freeglut/web-src/docs/api.php +++ b/freeglut/web-src/docs/api.php @@ -2318,10 +2318,18 @@ are recognized by freeglut: 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 the number of times glutSwapBuffers() is called over the time interval. -
  • GLUT_ICON - specifies the icon that - goes in the upper left-hand corner of the freeglut windows
    • +

    +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 freeglut windows. +Your application's resource file should contain the line:
    +GLUT_ICON ICON DISCARDABLE "icon.ico"
    , where +icon.ico is the filename of your icon. The One demo includes such an +icon as an example. +

    +

    21. Implementation Notes

    22. GLUT State