X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=miniglut.h;h=666e5fc0458153e28e4a5105a1029be2432bdb00;hb=7c8e930593b4d1f36a4299f742fba7c26862ea79;hp=56d7a975f678741efc6edfc99435f9ccc2796538;hpb=1dcaa0cf790ced9f2245ae33d175de5f7bb9a0c9;p=miniglut

diff --git a/miniglut.h b/miniglut.h
index 56d7a97..666e5fc 100644
--- a/miniglut.h
+++ b/miniglut.h
@@ -24,7 +24,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #ifdef _MSC_VER
 #pragma comment (lib, "opengl32")
+#ifndef MINIGLUT_NO_WINMM
 #pragma comment (lib, "winmm")
+#endif
 #endif	/* MSVC */
 
 #endif
@@ -85,6 +87,30 @@ enum {
 	GLUT_ELAPSED_TIME
 };
 
+enum {
+	GLUT_KEY_HOME = 0xff50,
+	GLUT_KEY_LEFT = 0xff51,
+	GLUT_KEY_UP,
+	GLUT_KEY_RIGHT,
+	GLUT_KEY_DOWN,
+	GLUT_KEY_PAGE_UP,
+	GLUT_KEY_PAGE_DOWN,
+	GLUT_KEY_END = 0xff57,
+	GLUT_KEY_INSERT = 0xff63,
+	GLUT_KEY_F1 = 0xffbe,
+	GLUT_KEY_F2,
+	GLUT_KEY_F3,
+	GLUT_KEY_F4,
+	GLUT_KEY_F5,
+	GLUT_KEY_F6,
+	GLUT_KEY_F7,
+	GLUT_KEY_F8,
+	GLUT_KEY_F9,
+	GLUT_KEY_F10,
+	GLUT_KEY_F11,
+	GLUT_KEY_F12
+};
+
 /* returned by glutGetModifiers */
 #define GLUT_ACTIVE_SHIFT	1
 #define GLUT_ACTIVE_CTRL	4
@@ -100,6 +126,9 @@ typedef void (*glut_cb_motion)(int x, int y);
 typedef void (*glut_cb_sbmotion)(int x, int y, int z);
 typedef void (*glut_cb_sbbutton)(int bn, int state);
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 void glutInit(int *argc, char **argv);
 void glutInitWindowPosition(int x, int y);
@@ -134,7 +163,7 @@ void glutMotionFunc(glut_cb_motion func);
 void glutPassiveMotionFunc(glut_cb_motion func);
 void glutSpaceballMotionFunc(glut_cb_sbmotion func);
 void glutSpaceballRotateFunc(glut_cb_sbmotion func);
-void glutSpaceballBittonFunc(glut_cb_sbbutton func);
+void glutSpaceballButtonFunc(glut_cb_sbbutton func);
 
 int glutGet(unsigned int s);
 int glutGetModifiers(void);
@@ -152,4 +181,8 @@ void glutWireTorus(float inner_rad, float outer_rad, int sides, int rings);
 void glutSolidTeapot(float size);
 void glutWireTeapot(float size);
 
+#ifdef __cplusplus
+}	/* extern "C" */
+#endif
+
 #endif	/* MINIGLUT_H_ */