mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-04 14:30:35 +00:00
Code Issues Releases Wiki Activity

NO_STD_HYPOT to prevent compilation errors when there is no std::hypot

Browse Source
This commit is contained in:
Zeno Rogue 2018-07-23 05:18:03 +02:00
parent ae85b59530
commit 1c8aa41965
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hyper.h
View File

@ -50,15 +50,11 @@ using std::isfinite;
using std::isnan; using std::isnan;
using std::log; using std::log;
using std::exp; using std::exp;
using std::hypot;
using std::sin; using std::sin;
using std::cos; using std::cos;
using std::sinh; using std::sinh;
using std::asinh;
using std::asin; using std::asin;
using std::acos; using std::acos;
using std::asinh;
using std::acosh;
using std::tan; using std::tan;
using std::atan; using std::atan;
using std::atan2; using std::atan2;
@ -67,6 +63,11 @@ using std::sqrt;
using std::pow; using std::pow;
using std::floor; using std::floor;
using std::ceil; using std::ceil;
#ifndef ANDROID
using std::hypot;
using std::asinh;
using std::acosh;
#endif
// genus (in grammar) // genus (in grammar)
#define GEN_M 0 #define GEN_M 0

1
hyperroid/app/src/main/jni/hyper.cpp
View File

@ -21,6 +21,7 @@
#define CAP_SHADER 1 #define CAP_SHADER 1
#define CAP_VERTEXBUFFER 0 #define CAP_VERTEXBUFFER 0
#define CAP_TIMEOFDAY 1 #define CAP_TIMEOFDAY 1
#define NO_STD_HYPOT
#define HNEW 1 #define HNEW 1