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

Codeblocks build system cleanup

Browse Source
This commit is contained in:
Mark Watkins 2011-06-15 05:46:07 +10:00
parent 0254fb199d
commit ef14109af1
6 changed files with 155 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Projects/CodeBlocks/SleepyHead.cbp
View File

@ -14,9 +14,29 @@
<Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-g" />
<Add option="`wx-config --version=2.8 --cflags`" />
<Add directory="../../src/libs" />
<Add directory="../../src" />
</Compiler>
<Linker>
<Add option="`wx-config --version=2.8 --libs gl,aui,xrc,qa,html,adv,core,net,base`" />
</Linker>
</Target>
<Target title="Debug-wx29">
<Option output="bin/Debug-wx29/SleepyHead" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug-wx29/" />
<Option type="0" />
<Option compiler="gcc" />
<Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-g" />
<Add option="`wx-config --version=2.9 --cflags`" />
<Add directory="../../src/libs" />
<Add directory="../../src" />
</Compiler>
<Linker>
<Add option="`wx-config --version=2.9 --libs gl,aui,xrc,qa,html,adv,core,net,base`" />
</Linker>
</Target>
<Target title="Release">
<Option output="bin/Release/SleepyHead" prefix_auto="1" extension_auto="1" />
@ -27,11 +47,14 @@
<Compiler>
<Add option="-O2" />
<Add option="-pg" />
<Add option="`wx-config --version=2.8 --cflags`" />
<Add directory="../../src/libs" />
<Add directory="../../src" />
</Compiler>
<Linker>
<Add option="-s" />
<Add option="-pg" />
<Add option="`wx-config --version=2.8 --libs gl,aui,xrc,qa,html,adv,core,net,base`" />
</Linker>
</Target>
<Target title="Windows">
@ -47,7 +70,6 @@
<Add option="-O2" />
<Add option="-I/usr/include/freetype2" />
<Add option="`i686-pc-mingw32-wx-config --version=2.9 --cflags`" />
<Add option="-Dd" />
<Add directory="../../src/libs" />
<Add directory="../../src" />
</Compiler>
@ -60,62 +82,33 @@
<Add option="-lgdiplus" />
</Linker>
</Target>
<Target title="Debug-wx29">
<Option output="bin/Debug-wx29/SleepyHead" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug-wx29/" />
<Option type="0" />
<Option compiler="gcc" />
<Option projectCompilerOptionsRelation="1" />
<Option projectLinkerOptionsRelation="1" />
<Compiler>
<Add option="-g" />
<Add option="`wx-config --version=2.9 --cflags`" />
<Add option="-I/usr/include/freetype2" />
<Add directory="../../src/libs" />
<Add directory="../../src" />
</Compiler>
<Linker>
<Add option="`wx-config --version=2.9 --libs aui,xrc,qa,html,adv,core,net,base,gl`" />
<Add option="-lftgl" />
</Linker>
</Target>
<Target title="Mac">
<Option output="bin/Mac/SleepyHead" prefix_auto="1" extension_auto="1" />
<Option working_dir="bin/Mac/" />
<Option object_output="obj/Mac/" />
<Option type="0" />
<Option compiler="gcc" />
<Option projectCompilerOptionsRelation="1" />
<Option projectLinkerOptionsRelation="1" />
<Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-g" />
<Add option="-I/opt/local/include/freetype2" />
<Add option="-I/usr/include/freetype2" />
<Add option="-I/usr/local/include/freetype2" />
<Add option="`wx-config --version=2.9 --cflags`" />
<Add directory="../../src/libs" />
<Add directory="../../src" />
</Compiler>
<Linker>
<Add option="-ftgl" />
<Add option="-mwindows;" />
<Add option="$(shell $(WX_TOOL) --debug=yes --libs --unicode=yes)" />
<Add option="-m32" />
<Add option="-lfreetype" />
<Add option="`wx-config --version=2.9 --libs gl,aui,xrc,qa,html,adv,core,net,base`" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="`wx-config --version=2.8 --cflags`" />
<Add option="-I/usr/include/freetype2" />
<Add option="-I/opt/local/include/freetype2" />
<Add option="-I/opt/local/include" />
<Add directory="../../src/libs" />
<Add directory="../../src" />
</Compiler>
<Linker>
<Add option="`wx-config --version=2.8 --libs aui,xrc,qa,html,adv,core,net,base,gl`" />
<Add option="-lftgl" />
</Linker>
<Unit filename="../../src/GUIFrame.cpp" />
<Unit filename="../../src/GUIFrame.h" />
<Unit filename="../../src/SleepyHeadApp.cpp" />

