[Orxonox-commit 2449] r7156 - in code/branches/presentation3: cmake src/orxonox/sound

rgrieder at orxonox.net rgrieder at orxonox.net
Wed Jul 21 14:34:21 CEST 2010


Author: rgrieder
Date: 2010-07-21 14:34:21 +0200 (Wed, 21 Jul 2010)
New Revision: 7156

Modified:
   code/branches/presentation3/cmake/CompilerConfigMSVC.cmake
   code/branches/presentation3/src/orxonox/sound/BaseSound.cc
Log:
Removed an MSVC warning and added a missing include.

Modified: code/branches/presentation3/cmake/CompilerConfigMSVC.cmake
===================================================================
--- code/branches/presentation3/cmake/CompilerConfigMSVC.cmake	2010-07-20 12:08:28 UTC (rev 7155)
+++ code/branches/presentation3/cmake/CompilerConfigMSVC.cmake	2010-07-21 12:34:21 UTC (rev 7156)
@@ -67,6 +67,7 @@
 # additionally for CXX: -EHsc -GR
 ADD_COMPILER_FLAGS("-D__WIN32__ -D_WIN32"      CACHE)
 ADD_COMPILER_FLAGS("-D_CRT_SECURE_NO_WARNINGS" CACHE)
+ADD_COMPILER_FLAGS("-D_SCL_SECURE_NO_WARNINGS" CACHE)
 
 # Overwrite CMake default flags here.
 SET_COMPILER_FLAGS("-MDd -Od -Zi -D_DEBUG -MP -RTC1" Debug          CACHE)

Modified: code/branches/presentation3/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/presentation3/src/orxonox/sound/BaseSound.cc	2010-07-20 12:08:28 UTC (rev 7155)
+++ code/branches/presentation3/src/orxonox/sound/BaseSound.cc	2010-07-21 12:34:21 UTC (rev 7156)
@@ -32,6 +32,7 @@
 #include <vector>
 #include <al.h>
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
 #include "core/Resource.h"




More information about the Orxonox-commit mailing list