Fixed build for non haiku targets.

Added dummy support for glutKeyboardUpFunc(), glutSpecialFunc() and glutJoystickFunc().
To be implemented later.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15099 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin 2005-11-24 05:11:01 +00:00
parent 69135e1c54
commit 49af301b35
3 changed files with 26 additions and 0 deletions

View File

@ -1,5 +1,12 @@
SubDir HAIKU_TOP src kits opengl glut ;
SetSubDirSupportedPlatformsBeOSCompatible ;
if $(TARGET_PLATFORM) != haiku {
UseHeaders [ FDirName $(HAIKU_TOP) headers os opengl ] : true ;
# We need the public GL headers also when not compiling for Haiku.
}
MergeObject <opengl>glut.o :
# C++ sources
glutBlocker.cpp

View File

@ -37,12 +37,24 @@ glutKeyboardFunc(GLUTkeyboardCB keyboardFunc)
gState.currentWindow->keyboard = keyboardFunc;
}
void APIENTRY
glutKeyboardUpFunc(GLUTkeyboardCB keyboardUpFunc)
{
gState.currentWindow->keyboardUp = keyboardUpFunc;
}
void APIENTRY
glutSpecialFunc(GLUTspecialCB specialFunc)
{
gState.currentWindow->special = specialFunc;
}
void APIENTRY
glutSpecialUpFunc(GLUTspecialCB specialUpFunc)
{
gState.currentWindow->specialUp = specialUpFunc;
}
void APIENTRY
glutMouseFunc(GLUTmouseCB mouseFunc)
{
@ -135,6 +147,11 @@ glutOverlayDisplayFunc(GLUTdisplayCB displayFunc)
{
}
void APIENTRY
glutJoystickFunc(GLUTjoystickCB joystickFunc, int pollInterval)
{
}
void APIENTRY
glutSpaceballMotionFunc(GLUTspaceMotionCB spaceMotionFunc)
{

View File

@ -63,8 +63,10 @@ public:
GLUTpassiveCB passive; /* passive motion (x,y) */
GLUTentryCB entry; /* window entry/exit (state) */
GLUTkeyboardCB keyboard; /* keyboard (ASCII,x,y) */
GLUTkeyboardCB keyboardUp; /* keyboard up (ASCII,x,y) */
GLUTvisibilityCB visibility; /* visibility */
GLUTspecialCB special; /* special key */
GLUTspecialCB specialUp; /* special key up */
GLUTwindowStatusCB windowStatus; /* window status */
bool anyevents; // were any events received?