13
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8240,7 +8240,7 @@
<wx/datectrl.h>
<wx/dateevt.h>
1308031885 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp
1308079880 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp
"wx_pch.h"
<iostream>
<wx/log.h>
@ -8312,7 +8312,7 @@
1308026543 D
1308044876 /home/mark/projects/git/sleepyhead/src/version.h
1308080044 /home/mark/projects/git/sleepyhead/src/version.h
1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed
<wx/dcbuffer.h>
@ -8364,7 +8364,7 @@
"sleeplib/profiles.h"
"sleeplib/machine_loader.h"
1308044596 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
1308073105 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/dcbuffer.h>
<wx/settings.h>
<wx/graphics.h>
@ -10870,7 +10870,7 @@
"wx/msw/wrapwin.h"
<GL/gl.h>
1308041947 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stdpaths.h
1308044093 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/stdpaths.h
"wx/defs.h"
"wx/string.h"
"wx/filefn.h"
@ -10880,7 +10880,7 @@
"wx/unix/stdpaths.h"
"wx/palmos/stdpaths.h"
1308041948 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/stdpaths.h
1308044094 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/msw/stdpaths.h
1308044096 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.9/wx/aboutdlg.h
"wx/defs.h"
@ -11043,10 +11043,9 @@
<math.h>
"texture-font.h"
1308009682 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.cpp
1308044876 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.cpp
<Glut/glut.h>
<GL/glew.h>
<GL/gl.h>
"texture-glyph.h"
1308032101 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp

30
Projects/CodeBlocks/SleepyHead.layout
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Windows" />
<File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="11">
<Cursor position="1318" topLine="9" />
<ActiveTarget name="Mac" />
<File name="../../src/GUIFrame.cpp" open="1" top="1" tabpos="21">
<Cursor position="287" topLine="0" />
</File>
<File name="../../src/GUIFrame.h" open="0" top="0" tabpos="9">
<Cursor position="3128" topLine="50" />
</File>
<File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1">
<Cursor position="1743" topLine="43" />
<Cursor position="603" topLine="0" />
</File>
<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2">
<Cursor position="8658" topLine="272" />
@ -20,10 +20,10 @@
<Cursor position="0" topLine="0" />
</File>
<File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="7">
<Cursor position="324" topLine="0" />
<Cursor position="23140" topLine="830" />
</File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="8">
<Cursor position="12163" topLine="323" />
<Cursor position="507" topLine="0" />
</File>
<File name="../../src/libs/freetype-gl/font-manager.cpp" open="1" top="0" tabpos="9">
<Cursor position="0" topLine="0" />
@ -35,31 +35,31 @@
<Cursor position="3243" topLine="80" />
</File>
<File name="../../src/libs/freetype-gl/texture-atlas.h" open="1" top="0" tabpos="13">
<Cursor position="1629" topLine="21" />
<Cursor position="1661" topLine="21" />
</File>
<File name="../../src/libs/freetype-gl/texture-font.cpp" open="1" top="0" tabpos="11">
<Cursor position="482" topLine="0" />
<Cursor position="1196" topLine="0" />
</File>
<File name="../../src/libs/freetype-gl/texture-font.h" open="1" top="0" tabpos="12">
<Cursor position="0" topLine="9" />
<Cursor position="1280" topLine="9" />
</File>
<File name="../../src/libs/freetype-gl/texture-glyph.cpp" open="1" top="0" tabpos="15">
<Cursor position="1328" topLine="0" />
<Cursor position="1342" topLine="0" />
</File>
<File name="../../src/libs/freetype-gl/texture-glyph.h" open="1" top="0" tabpos="16">
<Cursor position="0" topLine="19" />
<Cursor position="1204" topLine="1" />
</File>
<File name="../../src/libs/freetype-gl/vector.cpp" open="1" top="0" tabpos="19">
<Cursor position="0" topLine="0" />
<Cursor position="1127" topLine="0" />
</File>
<File name="../../src/libs/freetype-gl/vector.h" open="0" top="0" tabpos="14">
<File name="../../src/libs/freetype-gl/vector.h" open="1" top="0" tabpos="20">
<Cursor position="0" topLine="0" />
</File>
<File name="../../src/libs/freetype-gl/vertex-buffer.cpp" open="1" top="0" tabpos="17">
<Cursor position="653" topLine="0" />
</File>
<File name="../../src/libs/freetype-gl/vertex-buffer.h" open="1" top="1" tabpos="18">
<Cursor position="1412" topLine="12" />
<File name="../../src/libs/freetype-gl/vertex-buffer.h" open="1" top="0" tabpos="18">
<Cursor position="1412" topLine="40" />
</File>
<File name="../../src/libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11">
<Cursor position="7148" topLine="269" />

