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

Hopefully some mac build fixes in here

Browse Source
This commit is contained in:
Mark Watkins 2011-06-12 04:28:13 +10:00
parent 9dcb224db3
commit e7f358461f
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h>
<list>
1307815721 /home/mark/projects/git/sleepyhead/src/version.h
1307816862 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h"
@ -8344,7 +8344,7 @@
"sleeplib/profiles.h"
"sleeplib/machine_loader.h"
1307815384 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
1307816469 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h>
<wx/dcbuffer.h>
<wx/graphics.h>

6
src/graphs/graph.cpp
View File

@ -240,7 +240,7 @@ END_EVENT_TABLE()
static int wx_gl_attribs[] = {WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 24, 0};
gGraphWindow::gGraphWindow()
: wxGLCanvas( NULL,wxID_ANY,NULL )
: wxGLCanvas( (wxWindow *)NULL,(wxGLContext *)NULL,wxID_ANY) //,wxDefaultPosition,wxDefaultSize,wxT("GLContext"),(int *)wx_gl_attribs,wxNullPalette)
{
}
@ -793,7 +793,11 @@ void gGraphWindow::OnPaint(wxPaintEvent& event)
//#endif
GetClientSize(&m_scrX, &m_scrY);
#if !defined(__WXMAC__)
gl_context->SetCurrent(*this); // A generic Context needs to be used.. Not one per graph window
#else
gl_context->SetCurrent();
#endif
glViewport(0, 0, m_scrX, m_scrY);
glMatrixMode(GL_PROJECTION);

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 5000;
static const long REVISION = 10593;
static const long BUILD = 5007;
static const long REVISION = 10634;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 4402;
#define RC_FILEVERSION 0,7,5000,10593
#define RC_FILEVERSION_STRING "0, 7, 5000, 10593\0"
static const char FULLVERSION_STRING[] = "0.7.5000.10593";
static const long BUILDS_COUNT = 4412;
#define RC_FILEVERSION 0,7,5007,10634
#define RC_FILEVERSION_STRING "0, 7, 5007, 10634\0"
static const char FULLVERSION_STRING[] = "0.7.5007.10634";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;