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

More build fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-06-14 08:58:10 +10:00
parent 5a33f01016
commit 1237cf24e5
7 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8300,13 +8300,13 @@
<map> <map>
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1307993148 /home/mark/projects/git/sleepyhead/src/graphs/graph.h 1308004574 /home/mark/projects/git/sleepyhead/src/graphs/graph.h
<wx/dcgraph.h> <wx/dcgraph.h>
<wx/glcanvas.h> <wx/glcanvas.h>
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1308000649 /home/mark/projects/git/sleepyhead/src/version.h 1308005853 /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,10 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307996365 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1308003040 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<OpenGL/gl.h>
<AGL/agl.h>
<GL/glew.h>
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/graphics.h> <wx/graphics.h>
@ -8352,8 +8355,6 @@
<wx/image.h> <wx/image.h>
<wx/log.h> <wx/log.h>
<math.h> <math.h>
<OpenGL/gl.h>
<AGL/agl.h>
"sleeplib/profiles.h" "sleeplib/profiles.h"
"freesans.c" "freesans.c"
"graph.h" "graph.h"
@ -10930,9 +10931,11 @@
"text-markup.h" "text-markup.h"
"vertex-buffer.h" "vertex-buffer.h"
1308000449 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.h 1308003215 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.h
<Glut/glut.h> <Glut/glut.h>
<GL/glu.h>
<GL/gl.h> <GL/gl.h>
<GL/glext.h>
"freetype-gl/vector.h" "freetype-gl/vector.h"
1307960497 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.c 1307960497 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.c
@ -11022,12 +11025,13 @@
<math.h> <math.h>
"texture-font.h" "texture-font.h"
1308000410 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.cpp 1308003216 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.cpp
<Glut/glut.h> <Glut/glut.h>
<GL/glu.h>
<GL/gl.h> <GL/gl.h>
"texture-glyph.h" "texture-glyph.h"
1308000067 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp 1308002517 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp
<assert.h> <assert.h>
<string.h> <string.h>
<stdlib.h> <stdlib.h>

19
src/graphs/graph.cpp
View File

@ -5,6 +5,13 @@ Author: Mark Watkins <jedimark64@users.sourceforge.net>
License: LGPL License: LGPL
*/ */
#ifdef __DARWIN__
#include <OpenGL/gl.h>
#include <AGL/agl.h>
#elif defined(__WXMSW__)
#include <GL/wglew.h>
#endif
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/dcbuffer.h> #include <wx/dcbuffer.h>
#include <wx/graphics.h> #include <wx/graphics.h>
@ -14,10 +21,6 @@ License: LGPL
#include <math.h> #include <math.h>
#ifdef __DARWIN__
#include <OpenGL/gl.h>
#include <AGL/agl.h>
#endif
#include "sleeplib/profiles.h" #include "sleeplib/profiles.h"
@ -811,7 +814,7 @@ void gGraphWindow::SetMargins(float top, float right, float bottom, float left)
m_marginRight=right; m_marginRight=right;
} }
#if defined (__UNIX__) #if !defined(__WXMAC__) && defined (__UNIX__)
GLXContext real_shared_context=0; GLXContext real_shared_context=0;
#endif #endif
@ -891,7 +894,7 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
// WGL pBuffer Implementation // WGL pBuffer Implementation
return &wxNullBitmap; return &wxNullBitmap;
#elif defined(__DARWIN__) #elif defined(__WXMAC__) || defined(__WXDARWIN__)
return &wxNullBitmap; return &wxNullBitmap;
#elif defined(__UNIX__) #elif defined(__UNIX__)
@ -970,7 +973,7 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
wxBitmap *bmp=new wxBitmap(image); wxBitmap *bmp=new wxBitmap(image);
glFlush(); glFlush();
#if defined(__UNIX__) #if !defined(__WXMAC__) && defined (__UNIX__)
if (gx) glXDestroyContext(display,gx); if (gx) glXDestroyContext(display,gx);
glXDestroyPbuffer(display, pBuffer); glXDestroyPbuffer(display, pBuffer);
#endif #endif
@ -1031,7 +1034,7 @@ void gGraphWindow::OnPaint(wxPaintEvent& event)
//#endif //#endif
#if defined(__UNIX__) #if !defined(__WXMAC__) && defined (__UNIX__)
real_shared_context = glXGetCurrentContext(); real_shared_context = glXGetCurrentContext();
#endif #endif

1
src/graphs/graph.h
View File

@ -7,6 +7,7 @@ License: LGPL
#ifndef GRAPH_H #ifndef GRAPH_H
#define GRAPH_H #define GRAPH_H
#include <wx/dcgraph.h> #include <wx/dcgraph.h>
#include <wx/glcanvas.h> #include <wx/glcanvas.h>
//#include <FTGL/ftgl.h> //#include <FTGL/ftgl.h>

4
src/libs/freetype-gl/texture-glyph.cpp
View File

@ -22,7 +22,9 @@
* ========================================================================= */ * ========================================================================= */
#if defined(__APPLE__) #if defined(__APPLE__)
#include <Glut/glut.h> #include <Glut/glut.h>
#else #elif defined(__WXMSW__)
#include <GL/glu.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif
//#include <assert.h> //#include <assert.h>

3
src/libs/freetype-gl/vertex-buffer.cpp
View File

@ -25,8 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "vertex-buffer.h" #include "vertex-buffer.h"
//#include <GL/gl.h>
//#include <GL/glext.h>

10
src/libs/freetype-gl/vertex-buffer.h
View File

@ -25,12 +25,20 @@
#ifndef __VERTEX_BUFFER_H__ #ifndef __VERTEX_BUFFER_H__
#define __VERTEX_BUFFER_H__ #define __VERTEX_BUFFER_H__
#define GL_GLEXT_PROTOTYPES 1
#if defined(__APPLE__) #if defined(__APPLE__)
#include <Glut/glut.h> #include <Glut/glut.h>
#elif defined(__WXMSW__)
#include <GL/glu.h>
#else #else
#define GL_GLEXT_PROTOTYPES 1
//#include <GL/glut.h>
//#include <GL/gl.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h>
#endif #endif
#include "freetype-gl/vector.h" // grrr.. nasty c programmers.. go learn a real OOPL. #include "freetype-gl/vector.h" // grrr.. nasty c programmers.. go learn a real OOPL.

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