update

gframe/config.h

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

gframe/game.cpp

@@ -654,6 +654,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

@@ -6,13 +6,22 @@ project "ygopro"
     files { "**.cpp", "**.cc", "**.c", "**.h" }
     excludes "lzma/**"
     includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", "Irrlicht", "freetype", "sqlite3", "lua" , "event", "irrKlang"}
+    links { "ocgcore", "clzma", "Irrlicht", "freetype", "sqlite3", "lua" , "event" }
 
     configuration "windows"
         files "ygopro.rc"
         excludes "CGUIButton.cpp"
-        includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3", "../irrklang/include" }
+        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
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
     configuration {"windows", "not vs*"}
         includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" }