jpt-archive/cpp_photon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made fixes for build on Ubuntu

Browse Source
This commit is contained in:
James Turk 2005-04-21 19:30:19 +00:00
parent a733511985
commit adfbce47a9
12 changed files with 156 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SConstruct
View File

@ -5,7 +5,7 @@
# James Turk (jpt2433@rit.edu) # James Turk (jpt2433@rit.edu)
# #
# Version: # 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 os,os.path
import glob import glob
@ -102,9 +102,8 @@ class Builder:
LIBS=['photon','openal32','glfw','opengl32','glu32','physfs'], LIBS=['photon','openal32','glfw','opengl32','glu32','physfs'],
CPPFLAGS = '-Wall -pedantic -pg', LINKFLAGS='-pg') CPPFLAGS = '-Wall -pedantic -pg', LINKFLAGS='-pg')
self.buildSuperHeader() 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.Alias("docs",ndoc)
self.env.AlwaysBuild('docs/index.html') self.env.AlwaysBuild('docs/index.html')

6
include/audio/AudioCore.hpp
View File

@ -5,13 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 #ifndef PHOTON_AUDIO_AUDIOCORE_HPP
#define 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/Singleton.hpp"
#include "util/VersionInfo.hpp" #include "util/VersionInfo.hpp"

64
include/photon.hpp
View File

@ -1,32 +1,32 @@
#ifndef PHOTON_HPP #ifndef PHOTON_HPP
#define PHOTON_HPP #define PHOTON_HPP
#include "AppCore.hpp" #include "Kernel.hpp"
#include "Application.hpp" #include "AppCore.hpp"
#include "entrypoint.hpp" #include "types.hpp"
#include "exceptions.hpp" #include "Application.hpp"
#include "Kernel.hpp" #include "Task.hpp"
#include "Log.hpp" #include "exceptions.hpp"
#include "LogSink.hpp" #include "photon.hpp"
#include "photon.hpp" #include "entrypoint.hpp"
#include "ResourceManaged.hpp" #include "LogSink.hpp"
#include "ResourceManager.hpp" #include "Log.hpp"
#include "Task.hpp" #include "ResourceManaged.hpp"
#include "types.hpp" #include "ResourceManager.hpp"
#include "audio/AudioCore.hpp" #include "math/math.hpp"
#include "math/Circle.hpp" #include "math/Rect.hpp"
#include "math/math.hpp" #include "math/Vector2.hpp"
#include "math/Rect.hpp" #include "math/Circle.hpp"
#include "math/Vector2.hpp" #include "util/ConfigFile.hpp"
#include "util/ConfigFile.hpp" #include "util/VersionInfo.hpp"
#include "util/FileBuffer.hpp" #include "util/Singleton.hpp"
#include "util/RandGen.hpp" #include "util/RandGen.hpp"
#include "util/Singleton.hpp" #include "util/Timer.hpp"
#include "util/Timer.hpp" #include "util/FileBuffer.hpp"
#include "util/VersionInfo.hpp" #include "audio/AudioCore.hpp"
#include "video/Color.hpp" #include "video/Pen.hpp"
#include "video/Pen.hpp" #include "video/Color.hpp"
#include "video/VideoCore.hpp" #include "video/VideoCore.hpp"
#include "util/filesys/filesys.hpp" #include "util/filesys/filesys.hpp"
#endif // PHOTON_HPP #endif // PHOTON_HPP

4
include/types.hpp
View File

@ -5,7 +5,7 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 #ifndef PHOTON_TYPES_HPP
#define PHOTON_TYPES_HPP #define PHOTON_TYPES_HPP
@ -15,7 +15,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "glfw.h" //This file depends on glfw #include "GL/glfw.h" //This file depends on glfw
// Title: Basic Types // Title: Basic Types

17
include/util/VersionInfo.hpp
View File

