From 99318ae110a3ddbf067e03b9f2426c2fb1e3c9e7 Mon Sep 17 00:00:00 2001 From: Jinrong Xie Date: Wed, 20 Jan 2016 19:48:39 +0000 Subject: [PATCH] moved spaceball macros from freeglut_std.h to freeglut_ext.h (cherry picked from commit 13e6cf15916b12166fb98aaac6f3360c2e044f01) (cherry picked from commit 13e6cf15916b12166fb98aaac6f3360c2e044f01) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1788 7f0cb862-5218-0410-a997-914c9d46530a --- include/GL/freeglut_ext.h | 10 ++++++++++ include/GL/freeglut_std.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h index 4fc33ec..2ef96c2 100644 --- a/include/GL/freeglut_ext.h +++ b/include/GL/freeglut_ext.h @@ -127,6 +127,16 @@ #define GLUT_COMPATIBILITY_PROFILE 0x0002 /* +* GLUT API Extension macro definitions -- Spaceball button definitions +*/ + +#define GLUT_SPACEBALL_BUTTON_A 0x0001 +#define GLUT_SPACEBALL_BUTTON_B 0x0002 +#define GLUT_SPACEBALL_BUTTON_C 0x0004 +#define GLUT_SPACEBALL_BUTTON_D 0x0008 +#define GLUT_SPACEBALL_BUTTON_E 0x0010 + +/* * Process loop function, see fg_main.c */ FGAPI void FGAPIENTRY glutMainLoopEvent( void ); diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index 37d29be..a658c7c 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -408,16 +408,6 @@ #define GLUT_GAME_MODE_DISPLAY_CHANGED 0x0006 /* - * GLUT API macro definitions -- Spaceball button definitions - */ - -#define GLUT_SPACEBALL_BUTTON_A 0x0001 -#define GLUT_SPACEBALL_BUTTON_B 0x0002 -#define GLUT_SPACEBALL_BUTTON_C 0x0004 -#define GLUT_SPACEBALL_BUTTON_D 0x0008 -#define GLUT_SPACEBALL_BUTTON_E 0x0010 - -/* * Initialization functions, see fglut_init.c */ FGAPI void FGAPIENTRY glutInit( int* pargc, char** argv ); -- 1.7.10.4