* Add #ifdef WIN32 to make main.cpp compile on linux.

[matthijs/ABM2.git] / ABM2 / Engine / misc.h

diff --git a/ABM2/Engine/misc.h b/ABM2/Engine/misc.h
index 843c97f18e75fef8b4c99f1ab9a7e474143525a1..55b3f9964a00ec0194d740c0f8181565b61f6183 100755 (executable)
--- a/ABM2/Engine/misc.h
+++ b/ABM2/Engine/misc.h
@@ -1,8 +1,11 @@
 #ifndef MISC_H_INCLUDED\r
 #define MISC_H_INCLUDED\r
 \r
-\r
-\r
+#ifndef WIN32\r
+/* HACK to get this to compile */\r
+#define max(a,b) (a>b?a:b)\r
+#define min(a,b) (a<b?a:b)\r
+#endif // !WIN32\r
 inline float clamp(float val, float minVal, float maxVal)\r
 {\r
        return min(max(val,minVal),maxVal);\r