Merge branch 'sound' into test

gframe/config.h

@@ -50,7 +50,7 @@ inline int _wtoi(const wchar_t * s) {
 #include <irrlicht.h>
 #include <irrKlang.h>
 #ifdef IRRKLANG_STATIC
-#include "../ikpMP3/ikpMP3.h"
+#include "../ikpmp3/ikpMP3.h"
 #endif
 #include <GL/gl.h>
 #include <GL/glu.h>

gframe/game.cpp

@@ -694,6 +694,12 @@ bool Game::Initialize() {
 		chkEnableMusic->setEnabled(false);
 		chkMusicMode->setEnabled(false);
 	}
+#ifdef IRRKLANG_STATIC
+	else {
+		irrklang::ikpMP3Init(engineSound);
+		irrklang::ikpMP3Init(engineMusic);
+	}
+#endif
 	hideChat = false;
 	hideChatTimer = 0;
 	return true;