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. -
+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.
+