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

CodeBlocks Mac Target

Browse Source
This commit is contained in:
Mark Watkins 2011-06-12 18:15:47 +10:00
parent 9747c9cce0
commit fd6b4dd46e
5 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Projects/CodeBlocks/SleepyHead.cbp
View File

@ -77,6 +77,26 @@
<Add option="-lftgl" /> <Add option="-lftgl" />
</Linker> </Linker>
</Target> </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" />
<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 directory="../../src/libs" />
<Add directory="../../src" />
</Compiler>
<Linker>
<Add option="-ftgl;-mwindows;$(shell $(WX_TOOL) --debug=yes --libs --unicode=yes);-m32" />
</Linker>
</Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8307,7 +8307,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307863514 /home/mark/projects/git/sleepyhead/src/version.h 1307865495 /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"
@ -8345,7 +8345,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307862895 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307865494 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>

12
Projects/CodeBlocks/SleepyHead.layout
View File

@ -2,28 +2,28 @@
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Debug" /> <ActiveTarget name="Debug" />
<File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="14"> <File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="14">
<Cursor position="1300" topLine="24" /> <Cursor position="9298" topLine="156" />
</File> </File>
<File name="../../src/GUIFrame.h" open="0" top="0" tabpos="9"> <File name="../../src/GUIFrame.h" open="0" top="0" tabpos="9">
<Cursor position="0" topLine="33" /> <Cursor position="3128" topLine="50" />
</File> </File>
<File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1"> <File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1">
<Cursor position="1042" topLine="16" /> <Cursor position="1042" topLine="16" />
</File> </File>
<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2"> <File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2">
<Cursor position="26771" topLine="721" /> <Cursor position="10959" topLine="335" />
</File> </File>
<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3"> <File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3">
<Cursor position="602" topLine="12" /> <Cursor position="2630" topLine="75" />
</File> </File>
<File name="../../src/graphs/freesans.c" open="1" top="0" tabpos="10"> <File name="../../src/graphs/freesans.c" open="1" top="0" tabpos="10">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
</File> </File>
<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="7"> <File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="7">
<Cursor position="1108" topLine="39" /> <Cursor position="7841" topLine="271" />
</File> </File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="8"> <File name="../../src/graphs/graph.h" open="1" top="0" tabpos="8">
<Cursor position="8777" topLine="0" /> <Cursor position="7607" topLine="208" />
</File> </File>
<File name="../../src/libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11"> <File name="../../src/libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11">
<Cursor position="7148" topLine="269" /> <Cursor position="7148" topLine="269" />

28
src/graphs/graph.cpp
View File

@ -2026,16 +2026,16 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
//glColor3f (col.Red(), col.Green(), col.Blue()); //glColor3f (col.Red(), col.Green(), col.Blue());
glLineWidth (0.25); glLineWidth (.25);
//glEnable(GL_LINE_SMOOTH);
//glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
glBegin (GL_LINES); //_LOOP); glBegin (GL_LINES); //_LOOP);
glEnable(GL_LINE_SMOOTH); float lx,ly;
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
double lx,ly;
bool first=true; bool first=true;
for (int i=0;i<dp;i++) { for (int i=0;i<dp;i++) {
wxPoint &p=screen[i]; wxPoint &p=screen[i];
double x=p.x; //((scrx/double(width))*p.x); float x=p.x; //((scrx/double(width))*p.x);
double y=p.y; //((scry/double(height))*p.y); float y=p.y; //((scry/double(height))*p.y);
if (first) { if (first) {
first=false; first=false;
} else { } else {
@ -2046,6 +2046,7 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
ly=y; ly=y;
} }
glEnd (); glEnd ();
//glDisable(GL_LINE_SMOOTH);
//if (dp>1) dc.DrawLines(dp,screen); // need at least two points //if (dp>1) dc.DrawLines(dp,screen); // need at least two points
@ -2089,19 +2090,21 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
//glColor3f (0.1F, 0.1F, 0.1F); //glColor4f (0.1F, 0.1F, 0.1F,0.8f);
//glColor3f (col.Red(), col.Green(), col.Blue()); //glColor3f (col.Red(), col.Green(), col.Blue());
//glLineWidth (1); //glLineWidth (1);
glLineWidth (0.25); glLineWidth (0.25);
//glEnable(GL_LINE_SMOOTH);
//glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
glBegin (GL_LINES); //_LOOP); glBegin (GL_LINES); //_LOOP);
glEnable(GL_LINE_SMOOTH); float lx,ly;
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
double lx,ly;
bool first=true; bool first=true;
for (int i=0;i<dp;i++) { for (int i=0;i<dp;i++) {
wxPoint &p=m_drawlist[i]; wxPoint &p=m_drawlist[i];
double x=p.x; //((scrx/double(width))*p.x); float x=p.x; //((scrx/double(width))*p.x);
double y=p.y; //((scry/double(height))*p.y); float y=p.y; //((scry/double(height))*p.y);
if (first) { if (first) {
first=false; first=false;
} else { } else {
@ -2112,6 +2115,7 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
ly=y; ly=y;
} }
glEnd (); glEnd ();
//glDisable(GL_LINE_SMOOTH);
} }
} }
// dc.DestroyClippingRegion(); // dc.DestroyClippingRegion();

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 = 5140; static const long BUILD = 5169;
static const long REVISION = 11387; static const long REVISION = 11532;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 4722; static const long BUILDS_COUNT = 4796;
#define RC_FILEVERSION 0,7,5140,11387 #define RC_FILEVERSION 0,7,5169,11532
#define RC_FILEVERSION_STRING "0, 7, 5140, 11387\0" #define RC_FILEVERSION_STRING "0, 7, 5169, 11532\0"
static const char FULLVERSION_STRING[] = "0.7.5140.11387"; static const char FULLVERSION_STRING[] = "0.7.5169.11532";
//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;