chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-22 05:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Testing XFree compile glitch

Browse Source
This commit is contained in:
Mark Watkins 2011-06-16 01:56:19 +10:00
parent f06a4886c9
commit 623162a539
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8309,7 +8309,7 @@
1308026543 D 1308026543 D
1308152355 /home/mark/projects/git/sleepyhead/src/version.h 1308153347 /home/mark/projects/git/sleepyhead/src/version.h
1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed
<wx/dcbuffer.h> <wx/dcbuffer.h>
@ -8362,7 +8362,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1308152473 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1308152899 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
"freetype-gl/font-manager.h" "freetype-gl/font-manager.h"
"freetype-gl/texture-font.h" "freetype-gl/texture-font.h"
"graph.h" "graph.h"
@ -11061,15 +11061,16 @@
<string.h> <string.h>
"freetype-gl/vector.h" "freetype-gl/vector.h"
1308097228 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h 1308153347 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h
<wx/log.h> <wx/log.h>
<GL/glew.h> <GL/glew.h>
<GL/wglew.h> <GL/wglew.h>
<OpenGL/gl.h> <OpenGL/gl.h>
<AGL/agl.h> <AGL/agl.h>
<GL/gl.h>
<GL/glx.h> <GL/glx.h>
1308108253 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp 1308153312 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp
"gl_pbuffer.h" "gl_pbuffer.h"
<wx/utils.h> <wx/utils.h>

1
src/graphs/gl_pbuffer.h
View File

@ -20,6 +20,7 @@
#include <AGL/agl.h> #include <AGL/agl.h>
#elif defined(__UNIX__) #elif defined(__UNIX__)
#include <GL/gl.h>
#include <GL/glx.h> #include <GL/glx.h>
#endif #endif

3
src/graphs/graph.cpp
View File

@ -890,7 +890,8 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
did_draw=true; did_draw=true;
//} //}
m_foobar_moved=0; m_foobar_moved=0;
} } else m_mouseLDown=false;
} }

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long _MAJOR = 0; static const long _MAJOR = 0;
static const long _MINOR = 7; static const long _MINOR = 7;
static const long _BUILD = 6156; static const long _BUILD = 6158;
static const long _REVISION = 16917; static const long _REVISION = 16927;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long _BUILDS_COUNT = 6909; static const long _BUILDS_COUNT = 6918;
#define _RC_FILEVERSION 0,7,6156,16917 #define _RC_FILEVERSION 0,7,6158,16927
#define _RC_FILEVERSION_STRING "0, 7, 6156, 16917\0" #define _RC_FILEVERSION_STRING "0, 7, 6158, 16927\0"
static const char _FULLVERSION_STRING[] = "0.7.6156.16917"; static const char _FULLVERSION_STRING[] = "0.7.6158.16927";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long _BUILD_HISTORY = 0; static const long _BUILD_HISTORY = 0;