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

Disabled pBuffers on Linux.. Using FBO instead

Browse Source
This commit is contained in:
Mark Watkins 2011-06-18 20:04:08 +10:00
parent ab65299928
commit d4830dfc49
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8310,7 +8310,7 @@
1308026543 D 1308026543 D
1308391090 /home/mark/projects/git/sleepyhead/src/version.h 1308391347 /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>

6
Projects/CodeBlocks/SleepyHead.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Windows" /> <ActiveTarget name="Debug" />
<File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="9"> <File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="9">
<Cursor position="6211" topLine="144" /> <Cursor position="6211" topLine="144" />
</File> </File>
@ -10,7 +10,7 @@
<File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1"> <File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1">
<Cursor position="1078" topLine="44" /> <Cursor position="1078" topLine="44" />
</File> </File>
<File name="../../src/SleepyHeadApp.h" open="1" top="1" tabpos="0"> <File name="../../src/SleepyHeadApp.h" open="1" top="0" tabpos="0">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
</File> </File>
<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="1"> <File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="1">
@ -25,7 +25,7 @@
<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="0" tabpos="3"> <File name="../../src/graphs/graph.cpp" open="1" top="1" 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">

3
src/graphs/graph.cpp
View File

@ -1024,7 +1024,8 @@ 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__)
pbuffer=new pBufferGLX(res.GetWidth(),res.GetHeight(),shared_context); throw GLException(wxT("Linux pBuffer Sucks on some cards");
//pbuffer=new pBufferGLX(res.GetWidth(),res.GetHeight(),shared_context);
#endif #endif
} catch(GLException e) { } catch(GLException e) {

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