Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build breakage fixes:

Browse Source 
* Removed declarations for now-removed "fast" maths functions
* Corrected definition of OOLITE_HAVE_PROTOCOL_OPTIONAL to exclude gcc on non-Mac systems


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4734 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2012-01-09 09:16:58 +00:00
parent fe5ac693dd
commit 21a9192a3d
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/OOCocoa.h
View File

@ -409,7 +409,7 @@ enum {
can only be one and there's no way to switch back to @required. can only be one and there's no way to switch back to @required.
*/ */
#ifndef OOLITE_HAVE_PROTOCOL_OPTIONAL #ifndef OOLITE_HAVE_PROTOCOL_OPTIONAL
#define OOLITE_HAVE_PROTOCOL_OPTIONAL 1 #define OOLITE_HAVE_PROTOCOL_OPTIONAL (OOLITE_MAC_OS_X || defined(__clang__))
#endif #endif
#if OOLITE_HAVE_PROTOCOL_OPTIONAL #if OOLITE_HAVE_PROTOCOL_OPTIONAL

1
src/Core/OOQuaternion.h
View File

@ -91,7 +91,6 @@ void quaternion_rotate_about_axis(Quaternion *quat, Vector axis, OOScalar angle)
/* Normalize quaternion */ /* Normalize quaternion */
OOINLINE void quaternion_normalize(Quaternion *quat) NONNULL_FUNC ALWAYS_INLINE_FUNC; OOINLINE void quaternion_normalize(Quaternion *quat) NONNULL_FUNC ALWAYS_INLINE_FUNC;
OOINLINE void fast_quaternion_normalize(Quaternion *quat) NONNULL_FUNC ALWAYS_INLINE_FUNC;
#if __OBJC__ #if __OBJC__
NSString *QuaternionDescription(Quaternion quaternion); // @"(w + xi + yj + zk)" NSString *QuaternionDescription(Quaternion quaternion); // @"(w + xi + yj + zk)"

6
src/Core/OOVector.h
View File

@ -95,32 +95,27 @@ OOINLINE OOScalar magnitude2(Vector vec) INLINE_CONST_FUNC;
/* Magnitude of vector */ /* Magnitude of vector */
OOINLINE OOScalar magnitude(Vector vec) INLINE_CONST_FUNC; OOINLINE OOScalar magnitude(Vector vec) INLINE_CONST_FUNC;
OOINLINE OOScalar fast_magnitude(Vector vec) INLINE_CONST_FUNC;
/* Normalize vector */ /* Normalize vector */
OOINLINE Vector vector_normal(Vector vec) INLINE_CONST_FUNC; OOINLINE Vector vector_normal(Vector vec) INLINE_CONST_FUNC;
OOINLINE Vector fast_vector_normal(Vector vec) INLINE_CONST_FUNC;
/* Normalize vector, returning fallback if zero vector. */ /* Normalize vector, returning fallback if zero vector. */
OOINLINE Vector vector_normal_or_fallback(Vector vec, Vector fallback) INLINE_CONST_FUNC; OOINLINE Vector vector_normal_or_fallback(Vector vec, Vector fallback) INLINE_CONST_FUNC;
OOINLINE Vector vector_normal_or_xbasis(Vector vec) INLINE_CONST_FUNC; OOINLINE Vector vector_normal_or_xbasis(Vector vec) INLINE_CONST_FUNC;
OOINLINE Vector vector_normal_or_ybasis(Vector vec) INLINE_CONST_FUNC; OOINLINE Vector vector_normal_or_ybasis(Vector vec) INLINE_CONST_FUNC;
OOINLINE Vector vector_normal_or_zbasis(Vector vec) INLINE_CONST_FUNC; OOINLINE Vector vector_normal_or_zbasis(Vector vec) INLINE_CONST_FUNC;
OOINLINE Vector fast_vector_normal_or_fallback(Vector vec, Vector fallback) INLINE_CONST_FUNC;
/* Square of distance between vectors */ /* Square of distance between vectors */
OOINLINE OOScalar distance2(Vector v1, Vector v2) INLINE_CONST_FUNC; OOINLINE OOScalar distance2(Vector v1, Vector v2) INLINE_CONST_FUNC;
/* Distance between vectors */ /* Distance between vectors */
OOINLINE OOScalar distance(Vector v1, Vector v2) INLINE_CONST_FUNC; OOINLINE OOScalar distance(Vector v1, Vector v2) INLINE_CONST_FUNC;
OOINLINE OOScalar fast_distance(Vector v1, Vector v2) INLINE_CONST_FUNC;
/* Dot product */ /* Dot product */
OOINLINE OOScalar dot_product (Vector first, Vector second) INLINE_CONST_FUNC; OOINLINE OOScalar dot_product (Vector first, Vector second) INLINE_CONST_FUNC;
/* NORMALIZED cross product */ /* NORMALIZED cross product */
OOINLINE Vector cross_product(Vector first, Vector second) INLINE_CONST_FUNC; OOINLINE Vector cross_product(Vector first, Vector second) INLINE_CONST_FUNC;
OOINLINE Vector fast_cross_product(Vector first, Vector second) INLINE_CONST_FUNC;
/* General cross product */ /* General cross product */
OOINLINE Vector true_cross_product(Vector first, Vector second) CONST_FUNC; OOINLINE Vector true_cross_product(Vector first, Vector second) CONST_FUNC;
@ -130,7 +125,6 @@ OOINLINE OOScalar triple_product(Vector first, Vector second, Vector third) INLI
/* Given three points on a surface, returns the normal to the surface. */ /* Given three points on a surface, returns the normal to the surface. */
OOINLINE Vector normal_to_surface(Vector v1, Vector v2, Vector v3) CONST_FUNC; OOINLINE Vector normal_to_surface(Vector v1, Vector v2, Vector v3) CONST_FUNC;
OOINLINE Vector fast_normal_to_surface(Vector v1, Vector v2, Vector v3) CONST_FUNC;
#if __OBJC__ #if __OBJC__
NSString *VectorDescription(Vector vector); // @"(x, y, z)" NSString *VectorDescription(Vector vector); // @"(x, y, z)"