From adfbce47a954d0635a378717024dd93fea2e7e7e Mon Sep 17 00:00:00 2001 From: James Turk Date: Thu, 21 Apr 2005 19:30:19 +0000 Subject: [PATCH] made fixes for build on Ubuntu --- SConstruct | 7 +- include/audio/AudioCore.hpp | 6 +- include/photon.hpp | 64 ++++++------- include/types.hpp | 4 +- include/util/VersionInfo.hpp | 17 ++-- ndoc/Menu.txt | 172 +++++++++++++++++------------------ src/AppCore.cpp | 4 +- src/Application.cpp | 4 +- src/util/VersionInfo.cpp | 23 ++--- src/video/Color.cpp | 4 +- src/video/Pen.cpp | 4 +- src/video/VideoCore.cpp | 6 +- 12 files changed, 156 insertions(+), 159 deletions(-) diff --git a/SConstruct b/SConstruct index 2d5c868..5ebcf79 100644 --- a/SConstruct +++ b/SConstruct @@ -5,7 +5,7 @@ # James Turk (jpt2433@rit.edu) # # Version: -# $Id: SConstruct,v 1.6 2005/04/21 18:39:26 cozman Exp $ +# $Id: SConstruct,v 1.7 2005/04/21 19:30:19 cozman Exp $ import os,os.path import glob @@ -102,9 +102,8 @@ class Builder: LIBS=['photon','openal32','glfw','opengl32','glu32','physfs'], CPPFLAGS = '-Wall -pedantic -pg', LINKFLAGS='-pg') self.buildSuperHeader() - #ndoc = self.env.Command('docs/index.html', './include', - # """NaturalDocs -nag -i $SOURCES -o HTML ./docs -p ./ndoc""", - # target_factory=Dir) + ndoc = self.env.Command('docs/index.html', './include', + """NaturalDocs -nag -i $SOURCES -o HTML ./docs -p ./ndoc""") #self.env.Alias("docs",ndoc) self.env.AlwaysBuild('docs/index.html') diff --git a/include/audio/AudioCore.hpp b/include/audio/AudioCore.hpp index d2d80e6..137b487 100644 --- a/include/audio/AudioCore.hpp +++ b/include/audio/AudioCore.hpp @@ -5,13 +5,13 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: AudioCore.hpp,v 1.4 2005/03/15 18:41:27 cozman Exp $ +// $Id: AudioCore.hpp,v 1.5 2005/04/21 19:30:19 cozman Exp $ #ifndef PHOTON_AUDIO_AUDIOCORE_HPP #define PHOTON_AUDIO_AUDIOCORE_HPP -#include "al.h" -#include "alc.h" +#include "AL/al.h" +#include "AL/alc.h" #include "util/Singleton.hpp" #include "util/VersionInfo.hpp" diff --git a/include/photon.hpp b/include/photon.hpp index 1def34d..c009551 100644 --- a/include/photon.hpp +++ b/include/photon.hpp @@ -1,32 +1,32 @@ -#ifndef PHOTON_HPP -#define PHOTON_HPP - -#include "AppCore.hpp" -#include "Application.hpp" -#include "entrypoint.hpp" -#include "exceptions.hpp" -#include "Kernel.hpp" -#include "Log.hpp" -#include "LogSink.hpp" -#include "photon.hpp" -#include "ResourceManaged.hpp" -#include "ResourceManager.hpp" -#include "Task.hpp" -#include "types.hpp" -#include "audio/AudioCore.hpp" -#include "math/Circle.hpp" -#include "math/math.hpp" -#include "math/Rect.hpp" -#include "math/Vector2.hpp" -#include "util/ConfigFile.hpp" -#include "util/FileBuffer.hpp" -#include "util/RandGen.hpp" -#include "util/Singleton.hpp" -#include "util/Timer.hpp" -#include "util/VersionInfo.hpp" -#include "video/Color.hpp" -#include "video/Pen.hpp" -#include "video/VideoCore.hpp" -#include "util/filesys/filesys.hpp" - -#endif // PHOTON_HPP +#ifndef PHOTON_HPP +#define PHOTON_HPP + +#include "Kernel.hpp" +#include "AppCore.hpp" +#include "types.hpp" +#include "Application.hpp" +#include "Task.hpp" +#include "exceptions.hpp" +#include "photon.hpp" +#include "entrypoint.hpp" +#include "LogSink.hpp" +#include "Log.hpp" +#include "ResourceManaged.hpp" +#include "ResourceManager.hpp" +#include "math/math.hpp" +#include "math/Rect.hpp" +#include "math/Vector2.hpp" +#include "math/Circle.hpp" +#include "util/ConfigFile.hpp" +#include "util/VersionInfo.hpp" +#include "util/Singleton.hpp" +#include "util/RandGen.hpp" +#include "util/Timer.hpp" +#include "util/FileBuffer.hpp" +#include "audio/AudioCore.hpp" +#include "video/Pen.hpp" +#include "video/Color.hpp" +#include "video/VideoCore.hpp" +#include "util/filesys/filesys.hpp" + +#endif // PHOTON_HPP diff --git a/include/types.hpp b/include/types.hpp index 4042f9b..1d34e6a 100644 --- a/include/types.hpp +++ b/include/types.hpp @@ -5,7 +5,7 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: types.hpp,v 1.5 2005/03/15 19:13:56 cozman Exp $ +// $Id: types.hpp,v 1.6 2005/04/21 19:30:19 cozman Exp $ #ifndef PHOTON_TYPES_HPP #define PHOTON_TYPES_HPP @@ -15,7 +15,7 @@ #include #include -#include "glfw.h" //This file depends on glfw +#include "GL/glfw.h" //This file depends on glfw // Title: Basic Types diff --git a/include/util/VersionInfo.hpp b/include/util/VersionInfo.hpp index 867efd3..8d30cc7 100644 --- a/include/util/VersionInfo.hpp +++ b/include/util/VersionInfo.hpp @@ -5,7 +5,7 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: VersionInfo.hpp,v 1.5 2005/03/03 09:25:20 cozman Exp $ +// $Id: VersionInfo.hpp,v 1.6 2005/04/21 19:30:19 cozman Exp $ #ifndef PHOTON_UTIL_VERSIONINFO_HPP #define PHOTON_UTIL_VERSIONINFO_HPP @@ -20,7 +20,7 @@ namespace util // Class: VersionInfo // Class which stores version information, such as release numbers. -// Format is Major.Minor.Release [ExtraInfo]. +// Format is majorRelease.Minor.Release [ExtraInfo]. // // Operators: // - VersionInfo < VersionInfo @@ -34,14 +34,15 @@ class VersionInfo public: // Group: Variables - // Variable: major - // Major version number, should be changed when major changes take place. - unsigned int major; + // Variable: majorRelease + // major release version number, should be changed when major changes take + // place. + unsigned int majorRelease; // Variable: minor - // Minor version number, should be changed when key features are + // minor release version number, should be changed when key features are // added/removed/changed. - unsigned int minor; + unsigned int minorRelease; // Variable: patch // Patch number, should be changed upon every release that isn't @@ -62,7 +63,7 @@ public: // Initializing constructor. // // Parameters: - // maj - Major version number. + // maj - majorRelease version number. // min - Minor version number. // pat - Patch number. // ext - Extra info string. [default: ""] diff --git a/ndoc/Menu.txt b/ndoc/Menu.txt index 915e790..b72cb62 100644 --- a/ndoc/Menu.txt +++ b/ndoc/Menu.txt @@ -1,88 +1,84 @@ -Format: 1.32 - - -Title: Photon -SubTitle: Simple Open Source 2D Game API - -Footer: Documentation for photon. Copyright (C) 2004-2005 James Turk - - -# -------------------------------------------------------------------------- -# -# Cut and paste the lines below to change the order in which your files -# appear on the menu. Don't worry about adding or removing files, Natural -# Docs will take care of that. -# -# You can further organize the menu by grouping the entries. Add a -# "Group: [name] {" line to start a group, and add a "}" to end it. -# -# You can add text and web links to the menu by adding "Text: [text]" and -# "Link: [name] ([URL])" lines, respectively. -# -# The formatting and comments are auto-generated, so don't worry about -# neatness when editing the file. Natural Docs will clean it up the next -# time it is run. When working with groups, just deal with the braces and -# forget about the indentation and comments. -# -# -------------------------------------------------------------------------- - - -Group: photon:: { - - File: AppCore (AppCore.hpp) - File: Application (Application.hpp) - File: Basic Types (types.hpp) - File: Entrypoint (entrypoint.hpp) - File: Exception/Error Types (exceptions.hpp) - File: Kernel (Kernel.hpp) - File: Log (Log.hpp) - File: Logging Utilities (LogSink.hpp) - File: ResourceManaged (ResourceManaged.hpp) - File: ResourceManager (ResourceManager.hpp) - File: Task (Task.hpp) - - Group: audio:: { - - File: AudioCore (audio\AudioCore.hpp) - } # Group: audio:: - - Group: math:: { - - File: Circle (math\Circle.hpp) - File: Math Utilities (math\math.hpp) - File: Rect (math\Rect.hpp) - File: Vector2 (math\Vector2.hpp) - } # Group: math:: - - Group: util:: { - - File: ConfigFile (util\ConfigFile.hpp) - File: FileBuffer (util\FileBuffer.hpp) - File: filesys:: (util\filesys\filesys.hpp) - File: RandGen (util\RandGen.hpp) - File: Singleton (util\Singleton.hpp) - File: Timer (util\Timer.hpp) - File: VersionInfo (util\VersionInfo.hpp) - } # Group: util:: - - Group: video:: { - - File: Color (video\Color.hpp) - File: Pen (video\Pen.hpp) - File: VideoCore (video\VideoCore.hpp) - } # Group: video:: - - - } # Group: photon:: - -Group: Index { - - Index: Everything - Class Index: Classes - Constant Index: Constants - Function Index: Functions - Type Index: Types - Macro Index: Macros - Variable Index: Variables - } # Group: Index - +Format: 1.35 + + +Title: Photon +SubTitle: Simple Open Source 2D Game API + +Footer: Documentation for photon. Copyright (C) 2004-2005 James Turk + + +# -------------------------------------------------------------------------- +# +# Cut and paste the lines below to change the order in which your files +# appear on the menu. Don't worry about adding or removing files, Natural +# Docs will take care of that. +# +# You can further organize the menu by grouping the entries. Add a +# "Group: [name] {" line to start a group, and add a "}" to end it. +# +# You can add text and web links to the menu by adding "Text: [text]" and +# "Link: [name] ([URL])" lines, respectively. +# +# The formatting and comments are auto-generated, so don't worry about +# neatness when editing the file. Natural Docs will clean it up the next +# time it is run. When working with groups, just deal with the braces and +# forget about the indentation and comments. +# +# -------------------------------------------------------------------------- + + +Group: photon:: { + + File: AppCore (AppCore.hpp) + File: Application (Application.hpp) + File: AudioCore (audio/AudioCore.hpp) + File: Basic Types (types.hpp) + File: Entrypoint (entrypoint.hpp) + File: Exception/Error Types (exceptions.hpp) + File: Kernel (Kernel.hpp) + File: Log (Log.hpp) + File: Logging Utilities (LogSink.hpp) + + Group: Math { + + File: Circle (math/Circle.hpp) + File: Math Utilities (math/math.hpp) + File: Rect (math/Rect.hpp) + File: Vector2 (math/Vector2.hpp) + } # Group: Math + + File: ResourceManaged (ResourceManaged.hpp) + File: ResourceManager (ResourceManager.hpp) + File: Task (Task.hpp) + + Group: Util { + + File: ConfigFile (util/ConfigFile.hpp) + File: FileBuffer (util/FileBuffer.hpp) + File: filesys:: (util/filesys/filesys.hpp) + File: RandGen (util/RandGen.hpp) + File: Singleton (util/Singleton.hpp) + File: Timer (util/Timer.hpp) + File: VersionInfo (util/VersionInfo.hpp) + } # Group: Util + + Group: Video { + + File: Color (video/Color.hpp) + File: Pen (video/Pen.hpp) + File: VideoCore (video/VideoCore.hpp) + } # Group: Video + + } # Group: photon:: + +Group: Index { + + Index: Everything + Class Index: Classes + Constant Index: Constants + Function Index: Functions + Type Index: Types + Macro Index: Macros + Variable Index: Variables + } # Group: Index + diff --git a/src/AppCore.cpp b/src/AppCore.cpp index 406c77b..f33a555 100644 --- a/src/AppCore.cpp +++ b/src/AppCore.cpp @@ -5,12 +5,12 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: AppCore.cpp,v 1.5 2005/03/15 19:22:07 cozman Exp $ +// $Id: AppCore.cpp,v 1.6 2005/04/21 19:30:19 cozman Exp $ #include "AppCore.hpp" #include -#include "glfw.h" //This file depends on glfw +#include "GL/glfw.h" //This file depends on glfw #include "Kernel.hpp" #include "exceptions.hpp" diff --git a/src/Application.cpp b/src/Application.cpp index 16fdf50..b226718 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -5,12 +5,12 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: Application.cpp,v 1.6 2005/03/15 19:22:07 cozman Exp $ +// $Id: Application.cpp,v 1.7 2005/04/21 19:30:19 cozman Exp $ #include "Application.hpp" #include "physfs.h" -#include "gl/gl.h" +#include "GL/gl.h" #include diff --git a/src/util/VersionInfo.cpp b/src/util/VersionInfo.cpp index 9a01040..370a50b 100644 --- a/src/util/VersionInfo.cpp +++ b/src/util/VersionInfo.cpp @@ -5,7 +5,7 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: VersionInfo.cpp,v 1.6 2005/03/03 09:25:47 cozman Exp $ +// $Id: VersionInfo.cpp,v 1.7 2005/04/21 19:30:19 cozman Exp $ #include "util/VersionInfo.hpp" @@ -20,11 +20,11 @@ namespace util VersionInfo::VersionInfo(unsigned int maj, unsigned int min, unsigned int pat, std::string ext) : - major(maj), minor(min), patch(pat), extra(ext) + majorRelease(maj), minorRelease(min), patch(pat), extra(ext) {} VersionInfo::VersionInfo() : - major(0), minor(0), patch(0) + majorRelease(0), minorRelease(0), patch(0) {} bool VersionInfo::operator<(const VersionInfo &rhs) const @@ -32,17 +32,17 @@ bool VersionInfo::operator<(const VersionInfo &rhs) const bool less(false); //chained compares, compare numbers in order of importance - if(this->major < rhs.major) + if(this->majorRelease < rhs.majorRelease) { less = true; } - else if(this->major == rhs.major) + else if(this->majorRelease == rhs.majorRelease) { - if(this->minor < rhs.minor) + if(this->minorRelease < rhs.minorRelease) { less = true; } - else if(this->minor == rhs.minor) + else if(this->minorRelease == rhs.minorRelease) { if(this->patch < rhs.patch) { @@ -62,7 +62,8 @@ bool VersionInfo::operator<=(const VersionInfo &rhs) const bool VersionInfo::operator==(const VersionInfo &rhs) const { return this->extra == rhs.extra && this->patch == rhs.patch && - this->minor == rhs.minor && this->major == rhs.major; + this->minorRelease == rhs.minorRelease && + this->majorRelease == rhs.majorRelease; } bool VersionInfo::operator>=(const VersionInfo &rhs) const @@ -77,9 +78,9 @@ bool VersionInfo::operator>(const VersionInfo &rhs) const std::ostream& operator<<(std::ostream &o, const VersionInfo &rhs) { - // output major.minor.path [extra] (extra is only printed if not empty) - return o << rhs.major << '.' << rhs.minor << '.' << rhs.patch << - (rhs.extra.empty() ? "" : " [" + rhs.extra + "]"); + // output major.minor.patch [extra] (extra is only printed if not empty) + return o << rhs.majorRelease << '.' << rhs.minorRelease << '.' + << rhs.patch << (rhs.extra.empty() ? "" : " [" + rhs.extra + "]"); } void ensureVersion(const std::string& library, diff --git a/src/video/Color.cpp b/src/video/Color.cpp index 28d5379..a87383a 100644 --- a/src/video/Color.cpp +++ b/src/video/Color.cpp @@ -5,10 +5,10 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: Color.cpp,v 1.1 2005/03/02 08:45:58 cozman Exp $ +// $Id: Color.cpp,v 1.2 2005/04/21 19:30:19 cozman Exp $ #include "video/Color.hpp" -#include "gl/gl.h" +#include "GL/gl.h" namespace photon { diff --git a/src/video/Pen.cpp b/src/video/Pen.cpp index fd32cb9..7ac4a23 100644 --- a/src/video/Pen.cpp +++ b/src/video/Pen.cpp @@ -5,11 +5,11 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: Pen.cpp,v 1.2 2005/03/03 09:25:47 cozman Exp $ +// $Id: Pen.cpp,v 1.3 2005/04/21 19:30:19 cozman Exp $ #include "video/Pen.hpp" -#include "gl/gl.h" +#include "GL/gl.h" #include "math/math.hpp" diff --git a/src/video/VideoCore.cpp b/src/video/VideoCore.cpp index aff13ed..73d2443 100644 --- a/src/video/VideoCore.cpp +++ b/src/video/VideoCore.cpp @@ -5,14 +5,14 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: VideoCore.cpp,v 1.2 2005/03/15 18:53:27 cozman Exp $ +// $Id: VideoCore.cpp,v 1.3 2005/04/21 19:30:19 cozman Exp $ #include "video/VideoCore.hpp" #include "exceptions.hpp" -#include "gl/gl.h" -#include "gl/glu.h" +#include "GL/gl.h" +#include "GL/glu.h" namespace photon {