[Orxonox-commit 3440] r8127 - in code/branches/mac_osx: cmake/tools src/orxonox/sound
rgrieder at orxonox.net
rgrieder at orxonox.net
Sat Mar 26 21:37:51 CET 2011
Author: rgrieder
Date: 2011-03-26 21:37:51 +0100 (Sat, 26 Mar 2011)
New Revision: 8127
Modified:
code/branches/mac_osx/cmake/tools/TargetUtilities.cmake
code/branches/mac_osx/src/orxonox/sound/SoundManager.cc
Log:
Reverted some unintentional changes.
Modified: code/branches/mac_osx/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/mac_osx/cmake/tools/TargetUtilities.cmake 2011-03-26 20:23:57 UTC (rev 8126)
+++ code/branches/mac_osx/cmake/tools/TargetUtilities.cmake 2011-03-26 20:37:51 UTC (rev 8127)
@@ -175,7 +175,7 @@
REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
ADD_COMPILER_FLAGS("-w")
ENDIF()
-
+
# Don't compile header files
FOREACH(_file ${_${_target_name}_files})
IF(NOT _file MATCHES "\\.(c|cc|cpp|cxx|mm)$")
@@ -183,6 +183,8 @@
ENDIF()
ENDFOREACH(_file)
+
+
# Add the library/executable
IF("${_target_type}" STREQUAL "LIBRARY")
ADD_LIBRARY(${_target_name} ${_link_mode}
Modified: code/branches/mac_osx/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/mac_osx/src/orxonox/sound/SoundManager.cc 2011-03-26 20:23:57 UTC (rev 8126)
+++ code/branches/mac_osx/src/orxonox/sound/SoundManager.cc 2011-03-26 20:37:51 UTC (rev 8127)
@@ -327,7 +327,7 @@
ALenum error = alGetError();
if (error == AL_INVALID_VALUE) {}
// @TODO: Follow this constantly appearing, nerve-racking warning
- //COUT(2) << "Sound: OpenAL: Invalid listener position" << std::endl;
+ COUT(2) << "Sound: OpenAL: Invalid listener position" << std::endl;
}
void SoundManager::setListenerOrientation(const Quaternion& orientation)
More information about the Orxonox-commit
mailing list