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

Linux wx2.8 & wx2.9 builds fixed

Browse Source
This commit is contained in:
Mark Watkins 2011-06-14 09:20:53 +10:00
parent 1237cf24e5
commit cb2ab33991
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1308005853 /home/mark/projects/git/sleepyhead/src/version.h 1308007178 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8344,10 +8344,10 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1308003040 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1308007178 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<OpenGL/gl.h> <OpenGL/gl.h>
<AGL/agl.h> <AGL/agl.h>
<GL/glew.h> <GL/wglew.h>
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/graphics.h> <wx/graphics.h>

19
src/graphs/graph.cpp
View File

@ -912,15 +912,28 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
#if wxCHECK_VERSION(2,9,0) #if wxCHECK_VERSION(2,9,0)
display=wxGetX11Display(); display=wxGetX11Display();
fbc = GetGLXFBConfig(); fbc = GetGLXFBConfig();
fbc=&fbc[0];
#else #else
display=(Display *)wxGetDisplay(); display=(Display *)wxGetDisplay();
int FBAttribs[] = {
GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT,
GLX_RENDER_TYPE, GLX_RGBA_BIT,
GLX_DOUBLEBUFFER, True,
GLX_RED_SIZE, 8,
GLX_GREEN_SIZE, 8,
GLX_BLUE_SIZE, 8,
None
};
fbc = glXChooseFBConfig(display, DefaultScreen(display), FBAttribs, &ret);
// TODO: // TODO:
// have to setup a GLXFBConfig structure for wx2.8 because wx2.8 is crap. // have to setup a GLXFBConfig structure for wx2.8 because wx2.8 is crap.
// already done this crap but deleted it.. arggghh..... // already done this crap but deleted it.. arggghh.....
return &wxNullBitmap; //return &wxNullBitmap;
#endif #endif
GLXPbuffer pBuffer=glXCreatePbuffer(display, *fbc, attrib );
GLXPbuffer pBuffer=glXCreatePbuffer(display, fbc[0], attrib );
if (pBuffer == 0) { if (pBuffer == 0) {
wxLogError(wxT("pBuffer not availble")); wxLogError(wxT("pBuffer not availble"));
} }
@ -933,7 +946,7 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
if (!cx && real_shared_context) cx=real_shared_context; // Only available after redraw.. :( if (!cx && real_shared_context) cx=real_shared_context; // Only available after redraw.. :(
else { else {
// First render screws up unless we do this.. // First render screws up unless we do this..
gx=cx = glXCreateNewContext(display,fbc[0],GLX_RGBA_TYPE, NULL, True); gx=cx = glXCreateNewContext(display,*fbc,GLX_RGBA_TYPE, NULL, True);
} }
//real_shared_context = //real_shared_context =

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 = 5599; static const long BUILD = 5609;
static const long REVISION = 13895; static const long REVISION = 13956;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 5761; static const long BUILDS_COUNT = 5788;
#define RC_FILEVERSION 0,7,5599,13895 #define RC_FILEVERSION 0,7,5609,13956
#define RC_FILEVERSION_STRING "0, 7, 5599, 13895\0" #define RC_FILEVERSION_STRING "0, 7, 5609, 13956\0"
static const char FULLVERSION_STRING[] = "0.7.5599.13895"; static const char FULLVERSION_STRING[] = "0.7.5609.13956";
//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;