From bb664ea3a231a41b57b9862d73f259c800eec1b0 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 2 Nov 2011 19:10:51 +0000 Subject: [PATCH] Fix build for this test. Shows a problem with the media kit : building it with gcc4 and trying to run it on a gcc2 install results in failure for trying to load a gcc2 media add-on. Same applies for push_game_sound_test. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43123 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../game/file_game_sound_test/FileSoundWindow.cpp | 11 ++++++++--- .../game/file_game_sound_test/FileSoundWindow.h | 15 +++++++++++---- src/tests/kits/game/file_game_sound_test/Jamfile | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/tests/kits/game/file_game_sound_test/FileSoundWindow.cpp b/src/tests/kits/game/file_game_sound_test/FileSoundWindow.cpp index 6fe392df33..80bace12f4 100644 --- a/src/tests/kits/game/file_game_sound_test/FileSoundWindow.cpp +++ b/src/tests/kits/game/file_game_sound_test/FileSoundWindow.cpp @@ -4,17 +4,22 @@ @version 1.0 */ + #include "FileSoundWindow.h" + +#include #include #include -#include #include #include -#include +#include #include +#include + #include #include + FileSoundWindow::FileSoundWindow(BRect windowBounds) :BWindow(windowBounds,"BFileGameSound test",B_TITLED_WINDOW,B_NOT_ZOOMABLE|B_NOT_RESIZABLE) { @@ -195,7 +200,7 @@ void FileSoundWindow::MessageReceived(BMessage *message) if (pausedValue != BFileGameSound::B_PAUSE_IN_PROGRESS) { status_t error; - char *label; + const char *label; if (paused) { paused = false; diff --git a/src/tests/kits/game/file_game_sound_test/FileSoundWindow.h b/src/tests/kits/game/file_game_sound_test/FileSoundWindow.h index dc658ae67b..d977585e91 100644 --- a/src/tests/kits/game/file_game_sound_test/FileSoundWindow.h +++ b/src/tests/kits/game/file_game_sound_test/FileSoundWindow.h @@ -4,15 +4,22 @@ @version 1.0 */ + #ifndef FILE_SOUND_WINDOW #define FILE_SOUND_WINDOW -#include -#include -#include -#include + +#include +#include #include +#include #include +#include +#include +#include +#include + + //message constants #define BROWSE_MSG 1 #define PLAY_MSG 2 diff --git a/src/tests/kits/game/file_game_sound_test/Jamfile b/src/tests/kits/game/file_game_sound_test/Jamfile index 1177df76ac..4271e33358 100644 --- a/src/tests/kits/game/file_game_sound_test/Jamfile +++ b/src/tests/kits/game/file_game_sound_test/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits game file_game_sound_test ; SimpleTest file_game_sound_test : FileSoundTest.cpp FileSoundWindow.cpp - : game tracker be root + : game tracker be root $(TARGET_LIBSTDC++) ;