[Pingus-CVS] r2702 - in branches/pingus_sdl/src: display math win32

[jsalmon3]

Author: jsalmon3
Date: 2007-07-09 07:57:20 +0200 (Mon, 09 Jul 2007)
New Revision: 2702

Modified:
   branches/pingus_sdl/src/display/drawing_context.cpp
   branches/pingus_sdl/src/math/vector3f.hpp
   branches/pingus_sdl/src/win32/config.h
Log:
Fixed compile errors

Modified: branches/pingus_sdl/src/display/drawing_context.cpp
===================================================================
--- branches/pingus_sdl/src/display/drawing_context.cpp 2007-03-23 18:02:14 UTC 
(rev 2701)
+++ branches/pingus_sdl/src/display/drawing_context.cpp 2007-07-09 05:57:20 UTC 
(rev 2702)
@@ -19,7 +19,7 @@
 
 #include <assert.h>
 #include <iostream>
-#include <iostream>
+#include <algorithm>
 #include "drawing_context.hpp"
 #include "gui/display.hpp"
 #include "../sprite.hpp"

Modified: branches/pingus_sdl/src/math/vector3f.hpp
===================================================================
--- branches/pingus_sdl/src/math/vector3f.hpp   2007-03-23 18:02:14 UTC (rev 
2701)
+++ branches/pingus_sdl/src/math/vector3f.hpp   2007-07-09 05:57:20 UTC (rev 
2702)
@@ -21,7 +21,7 @@
 #define HEADER_PINGUS_MATH_VECTOR3F_HPP
 
 #include <iosfwd>
-#include "pingus.hpp"
+#include "../pingus.hpp"
 
 class Vector2f;
 

Modified: branches/pingus_sdl/src/win32/config.h
===================================================================
--- branches/pingus_sdl/src/win32/config.h      2007-03-23 18:02:14 UTC (rev 
2701)
+++ branches/pingus_sdl/src/win32/config.h      2007-07-09 05:57:20 UTC (rev 
2702)
@@ -22,8 +22,6 @@
 #define HAVE_SETLOCALE 1
 #define HAVE_STRDUP 1
 #define HAVE_GETTEXT 1
-#define HAVE_LIBCLANVORBIS 1
-#define HAVE_LIBCLANMIKMOD 1
 #define ICONV_CONST const
 
 /* MSVC specifics */
@@ -38,4 +36,8 @@
 
 typedef unsigned __int64 uintmax_t;
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
 #endif
+
+#endif