Ignore:
Timestamp:
Sep 10, 2011, 2:42:13 PM (9 years ago)
Author:
sam
Message:

build: stop defining ANDROID_NDK and check for ANDROID instead.

According to David Turner, “it should be the only thing that NDK users
should be testing again.”

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/matrix.h

    r929 r939  
    1818
    1919#include <cmath>
    20 #include <iostream>
     20#if !defined __ANDROID__
     21#   include <iostream>
     22#endif
    2123
    2224namespace lol
     
    127129        using namespace std; \
    128130        return sqrtf((float)sqlen()); \
    129     } \
    130     \
    131     template<typename U> \
    132     friend std::ostream &operator<<(std::ostream &stream, \
    133                                     Vec##elems<U> const &v);
     131    }
    134132
    135133template <typename T> struct Vec2;
     
    145143    OPERATORS(2)
    146144
     145#if !defined __ANDROID__
     146    template<typename U>
     147    friend std::ostream &operator<<(std::ostream &stream, Vec2<U> const &v);
     148#endif
     149
    147150    union { T x; T a; T i; };
    148151    union { T y; T b; T j; };
     
    159162
    160163    OPERATORS(3)
     164
     165#if !defined __ANDROID__
     166    template<typename U>
     167    friend std::ostream &operator<<(std::ostream &stream, Vec3<U> const &v);
     168#endif
    161169
    162170    union { T x; T a; T i; };
     
    175183
    176184    OPERATORS(4)
     185
     186#if !defined __ANDROID__
     187    template<typename U>
     188    friend std::ostream &operator<<(std::ostream &stream, Vec4<U> const &v);
     189#endif
    177190
    178191    union { T x; T a; T i; };
     
    238251    void printf() const;
    239252
     253#if !defined __ANDROID__
    240254    template<class U>
    241255    friend std::ostream &operator<<(std::ostream &stream, Mat4<U> const &m);
     256#endif
    242257
    243258    inline Mat4<T> operator +(Mat4<T> const val) const
Note: See TracChangeset for help on using the changeset viewer.