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

Fix for wx28 Linux build

Browse Source
This commit is contained in:
Mark Watkins 2011-06-14 05:50:51 +10:00
parent d1c0a99683
commit 1360d9a595
4 changed files with 18 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

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307993659 /home/mark/projects/git/sleepyhead/src/version.h 1307994509 /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,7 +8344,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307993659 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307994526 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/graphics.h> <wx/graphics.h>
@ -11010,7 +11010,7 @@
<wchar.h> <wchar.h>
"font-manager.h" "font-manager.h"
1307973382 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.cpp 1307994477 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.cpp
<assert.h> <assert.h>
<stdlib.h> <stdlib.h>
<string.h> <string.h>

11
src/graphs/graph.cpp
View File

@ -826,9 +826,14 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
}; };
int ret; int ret;
Display *display=NULL;
Display *display=wxGetX11Display(); GLXFBConfig *fbc=NULL;
GLXFBConfig *fbc = GetGLXFBConfig(); #if wxCHECK_VERSION(2,9,0)
display=wxGetX11Display();
fbc = GetGLXFBConfig();
#else
return &wxNullBitmap;
#endif
GLXPbuffer pBuffer=glXCreatePbuffer(display, fbc[0], attrib ); GLXPbuffer pBuffer=glXCreatePbuffer(display, fbc[0], attrib );
if (pBuffer == 0) { if (pBuffer == 0) {

2
src/libs/freetype-gl/text-markup.cpp
View File

@ -32,7 +32,7 @@ TextMarkup::TextMarkup()
wxColor white(255,255,255,255); wxColor white(255,255,255,255);
family = wxString("monotype"); family = wxT("monotype");
italic = 0; italic = 0;
bold = 0; bold = 0;
size = 16; size = 16;

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 = 5544; static const long BUILD = 5549;
static const long REVISION = 13556; static const long REVISION = 13587;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 5634; static const long BUILDS_COUNT = 5647;
#define RC_FILEVERSION 0,7,5544,13556 #define RC_FILEVERSION 0,7,5549,13587
#define RC_FILEVERSION_STRING "0, 7, 5544, 13556\0" #define RC_FILEVERSION_STRING "0, 7, 5549, 13587\0"
static const char FULLVERSION_STRING[] = "0.7.5544.13556"; static const char FULLVERSION_STRING[] = "0.7.5549.13587";
//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;