chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-17 11:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Typo doing that pbuffer thing

Browse Source
This commit is contained in:
Mark Watkins 2011-06-18 20:22:50 +10:00
parent d4830dfc49
commit 475b725af2
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8310,7 +8310,7 @@
1308026543 D 1308026543 D
1308391347 /home/mark/projects/git/sleepyhead/src/version.h 1308392510 /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>
@ -8363,7 +8363,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1308388351 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1308392525 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"
@ -11075,7 +11075,7 @@
<wx/bitmap.h> <wx/bitmap.h>
<wx/glcanvas.h> <wx/glcanvas.h>
1308383636 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp 1308392505 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp
"gl_pbuffer.h" "gl_pbuffer.h"
<OpenGL/glu.h> <OpenGL/glu.h>
<GL/glu.h> <GL/glu.h>

4
Projects/CodeBlocks/SleepyHead.layout
View File

@ -19,13 +19,13 @@
<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="2"> <File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="2">
<Cursor position="2035" topLine="47" /> <Cursor position="2035" topLine="47" />
</File> </File>
<File name="../../src/graphs/gl_pbuffer.cpp" open="1" top="0" tabpos="5"> <File name="../../src/graphs/gl_pbuffer.cpp" open="1" top="1" tabpos="5">
<Cursor position="3" topLine="0" /> <Cursor position="3" topLine="0" />
</File> </File>
<File name="../../src/graphs/gl_pbuffer.h" open="1" top="0" tabpos="6"> <File name="../../src/graphs/gl_pbuffer.h" open="1" top="0" tabpos="6">
<Cursor position="401" topLine="0" /> <Cursor position="401" topLine="0" />
</File> </File>
<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="3"> <File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="3">
<Cursor position="2743" topLine="83" /> <Cursor position="2743" topLine="83" />
</File> </File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="4"> <File name="../../src/graphs/graph.h" open="1" top="0" tabpos="4">

2
src/graphs/gl_pbuffer.cpp
View File

@ -453,7 +453,7 @@ pBufferGLX::pBufferGLX(int width, int height,wxGLContext * gc)
} }
#if !wxCHECK_VERSION(2,9,0) #if !wxCHECK_VERSION(2,9,0)
XFree(fbc); //XFree(fbc);
#endif #endif
glXMakeCurrent(display,hBuffer,m_shared); glXMakeCurrent(display,hBuffer,m_shared);

2
src/graphs/graph.cpp
View File

@ -1024,7 +1024,7 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
throw GLException(wxT("Macintrash")); throw GLException(wxT("Macintrash"));
//pbuffer=new pBufferAGL(width,height); //pbuffer=new pBufferAGL(width,height);
#elif defined(__UNIX__) #elif defined(__UNIX__)
throw GLException(wxT("Linux pBuffer Sucks on some cards"); throw GLException(wxT("Linux pBuffer Sucks on some cards"));
//pbuffer=new pBufferGLX(res.GetWidth(),res.GetHeight(),shared_context); //pbuffer=new pBufferGLX(res.GetWidth(),res.GetHeight(),shared_context);
#endif #endif

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 = 6747; static const long _BUILD = 6748;
static const long _REVISION = 20084; static const long _REVISION = 20090;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long _BUILDS_COUNT = 8337; static const long _BUILDS_COUNT = 8340;
#define _RC_FILEVERSION 0,7,6747,20084 #define _RC_FILEVERSION 0,7,6748,20090
#define _RC_FILEVERSION_STRING "0, 7, 6747, 20084\0" #define _RC_FILEVERSION_STRING "0, 7, 6748, 20090\0"
static const char _FULLVERSION_STRING[] = "0.7.6747.20084"; static const char _FULLVERSION_STRING[] = "0.7.6748.20090";
//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;