[Csp-commits] svn:csp r1857 - in trunk/csp/cspsim: . sound

[<sv...@ww...>]

Author: mkrose
Date: 2006-01-29 14:36:33 -0800 (Sun, 29 Jan 2006)
New Revision: 1857

Modified:
   trunk/csp/cspsim/CSPSim.cpp
   trunk/csp/cspsim/Engine.cpp
   trunk/csp/cspsim/sound/Sample.cpp
   trunk/csp/cspsim/sound/SoundEngine.cpp
   trunk/csp/cspsim/sound/SoundModel.cpp
Log:
Add undef.h includes to eliminate Windows.h macro pollution when
including osgAL and openalpp headers.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1857

Modified: trunk/csp/cspsim/CSPSim.cpp
===================================================================
--- trunk/csp/cspsim/CSPSim.cpp	2006-01-29 21:50:06 UTC (rev 1856)
+++ trunk/csp/cspsim/CSPSim.cpp	2006-01-29 22:36:33 UTC (rev 1857)
@@ -85,6 +85,7 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_joystick.h>
 
+#include <csp/csplib/util/undef.h>
 
 CSP_NAMESPACE
 

Modified: trunk/csp/cspsim/Engine.cpp
===================================================================
--- trunk/csp/cspsim/Engine.cpp	2006-01-29 21:50:06 UTC (rev 1856)
+++ trunk/csp/cspsim/Engine.cpp	2006-01-29 22:36:33 UTC (rev 1857)
@@ -37,6 +37,7 @@
 #include <csp/csplib/data/ObjectInterface.h>
 
 #include <osgAL/SoundState>
+#include <csp/csplib/util/undef.h>
 
 #include <iomanip>
 #include <sstream>

Modified: trunk/csp/cspsim/sound/Sample.cpp
===================================================================
--- trunk/csp/cspsim/sound/Sample.cpp	2006-01-29 21:50:06 UTC (rev 1856)
+++ trunk/csp/cspsim/sound/Sample.cpp	2006-01-29 22:36:33 UTC (rev 1857)
@@ -31,6 +31,7 @@
 
 #include <osgAL/SoundState>
 #include <openalpp/sample.h>
+#include <csp/csplib/util/undef.h>
 
 
 CSP_NAMESPACE

Modified: trunk/csp/cspsim/sound/SoundEngine.cpp
===================================================================
--- trunk/csp/cspsim/sound/SoundEngine.cpp	2006-01-29 21:50:06 UTC (rev 1856)
+++ trunk/csp/cspsim/sound/SoundEngine.cpp	2006-01-29 22:36:33 UTC (rev 1857)
@@ -27,6 +27,7 @@
 
 #include <osgAL/SoundManager>
 #include <osgAL/SoundRoot>
+#include <csp/csplib/util/undef.h>
 
 #include <cassert>
 

Modified: trunk/csp/cspsim/sound/SoundModel.cpp
===================================================================
--- trunk/csp/cspsim/sound/SoundModel.cpp	2006-01-29 21:50:06 UTC (rev 1856)
+++ trunk/csp/cspsim/sound/SoundModel.cpp	2006-01-29 22:36:33 UTC (rev 1857)
@@ -33,6 +33,7 @@
 #include <osg/MatrixTransform>
 #include <osgAL/SoundNode>
 #include <osgAL/SoundState>
+#include <csp/csplib/util/undef.h>
 
 #include <cassert>