@ -5,7 +5,7 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 #ifndef PHOTON_UTIL_VERSIONINFO_HPP
#define PHOTON_UTIL_VERSIONINFO_HPP #define PHOTON_UTIL_VERSIONINFO_HPP
@ -20,7 +20,7 @@ namespace util
// Class: VersionInfo // Class: VersionInfo
// Class which stores version information, such as release numbers. // Class which stores version information, such as release numbers.
// Format is Major.Minor.Release [ExtraInfo]. // Format is majorRelease.Minor.Release [ExtraInfo].
// //
// Operators: // Operators:
// - VersionInfo < VersionInfo // - VersionInfo < VersionInfo
@ -34,14 +34,15 @@ class VersionInfo
public: public:
// Group: Variables // 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 // 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. // added/removed/changed.
unsigned int minor; unsigned int minorRelease;
// Variable: patch // Variable: patch
// Patch number, should be changed upon every release that isn't // Patch number, should be changed upon every release that isn't
@ -62,7 +63,7 @@ public:
// Initializing constructor. // Initializing constructor.
// //
// Parameters: // Parameters:
// maj - Major version number. // maj - majorRelease version number.
// min - Minor version number. // min - Minor version number.
// pat - Patch number. // pat - Patch number.
// ext - Extra info string. [default: ""] // ext - Extra info string. [default: ""]

172
ndoc/Menu.txt
View File

@ -1,88 +1,84 @@
Format: 1.32 Format: 1.35
Title: Photon Title: Photon
SubTitle: Simple Open Source 2D Game API SubTitle: Simple Open Source 2D Game API
Footer: Documentation for <a href="http://photon.sourceforge.net">photon</a>. Copyright (C) 2004-2005 James Turk Footer: Documentation for <a href="http://photon.sourceforge.net">photon</a>. Copyright (C) 2004-2005 James Turk
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# #
# Cut and paste the lines below to change the order in which your files # 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 # appear on the menu. Don't worry about adding or removing files, Natural
# Docs will take care of that. # Docs will take care of that.
# #
# You can further organize the menu by grouping the entries. Add a # 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. # "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 # You can add text and web links to the menu by adding "Text: [text]" and
# "Link: [name] ([URL])" lines, respectively. # "Link: [name] ([URL])" lines, respectively.
# #
# The formatting and comments are auto-generated, so don't worry about # 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 # 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 # time it is run. When working with groups, just deal with the braces and
# forget about the indentation and comments. # forget about the indentation and comments.
# #
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
Group: photon:: { Group: photon:: {
File: AppCore (AppCore.hpp) File: AppCore (AppCore.hpp)
File: Application (Application.hpp) File: Application (Application.hpp)
File: Basic Types (types.hpp) File: AudioCore (audio/AudioCore.hpp)
File: Entrypoint (entrypoint.hpp) File: Basic Types (types.hpp)
File: Exception/Error Types (exceptions.hpp) File: Entrypoint (entrypoint.hpp)
File: Kernel (Kernel.hpp) File: Exception/Error Types (exceptions.hpp)
File: Log (Log.hpp) File: Kernel (Kernel.hpp)
File: Logging Utilities (LogSink.hpp) File: Log (Log.hpp)
File: ResourceManaged (ResourceManaged.hpp) File: Logging Utilities (LogSink.hpp)
File: ResourceManager (ResourceManager.hpp)
File: Task (Task.hpp) Group: Math {
Group: audio:: { File: Circle (math/Circle.hpp)
File: Math Utilities (math/math.hpp)
File: AudioCore (audio\AudioCore.hpp) File: Rect (math/Rect.hpp)
} # Group: audio:: File: Vector2 (math/Vector2.hpp)
} # Group: Math
Group: math:: {
File: ResourceManaged (ResourceManaged.hpp)
File: Circle (math\Circle.hpp) File: ResourceManager (ResourceManager.hpp)
File: Math Utilities (math\math.hpp) File: Task (Task.hpp)
File: Rect (math\Rect.hpp)
File: Vector2 (math\Vector2.hpp) Group: Util {
} # Group: math::
File: ConfigFile (util/ConfigFile.hpp)
Group: util:: { File: FileBuffer (util/FileBuffer.hpp)
File: filesys:: (util/filesys/filesys.hpp)
File: ConfigFile (util\ConfigFile.hpp) File: RandGen (util/RandGen.hpp)
File: FileBuffer (util\FileBuffer.hpp) File: Singleton (util/Singleton.hpp)
File: filesys:: (util\filesys\filesys.hpp) File: Timer (util/Timer.hpp)
File: RandGen (util\RandGen.hpp) File: VersionInfo (util/VersionInfo.hpp)
File: Singleton (util\Singleton.hpp) } # Group: Util
File: Timer (util\Timer.hpp)
File: VersionInfo (util\VersionInfo.hpp) Group: Video {
} # Group: util::
File: Color (video/Color.hpp)
Group: video:: { File: Pen (video/Pen.hpp)
File: VideoCore (video/VideoCore.hpp)
File: Color (video\Color.hpp) } # Group: Video
File: Pen (video\Pen.hpp)
File: VideoCore (video\VideoCore.hpp) } # Group: photon::
} # Group: video::
Group: Index {
} # Group: photon:: Index: Everything
Class Index: Classes
Group: Index { Constant Index: Constants
Function Index: Functions
Index: Everything Type Index: Types
Class Index: Classes Macro Index: Macros
Constant Index: Constants Variable Index: Variables
Function Index: Functions } # Group: Index
Type Index: Types
Macro Index: Macros
Variable Index: Variables
} # Group: Index