2
src/SleepyHeadApp.cpp
View File

@ -6,7 +6,7 @@
* Copyright: Mark Watkins (http://sourceforge.net/projects/sleepyhead/)
* License: GPL
**************************************************************/
#ifdef WX_PRECOMP
#include "wx_pch.h"
#endif

152
src/graphs/graph.cpp
View File

@ -133,7 +133,7 @@ void DrawText2(wxString text, float x, float y,TextureFont *font)
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
glEnable( GL_TEXTURE_2D );
glColor4f(1,1,1,1);
vbuffer->Render(GL_TRIANGLES, (char *)"vtc" );
// vbuffer->Render(GL_TRIANGLES, (char *)"vtc" );
glDisable(GL_BLEND);
}
@ -806,80 +806,121 @@ void gGraphWindow::SetMargins(float top, float right, float bottom, float left)
#if !defined(__WXMAC__) && defined (__UNIX__)
GLXContext real_shared_context=0;
#endif
wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
{
//pBuffers are evil.. but I need to use them here.
#if defined(__WXMSW__)
/*#define MAX_ATTRIBS 8
HDC hDC = wglGetCurrentDC();
// Get ready to query for a suitable pixel format that meets our minimum requirements.
int mv=MAX(width,height);
// convert to nearest binary power of two.
int iAttributes[2*MAX_ATTRIBS];
float fAttributes[2*MAX_ATTRIBS];
int nfAttribs = 0;
int niAttribs = 0;
// Attribute arrays must be "0" terminated - for simplicity, first
int pbwidth=1024;
int pbheight=pbwidth; // Windows sucks ass.
// just zero-out the array then fill from left to right.
unsigned int texture=0;
for (i=0; i<2*MAX_ATTRIBS; i++ ){
iAttributes[i] = 0;
fAttributes[i] = 0;
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexImage2D(GL_TEXTURE_2D, 0, 4, pbwidth, pbheight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
HDC saveHdc = wglGetCurrentDC();
HGLRC saveHglrc = wglGetCurrentContext();
wxLogError(wxT("Foo1"));
int pixelFormats;
int intAttrs[32] ={
WGL_RED_BITS_ARB,8,
WGL_GREEN_BITS_ARB,8,
WGL_BLUE_BITS_ARB,8,
WGL_ALPHA_BITS_ARB,8,
WGL_DRAW_TO_PBUFFER_ARB, GL_TRUE,
WGL_BIND_TO_TEXTURE_RGBA_ARB, GL_TRUE,
WGL_SUPPORT_OPENGL_ARB,GL_TRUE,
WGL_ACCELERATION_ARB,WGL_FULL_ACCELERATION_ARB,
WGL_DOUBLE_BUFFER_ARB,GL_FALSE,
0
}; // 0 terminate the list
unsigned int numFormats = 0;
wxLogError(wxT("Foo2"));
if (!wglChoosePixelFormatARB( saveHdc, intAttrs, NULL, 1, &pixelFormats, &numFormats)) {
wxLogError(wxT("WGL: pbuffer creation error: Couldn't find a suitable pixel format.\n"));
return &wxNullBitmap;
}
// Since we are trying to create a pbuffer, the pixel format we
wxLogError(wxT("Foo3"));
if (numFormats==0) {
return &wxNullBitmap;
}
wxLogError(wxT("Foo3"));
//request (and subsequently use) must be "p-buffer capable".
const int attributes[]= {
WGL_TEXTURE_FORMAT_ARB,
WGL_TEXTURE_RGBA_ARB, // p-buffer will have RBA texture format
WGL_TEXTURE_TARGET_ARB,
WGL_TEXTURE_2D_ARB,
0
}; // Of texture target will be GL_TEXTURE_2D
iAttributes[2*niAttribs]=WGL_DRAW_TO_PBUFFER_ARB;
iAttributes[2*niAttribs+1]=true;
niAttribs++;
// We require a minimum of 24-bit depth.
//wglCreatePbufferARB(hDC, pixelFormats, pbwidth, pbheight, attributes);
HPBUFFERARB hBuffer=wglCreatePbufferARB(saveHdc, pixelFormats, pbwidth, pbheight, attributes );
wxLogError(wxT("Foo4"));
iAttributes[2*niAttribs ]=WGL_DEPTH_BITS_ARB;
iAttributes[2*niAttribs+1]=24;
niAttribs++;
// We require a minimum of 8-bits for each R, G, B, and A.
HDC hdc=wglGetPbufferDCARB( hBuffer );
wxLogError(wxT("Foo5"));
iAttributes[2*niAttribs]=WGL_RED_BITS_ARB;
iAttributes[2*niAttribs+1]=8;
niAttribs++;
iAttributes[2*niAttribs]=WGL_GREEN_BITS_ARB;
iAttributes[2*niAttribs+1]=8;
niAttribs++;
iAttributes[2*niAttribs]=WGL_BLUE_BITS_ARB;
iAttributes[2*niAttribs+1]=8;
niAttribs++;
iAttributes[2*niAttribs]=WGL_ALPHA_BITS_ARB;
iAttributes[2*niAttribs+1]=8;
niAttribs++;
// Now obtain a list of pixel formats that meet these minimum requirements.
HGLRC hGlRc=wglCreateContext(hdc);
wxLogError(wxT("Foo6"));
int pformat;
unsigned int nformats;
if(!wglChoosePixelFormatARB( hDC, iAttributes, fAttributes, 1, &pformat, &nformats)){
printf("pbuffer creation error: Couldn't find a suitable pixel format.\n" );
return false;
}
for (i=0; i<2*MAX_ATTRIBS; i++ )iAttributes[i] = 0;
//printf("PBuffer size: %d x %d\n",w,h);
int w,h;
wglQueryPbufferARB(hBuffer, WGL_PBUFFER_WIDTH_ARB, &w);
wglQueryPbufferARB(hBuffer, WGL_PBUFFER_HEIGHT_ARB, &h);
wxLogError(wxT("Foo7"));
HPBUFFERARB g_hPBuffer=wglCreatePbufferARB( hDC, pformat, PBUFFERSIZE, PBUFFERSIZE, iAttributes );
g_hPBufDC=wglGetPbufferDCARB( g_hPBuffer );
wglMakeCurrent(hdc,hGlRc);
int w,h;
wglQueryPbufferARB( g_hPBuffer, WGL_PBUFFER_WIDTH_ARB, &w );
wglQueryPbufferARB( g_hPBuffer, WGL_PBUFFER_HEIGHT_ARB, &h );
printf("PBuffer size: %d x %d\n",w,h);
glEnable(GL_TEXTURE_2D); // Enable Texture Mapping
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); // enable transparency
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glOrtho(0, width, height, 0, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glClearColor(0,0,0,1);
glClear(GL_COLOR_BUFFER_BIT);
// switch back to the screen context
wglMakeCurrent(saveHdc, saveHglrc);
// So we can share the main context
wglShareLists(saveHglrc, hGlRc);
// Jump back to pBuffer for rendering
wglMakeCurrent(hdc, hGlRc);
g_hPBufRC=wglCreateContext(g_hPBufDC);
*/
// WGL pBuffer Implementation
return &wxNullBitmap;
//return &wxNullBitmap;
#elif defined(__WXMAC__) || defined(__WXDARWIN__)
return &wxNullBitmap;
@ -970,7 +1011,12 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
wxBitmap *bmp=new wxBitmap(image);
glFlush();
#if !defined(__WXMAC__) && defined (__UNIX__)
#if defined(__WXMSW__)
wglDeleteContext(hGlRc);
wglReleasePbufferDCARB(hBuffer, hdc);
wglDestroyPbufferARB(hBuffer);
#elif !defined(__WXMAC__) && defined (__UNIX__)
if (gx) glXDestroyContext(display,gx);
glXDestroyPbuffer(display, pBuffer);
#endif

14
src/version.h
View File

@ -4,7 +4,7 @@
namespace AutoVersion{
//Date Version Types
static const char _DATE[] = "14";
static const char _DATE[] = "15";
static const char _MONTH[] = "06";
static const char _YEAR[] = "2011";
static const char _UBUNTU_VERSION_STYLE[] = "11.06";
@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long _MAJOR = 0;
static const long _MINOR = 7;
static const long _BUILD = 5717;
static const long _REVISION = 14559;
static const long _BUILD = 5740;
static const long _REVISION = 14700;
//Miscellaneous Version Types
static const long _BUILDS_COUNT = 6004;
#define _RC_FILEVERSION 0,7,5717,14559
#define _RC_FILEVERSION_STRING "0, 7, 5717, 14559\0"
static const char _FULLVERSION_STRING[] = "0.7.5717.14559";
static const long _BUILDS_COUNT = 6058;
#define _RC_FILEVERSION 0,7,5740,14700
#define _RC_FILEVERSION_STRING "0, 7, 5740, 14700\0"
static const char _FULLVERSION_STRING[] = "0.7.5740.14700";
//These values are to keep track of your versioning state, don't modify them.
static const long _BUILD_HISTORY = 0;