From ba7dc8c5fb5decc089a44a00e91c9a0e2563005d Mon Sep 17 00:00:00 2001 From: Mark Watkins <jedimark@users.sourceforge.net> Date: Sun, 12 Jun 2011 21:37:41 +1000 Subject: [PATCH] CodeBlocks build tweaks --- Projects/CodeBlocks/SleepyHead.cbp | 2 ++ Projects/CodeBlocks/SleepyHead.depend | 2 +- Projects/CodeBlocks/SleepyHead.layout | 12 ++++++------ src/version.h | 12 ++++++------ 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.cbp b/Projects/CodeBlocks/SleepyHead.cbp index ae5537c8..8f2808c1 100644 --- a/Projects/CodeBlocks/SleepyHead.cbp +++ b/Projects/CodeBlocks/SleepyHead.cbp @@ -105,6 +105,8 @@ <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> diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 4649ba58..f47e8db1 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8307,7 +8307,7 @@ <sleeplib/machine.h> <list> -1307876090 /home/mark/projects/git/sleepyhead/src/version.h +1307878622 /home/mark/projects/git/sleepyhead/src/version.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout index 1f8cebd2..0351e873 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="Mac" /> - <File name="../../src/GUIFrame.cpp" open="1" top="1" tabpos="11"> - <Cursor position="287" topLine="0" /> + <ActiveTarget name="Debug" /> + <File name="../../src/GUIFrame.cpp" open="1" top="0" tabpos="11"> + <Cursor position="1318" topLine="9" /> </File> <File name="../../src/GUIFrame.h" open="0" top="0" tabpos="9"> <Cursor position="3128" topLine="50" /> @@ -19,11 +19,11 @@ <File name="../../src/graphs/freesans.c" open="1" top="0" tabpos="10"> <Cursor position="0" topLine="0" /> </File> - <File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="7"> - <Cursor position="7841" topLine="271" /> + <File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="7"> + <Cursor position="55196" topLine="2003" /> </File> <File name="../../src/graphs/graph.h" open="1" top="0" tabpos="8"> - <Cursor position="7607" topLine="208" /> + <Cursor position="14685" topLine="387" /> </File> <File name="../../src/libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11"> <Cursor position="7148" topLine="269" /> diff --git a/src/version.h b/src/version.h index b62c3fe5..2c414541 100644 --- a/src/version.h +++ b/src/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 5213; - static const long REVISION = 11763; + static const long BUILD = 5214; + static const long REVISION = 11765; //Miscellaneous Version Types - static const long BUILDS_COUNT = 4911; - #define RC_FILEVERSION 0,7,5213,11763 - #define RC_FILEVERSION_STRING "0, 7, 5213, 11763\0" - static const char FULLVERSION_STRING[] = "0.7.5213.11763"; + static const long BUILDS_COUNT = 4917; + #define RC_FILEVERSION 0,7,5214,11765 + #define RC_FILEVERSION_STRING "0, 7, 5214, 11765\0" + static const char FULLVERSION_STRING[] = "0.7.5214.11765"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;