made fixes for build on Ubuntu

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',
+        ndoc = self.env.Command('docs/index.html', './include',
-        #    """NaturalDocs -nag -i $SOURCES -o HTML ./docs -p ./ndoc""",
+            """NaturalDocs -nag -i $SOURCES -o HTML ./docs -p ./ndoc""")
-        #    target_factory=Dir)
         #self.env.Alias("docs",ndoc)
         self.env.AlwaysBuild('docs/index.html')
 

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 "AL/al.h"
-#include "alc.h"
+#include "AL/alc.h"
 
 #include "util/Singleton.hpp"
 #include "util/VersionInfo.hpp"

include/photon.hpp

@@ -1,31 +1,31 @@
 #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 "AppCore.hpp"
-#include "LogSink.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 "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 "math/Circle.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 "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"
 

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 <string>
 #include <vector>
 
-#include "glfw.h"   //This file depends on glfw
+#include "GL/glfw.h"   //This file depends on glfw
 
 // Title: Basic Types
 

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
+    // Variable: majorRelease
-    //  Major version number, should be changed when major changes take place.
+    //  major release version number, should be changed when major changes take 
-    unsigned int major;
+    //  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: ""]

ndoc/Menu.txt

@@ -1,4 +1,4 @@
-Format: 1.32
+Format: 1.35
 
 
 Title: Photon
@@ -31,47 +31,43 @@ 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: audio::  {
+   Group: Util  {
 
-      File: AudioCore  (audio\AudioCore.hpp)
+      File: ConfigFile  (util/ConfigFile.hpp)
-      }  # Group: audio::
+      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: math::  {
+   Group: Video  {
-
-      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::
 
+      File: Color  (video/Color.hpp)
+      File: Pen  (video/Pen.hpp)
+      File: VideoCore  (video/VideoCore.hpp)
+      }  # Group: Video
 
    }  # Group: photon::
 

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 <boost/lexical_cast.hpp>
-#include "glfw.h"   //This file depends on glfw
+#include "GL/glfw.h"   //This file depends on glfw
 
 #include "Kernel.hpp"
 #include "exceptions.hpp"

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 <boost/lexical_cast.hpp>
 

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)
+    // output major.minor.patch [extra] (extra is only printed if not empty)
-    return o << rhs.major << '.' << rhs.minor << '.' << rhs.patch <<
+    return o << rhs.majorRelease << '.' << rhs.minorRelease << '.' 
-            (rhs.extra.empty() ? "" : " [" + rhs.extra + "]");
+            << rhs.patch << (rhs.extra.empty() ? "" : " [" + rhs.extra + "]");
 }
 
 void ensureVersion(const std::string& library,

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
 {

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"
 

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/gl.h"
-#include "gl/glu.h"
+#include "GL/glu.h"
 
 namespace photon
 {