i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ooops, should not have been commited yet. Sorry.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37788 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2010-07-28 14:32:21 +00:00
parent e88fbde60b
commit 235129deb8
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/mesa/glut/Jamfile
+1 -1
View File
@@ -20,7 +20,7 @@ MergeObject <opengl>glut.o :
glutCursor.cpp glutCursor.cpp
glutMenu.cpp glutMenu.cpp
glutDstr.cpp glutDstr.cpp
glutGameMode.cpp # glutGameMode.cpp
beos_x11.cpp beos_x11.cpp
# C sources # C sources
src/libs/mesa/glut/glutState.h
+9 -7
View File
@@ -28,7 +28,7 @@
struct GlutState { struct GlutState {
BApplication *display; BApplication *display;
thread_id appthread; thread_id appthread;
int initX, initY; // initial window position int initX, initY; // initial window position
int initWidth, initHeight; // initial window size int initWidth, initHeight; // initial window size
unsigned int displayMode; // initial display mode unsigned int displayMode; // initial display mode
@@ -36,18 +36,20 @@ struct GlutState {
GlutWindow *currentWindow; // current window GlutWindow *currentWindow; // current window
GlutMenu *currentMenu; // current menu GlutMenu *currentMenu; // current menu
GlutWindow **windowList; // array of pointers to windows GlutWindow **windowList; // array of pointers to windows
int windowListSize; // size of window list int windowListSize; // size of window list
GLUTidleCB idle; // idle callback GLUTidleCB idle; // idle callback
GLUTmenuStatusCB menuStatus; // menu status callback GLUTmenuStatusCB menuStatus; // menu status callback
int modifierKeys; // only valid during keyboard callback int modifierKeys; // only valid during keyboard callback
int keyRepeatMode; // global repeat int keyRepeatMode; // global repeat
bool gameMode; // game mode is active
bool debug; // call glGetError bool debug; // call glGetError
bool quitAll; // quit bool quitAll; // quit
GlutState() { GlutState() {
display = 0; display = 0;
appthread = 0; appthread = 0;