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;

gframe/premake4.lua

@@ -13,15 +13,15 @@ project "ygopro"
         excludes "CGUIButton.cpp"
         includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" }
         if USE_IRRKLANG then
-			defines { "YGOPRO_USE_IRRKLANG" }
-			links { "irrKlang" }
-			includedirs { "../irrklang/include" }
-			libdirs { "../irrklang/lib/Win32-visualStudio" }
-			if IRRKLANG_PRO then
-				defines { "IRRKLANG_STATIC" }
-				links { "ikpmp3" }
-			end
-		end
+            defines { "YGOPRO_USE_IRRKLANG" }
+            links { "irrKlang" }
+            includedirs { "../irrklang/include" }
+            libdirs { "../irrklang/lib/Win32-visualStudio" }
+            if IRRKLANG_PRO then
+                defines { "IRRKLANG_STATIC" }
+                links { "ikpmp3" }
+            end
+        end
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
     configuration {"windows", "not vs*"}
         includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" }