Commit 09392b79 authored by hybrid's avatar hybrid

Fix Makefile includes and type qualifier.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2959 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 69fd3110
...@@ -145,6 +145,10 @@ TAGS: ...@@ -145,6 +145,10 @@ TAGS:
%.d:%.cpp %.d:%.cpp
$(CXX) $(CPPFLAGS) -MM -MF $@ $< $(CXX) $(CPPFLAGS) -MM -MF $@ $<
# Create dependency files for automatic recompilation
%.d:%.c
$(CC) $(CPPFLAGS) -MM -MF $@ $<
# Create object files from objective-c code # Create object files from objective-c code
%.o:%.mm %.o:%.mm
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
......
...@@ -73,7 +73,11 @@ ...@@ -73,7 +73,11 @@
#else #else
#include <stdint.h> #include <stdint.h>
typedef int64_t sha2_64t; typedef int64_t sha2_64t;
#if __WORDSIZE==64
#define s_u64 ul #define s_u64 ul
#else
#define s_u64 ull
#endif
#endif #endif
#if defined(__cplusplus) #if defined(__cplusplus)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment