diff --git a/Samples/Advanced/Advanced.cpp b/Samples/Advanced/Advanced.cpp index 897a594..65c4018 100644 --- a/Samples/Advanced/Advanced.cpp +++ b/Samples/Advanced/Advanced.cpp @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Samples/Advanced/Main.cpp b/Samples/Advanced/Main.cpp index f7c5648..72c2f11 100644 --- a/Samples/Advanced/Main.cpp +++ b/Samples/Advanced/Main.cpp @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Samples/Advanced/Shared.h b/Samples/Advanced/Shared.h index 5354e04..f93f3a0 100644 --- a/Samples/Advanced/Shared.h +++ b/Samples/Advanced/Shared.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Samples/MainLoop/MainLoop.cpp b/Samples/MainLoop/MainLoop.cpp index 49c6738..cf36ad0 100644 --- a/Samples/MainLoop/MainLoop.cpp +++ b/Samples/MainLoop/MainLoop.cpp @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Samples/Simple/Simple.cpp b/Samples/Simple/Simple.cpp index 70e5dbf..d5faac7 100644 --- a/Samples/Simple/Simple.cpp +++ b/Samples/Simple/Simple.cpp @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/Shiny.h b/Shiny/include/Shiny.h index 5ecfd9e..470cbd4 100644 --- a/Shiny/include/Shiny.h +++ b/Shiny/include/Shiny.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/ShinyConfig.h b/Shiny/include/ShinyConfig.h index 0aa025a..9f51f0d 100644 --- a/Shiny/include/ShinyConfig.h +++ b/Shiny/include/ShinyConfig.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -26,15 +26,6 @@ THE SOFTWARE. #define SHINY_CONFIG_H -/*---------------------------------------------------------------------------*/ - -#define SHINY_VERSION "2.5" -#define SHINY_SHORTNAME "Shiny" -#define SHINY_FULLNAME "Shiny Profiler" -#define SHINY_COPYRIGHT "Copyright (C) 2007-2009 Aidin Abedi" -#define SHINY_DESCRIPTION "Shiny is a elegent profiler designed to help finding bottlenecks in your project." - - /*---------------------------------------------------------------------------*/ /* SHINY_IS_COMPILED is the master on or off swith at compile time. Define it to TRUE or FALSE before including header Shiny.h or inside ShinyConfig.h. Default is TRUE. @@ -79,49 +70,4 @@ THE SOFTWARE. #define SHINY_OUTPUT_MODE SHINY_OUTPUT_MODE_BOTH #endif - -/*---------------------------------------------------------------------------*/ - -#ifndef FALSE -#define FALSE 0x0 -#endif - -#ifndef TRUE -#define TRUE 0x1 -#endif - -#ifndef NULL -#define NULL 0 -#endif - - -/*---------------------------------------------------------------------------*/ - -#define SHINY_PLATFORM_WIN32 0x1 -#define SHINY_PLATFORM_POSIX 0x2 - -#if defined (_WIN32) -# define SHINY_PLATFORM SHINY_PLATFORM_WIN32 - -#else /* ASSUME: POSIX-compliant OS */ -# define SHINY_PLATFORM SHINY_PLATFORM_POSIX -#endif - - -/*---------------------------------------------------------------------------*/ - -#define SHINY_COMPILER_MSVC 0x1 -#define SHINY_COMPILER_GNUC 0x2 -#define SHINY_COMPILER_OTHER 0x3 - -#if defined (_MSC_VER) -# define SHINY_COMPILER SHINY_COMPILER_MSVC - -#elif defined (__GNUG__) -# define SHINY_COMPILER SHINY_COMPILER_GNUC - -#else -# define SHINY_COMPILER SHINY_COMPILER_OTHER -#endif - #endif /* end of include guard */ diff --git a/Shiny/include/ShinyData.h b/Shiny/include/ShinyData.h index 9d63ba0..1d40d76 100644 --- a/Shiny/include/ShinyData.h +++ b/Shiny/include/ShinyData.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/ShinyMacros.h b/Shiny/include/ShinyMacros.h index 45544e0..21b2247 100644 --- a/Shiny/include/ShinyMacros.h +++ b/Shiny/include/ShinyMacros.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/ShinyManager.h b/Shiny/include/ShinyManager.h index 9b0aaf2..a8291fe 100644 --- a/Shiny/include/ShinyManager.h +++ b/Shiny/include/ShinyManager.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/ShinyNode.h b/Shiny/include/ShinyNode.h index b1dc561..5722a20 100644 --- a/Shiny/include/ShinyNode.h +++ b/Shiny/include/ShinyNode.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/ShinyNodePool.h b/Shiny/include/ShinyNodePool.h index f77f52f..23d39a3 100644 --- a/Shiny/include/ShinyNodePool.h +++ b/Shiny/include/ShinyNodePool.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/ShinyNodeState.h b/Shiny/include/ShinyNodeState.h index 09dde3f..9032f4a 100644 --- a/Shiny/include/ShinyNodeState.h +++ b/Shiny/include/ShinyNodeState.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/ShinyOutput.h b/Shiny/include/ShinyOutput.h index 50c5587..a7b12d4 100644 --- a/Shiny/include/ShinyOutput.h +++ b/Shiny/include/ShinyOutput.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/ShinyPrereqs.h b/Shiny/include/ShinyPrereqs.h index 128b04a..b28930b 100644 --- a/Shiny/include/ShinyPrereqs.h +++ b/Shiny/include/ShinyPrereqs.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -26,6 +26,55 @@ THE SOFTWARE. #define SHINY_PREREQS_H #include "ShinyConfig.h" +#include "ShinyVersion.h" + + +/*---------------------------------------------------------------------------*/ + +#define SHINY_PLATFORM_WIN32 0x1 +#define SHINY_PLATFORM_POSIX 0x2 + +#if defined (_WIN32) +# define SHINY_PLATFORM SHINY_PLATFORM_WIN32 + +#else /* ASSUME: POSIX-compliant OS */ +# define SHINY_PLATFORM SHINY_PLATFORM_POSIX +#endif + + +/*---------------------------------------------------------------------------*/ + +#define SHINY_COMPILER_MSVC 0x1 +#define SHINY_COMPILER_GNUC 0x2 +#define SHINY_COMPILER_OTHER 0x3 + +#if defined (_MSC_VER) +# define SHINY_COMPILER SHINY_COMPILER_MSVC + +#elif defined (__GNUG__) +# define SHINY_COMPILER SHINY_COMPILER_GNUC + +#else +# define SHINY_COMPILER SHINY_COMPILER_OTHER +#endif + + +/*---------------------------------------------------------------------------*/ + +#ifndef FALSE +#define FALSE 0x0 +#endif + +#ifndef TRUE +#define TRUE 0x1 +#endif + +#ifndef NULL +#define NULL 0 +#endif + + +/*---------------------------------------------------------------------------*/ #if SHINY_COMPILER == SHINY_COMPILER_GNUC #include diff --git a/Shiny/include/ShinyTools.h b/Shiny/include/ShinyTools.h index 8718caa..abe0e09 100644 --- a/Shiny/include/ShinyTools.h +++ b/Shiny/include/ShinyTools.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/include/ShinyVersion.h b/Shiny/include/ShinyVersion.h new file mode 100644 index 0000000..1b90038 --- /dev/null +++ b/Shiny/include/ShinyVersion.h @@ -0,0 +1,37 @@ +/* +The MIT License + +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +#ifndef SHINY_VERSION_H +#define SHINY_VERSION_H + + +/*---------------------------------------------------------------------------*/ + +#define SHINY_VERSION "2.6 RC1" +#define SHINY_SHORTNAME "Shiny" +#define SHINY_FULLNAME "Shiny Profiler" +#define SHINY_COPYRIGHT "Copyright (C) 2007-2010 Aidin Abedi" +#define SHINY_DESCRIPTION "Shiny is a state of the art profiler designed to help finding bottlenecks in your project." + +#endif /* end of include guard */ diff --git a/Shiny/include/ShinyZone.h b/Shiny/include/ShinyZone.h index 3b3a757..1ece3cc 100644 --- a/Shiny/include/ShinyZone.h +++ b/Shiny/include/ShinyZone.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/scripts/Shiny.vcproj b/Shiny/scripts/Shiny.vcproj index ddc7240..469f089 100644 --- a/Shiny/scripts/Shiny.vcproj +++ b/Shiny/scripts/Shiny.vcproj @@ -229,6 +229,10 @@ RelativePath="..\include\ShinyTools.h" > + + diff --git a/Shiny/src/ShinyManager.c b/Shiny/src/ShinyManager.c index b3469e1..1c5bbdb 100644 --- a/Shiny/src/ShinyManager.c +++ b/Shiny/src/ShinyManager.c @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/src/ShinyNode.c b/Shiny/src/ShinyNode.c index 0876707..6e47057 100644 --- a/Shiny/src/ShinyNode.c +++ b/Shiny/src/ShinyNode.c @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/src/ShinyNodePool.c b/Shiny/src/ShinyNodePool.c index 6722a5b..80fca7e 100644 --- a/Shiny/src/ShinyNodePool.c +++ b/Shiny/src/ShinyNodePool.c @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/src/ShinyNodeState.c b/Shiny/src/ShinyNodeState.c index 36a1c5f..5ae82bf 100644 --- a/Shiny/src/ShinyNodeState.c +++ b/Shiny/src/ShinyNodeState.c @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/src/ShinyOutput.c b/Shiny/src/ShinyOutput.c index 47a5413..35f71a1 100644 --- a/Shiny/src/ShinyOutput.c +++ b/Shiny/src/ShinyOutput.c @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/src/ShinyTools.c b/Shiny/src/ShinyTools.c index 6dee76e..aec4bec 100644 --- a/Shiny/src/ShinyTools.c +++ b/Shiny/src/ShinyTools.c @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Shiny/src/ShinyZone.c b/Shiny/src/ShinyZone.c index 3bdb2fb..c537c27 100644 --- a/Shiny/src/ShinyZone.c +++ b/Shiny/src/ShinyZone.c @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/ShinyLua/include/ShinyLua.h b/ShinyLua/include/ShinyLua.h index 40cbaf7..3a8c58e 100644 --- a/ShinyLua/include/ShinyLua.h +++ b/ShinyLua/include/ShinyLua.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/ShinyLua/src/ShinyLua.cpp b/ShinyLua/src/ShinyLua.cpp index 77a0b03..828f039 100644 --- a/ShinyLua/src/ShinyLua.cpp +++ b/ShinyLua/src/ShinyLua.cpp @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/ShinyOgre/include/ShinyOgre.h b/ShinyOgre/include/ShinyOgre.h index 7da31d5..76c1c9a 100644 --- a/ShinyOgre/include/ShinyOgre.h +++ b/ShinyOgre/include/ShinyOgre.h @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/ShinyOgre/src/ShinyOgre.cpp b/ShinyOgre/src/ShinyOgre.cpp index 035a6ab..6ebd7b8 100644 --- a/ShinyOgre/src/ShinyOgre.cpp +++ b/ShinyOgre/src/ShinyOgre.cpp @@ -1,7 +1,7 @@ /* The MIT License -Copyright (c) 2007-2009 Aidin Abedi http://code.google.com/p/shinyprofiler/ +Copyright (c) 2007-2010 Aidin Abedi http://code.google.com/p/shinyprofiler/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal