Update of /cvsroot/super-tux/supertux/lib/audio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9064/lib/audio
Modified Files:
musicref.cpp musicref.h sound.cpp sound_manager.cpp
sound_manager.h
Log Message:
Had to change the #includes of dependend headers from "dir/header.h" to "../dir/header.h", so those 'dependencies' work correctly, if you want to use those headers from $(includedir) so to speak in a 3rd party projects.
Index: sound_manager.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/sound_manager.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sound_manager.cpp 21 Jul 2004 16:51:50 -0000 1.2
+++ sound_manager.cpp 22 Jul 2004 19:07:50 -0000 1.3
@@ -20,12 +20,12 @@
#include <cmath>
#include <cassert>
-#include "audio/sound_manager.h"
-#include "audio/musicref.h"
-#include "audio/sound.h"
-#include "app/globals.h"
-#include "app/setup.h"
-#include "special/moving_object.h"
+#include "../audio/sound_manager.h"
+#include "../audio/musicref.h"
+#include "../audio/sound.h"
+#include "../app/globals.h"
+#include "../app/setup.h"
+#include "../special/moving_object.h"
using namespace SuperTux;
Index: musicref.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/musicref.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- musicref.cpp 21 Jul 2004 16:51:50 -0000 1.2
+++ musicref.cpp 22 Jul 2004 19:07:49 -0000 1.3
@@ -18,7 +18,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "audio/musicref.h"
+#include "../audio/musicref.h"
using namespace SuperTux;
Index: sound_manager.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/sound_manager.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound_manager.h 21 Jul 2004 16:51:50 -0000 1.4
+++ sound_manager.h 22 Jul 2004 19:07:50 -0000 1.5
@@ -24,7 +24,7 @@
#include <map>
#include "SDL_mixer.h"
-#include "math/vector.h"
+#include "../math/vector.h"
namespace SuperTux
{
Index: musicref.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/musicref.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- musicref.h 21 Jul 2004 16:51:50 -0000 1.2
+++ musicref.h 22 Jul 2004 19:07:50 -0000 1.3
@@ -20,7 +20,7 @@
#ifndef SUPERTUX_MUSICREF_H
#define SUPERTUX_MUSICREF_H
-#include "audio/sound_manager.h"
+#include "../audio/sound_manager.h"
namespace SuperTux
{
Index: sound.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/sound.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sound.cpp 21 Jul 2004 16:51:50 -0000 1.2
+++ sound.cpp 22 Jul 2004 19:07:50 -0000 1.3
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <string>
-#include "audio/sound.h"
+#include "../audio/sound.h"
/*global variable*/
bool use_sound = true; /* handle sound on/off menu and command-line option */
|
