From fff851b34bdda67dc2a70fc5a11260d7a6a4433f Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Fri, 16 Oct 2009 20:59:08 +0000 Subject: [PATCH] [CHG] Deleted the Temporary fix (-DNOGUFIX) --- GRRLIB/GRRLIB/grrlib.h | 27 --------------------------- README.html | 29 +---------------------------- grrlib.doxygen | 2 +- 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/GRRLIB/GRRLIB/grrlib.h b/GRRLIB/GRRLIB/grrlib.h index 3060149..9d10deb 100644 --- a/GRRLIB/GRRLIB/grrlib.h +++ b/GRRLIB/GRRLIB/grrlib.h @@ -34,34 +34,7 @@ THE SOFTWARE. // Includes //============================================================================== #include - //============================================================================== -/* -*** Temporary fix *** -After the release of libogc v1.7.1a, Vector was renamed to guVector -"to avoid collisions" [svn 3650] -...also Quaternion was renamed to guQuaternion - but GRRLIB does not use these! - -The main codebase of GRRLIB has been updated to reflect this change. -But until the new libogc is officially released, -if you are using a version of libogc later than v1.7.1a/svn3649, -you will need to add: - -DNOGUFIX -to the compiler flags in your makefile - -When the libogc changes are officially released, -this *temporary fix* should be removed -The requirement for -DNOGUFIX will be deprecated, -but its lingering presence will not be a hinderance - -Thanks to Nicksasa for reporting this problem :) -*/ -//============================================================================== -#ifndef NOGUFIX -// If you are getting a compile error here, read the above comment! -typedef Vector guVector ; -typedef Quaternion guQuaternion ; -#endif //============================================================================== // C++ header diff --git a/README.html b/README.html index a078e9b..050f822 100644 --- a/README.html +++ b/README.html @@ -1,4 +1,4 @@ -
+GRRLIB

@@ -24,9 +24,6 @@ Using GRRLIB
 Upgrading to v4.1.0 From Previous Versions of GRRLIB
 ...I upgraded and now my programs won't compile properly!?
 
-Error: guVector redefined
-...How do I get rid of this error?
-
 Using SVN
 ...What is this SVN thing that the L337 devs keep talking about?
 
@@ -197,30 +194,6 @@ Because GRRLIB now does this for you automatically, these lines must be removed
 from your code.
 
 
-Error: guVector redefined
--------------------------
-
-If you get this error, you are probably using a version of libogc more recent
-than the released v1.7.1a.
-
-In the libogc SVN revision 3650 Vector was renamed to guVector "to avoid
-collisions"  ...also Quaternion was renamed to guQuaternion - but GRRLIB does
-not use these!
-
-The main codebase of GRRLIB has been updated to reflect this change.
-But until the new libogc is officially released, if you are using a version of
-libogc later than v1.7.1a/svn3649, you will need to add:
-  -DNOGUFIX
-to the compiler flags (CFLAGS) in your makefile
-
-When the libogc changes are officially released, this *temporary fix* should be
-removed [see grrlib.h, line 50ish]
-The requirement for -DNOGUFIX will be deprecated, but its lingering presence
-will not be a hinderance
-
-Thanks to Nicksasa for reporting this problem
-
-
 Using SVN
 ---------
 
diff --git a/grrlib.doxygen b/grrlib.doxygen
index 4c81577..4fa9208 100644
--- a/grrlib.doxygen
+++ b/grrlib.doxygen
@@ -31,7 +31,7 @@ PROJECT_NAME           = GRRLIB
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 4.1.0
+PROJECT_NUMBER         = 4.1.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put.