projects
/
zefram
/
minetest
/
minetest_engine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05b5850
)
Fixed u64 ambiguous symbol error
author
DannyDark
<the_skeleton_of_a_child@yahoo.co.uk>
Mon, 10 Dec 2012 04:15:42 +0000
(
04:15
+0000)
committer
darkrose
<lisa@ltmnet.com>
Thu, 20 Dec 2012 07:53:25 +0000
(17:53 +1000)
Fixed the compiler not being able to determine which symbol it should
use when compiling Minetest as 64bit with Irrlicht 1.8+
src/irrlichttypes.h
patch
|
blob
|
history
diff --git
a/src/irrlichttypes.h
b/src/irrlichttypes.h
index 82177299eaad932f02cfcf6ea5407be50328dd46..998992e05d457093a724c2850078d213aff80ba1 100644
(file)
--- a/
src/irrlichttypes.h
+++ b/
src/irrlichttypes.h
@@
-24,6
+24,8
@@
with this program; if not, write to the Free Software Foundation, Inc.,
using namespace irr;
+// Irrlicht 1.8+ defines 64bit unsigned symbol in irrTypes.h
+#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
#ifdef _MSC_VER
// Windows
typedef unsigned long long u64;
@@
-33,6
+35,7
@@
using namespace irr;
typedef uint64_t u64;
//typedef unsigned long long u64;
#endif
+#endif
#endif