4
src/AppCore.cpp
View File

@ -5,12 +5,12 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 "AppCore.hpp"
#include <boost/lexical_cast.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 "Kernel.hpp"
#include "exceptions.hpp" #include "exceptions.hpp"

4
src/Application.cpp
View File

@ -5,12 +5,12 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 "Application.hpp"
#include "physfs.h" #include "physfs.h"
#include "gl/gl.h" #include "GL/gl.h"
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>

23
src/util/VersionInfo.cpp
View File

@ -5,7 +5,7 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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" #include "util/VersionInfo.hpp"
@ -20,11 +20,11 @@ namespace util
VersionInfo::VersionInfo(unsigned int maj, unsigned int min, unsigned int pat, VersionInfo::VersionInfo(unsigned int maj, unsigned int min, unsigned int pat,
std::string ext) : std::string ext) :
major(maj), minor(min), patch(pat), extra(ext) majorRelease(maj), minorRelease(min), patch(pat), extra(ext)
{} {}
VersionInfo::VersionInfo() : VersionInfo::VersionInfo() :
major(0), minor(0), patch(0) majorRelease(0), minorRelease(0), patch(0)
{} {}
bool VersionInfo::operator<(const VersionInfo &rhs) const bool VersionInfo::operator<(const VersionInfo &rhs) const
@ -32,17 +32,17 @@ bool VersionInfo::operator<(const VersionInfo &rhs) const
bool less(false); bool less(false);
//chained compares, compare numbers in order of importance //chained compares, compare numbers in order of importance
if(this->major < rhs.major) if(this->majorRelease < rhs.majorRelease)
{ {
less = true; 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; less = true;
} }
else if(this->minor == rhs.minor) else if(this->minorRelease == rhs.minorRelease)
{ {
if(this->patch < rhs.patch) if(this->patch < rhs.patch)
{ {
@ -62,7 +62,8 @@ bool VersionInfo::operator<=(const VersionInfo &rhs) const
bool VersionInfo::operator==(const VersionInfo &rhs) const bool VersionInfo::operator==(const VersionInfo &rhs) const
{ {
return this->extra == rhs.extra && this->patch == rhs.patch && 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 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) 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, void ensureVersion(const std::string& library,

4
src/video/Color.cpp
View File

@ -5,10 +5,10 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 "video/Color.hpp"
#include "gl/gl.h" #include "GL/gl.h"
namespace photon namespace photon
{ {

4
src/video/Pen.cpp
View File

@ -5,11 +5,11 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 "video/Pen.hpp"
#include "gl/gl.h" #include "GL/gl.h"
#include "math/math.hpp" #include "math/math.hpp"

6
src/video/VideoCore.cpp
View File

@ -5,14 +5,14 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 "video/VideoCore.hpp"
#include "exceptions.hpp" #include "exceptions.hpp"
#include "gl/gl.h" #include "GL/gl.h"
#include "gl/glu.h" #include "GL/glu.h"
namespace photon namespace photon
{ {