projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Move ILUT initialization down to below OpenGL initilization, to prevent segfaults.
[matthijs/ABM2.git]
/
ABM2
/
main.cpp
diff --git
a/ABM2/main.cpp
b/ABM2/main.cpp
index 7348a15fa1545965c41d68edc2beb71bdea65c6d..48dcd73f664a1692542a03fd47e7b3546c122ccc 100755
(executable)
--- a/
ABM2/main.cpp
+++ b/
ABM2/main.cpp
@@
-4,13
+4,6
@@
#include <windowsx.h>
\r
#endif
\r
\r
#include <windowsx.h>
\r
#endif
\r
\r
-//#ifndef WIN32
\r
- /* HACKS */
\r
-#define max(a,b) (a>b?a:b)
\r
-#define min(a,b) (a<b?a:b)
\r
-#define GetTickCount() 0
\r
-//#endif // !WIN32
\r
-
\r
#include "Engine/engine.h"
\r
#include "Engine/game.h"
\r
#include "Playground.h"
\r
#include "Engine/engine.h"
\r
#include "Engine/game.h"
\r
#include "Playground.h"
\r